- wire transactions through rpmcli install/erase modes.

- legacy signatures always checked on package read.

CVS patchset: 5134
CVS date: 2001/10/26 04:16:19

52 files changed, 6148 insertions, 6010 deletions

diff --git a/CHANGES b/CHANGES
index 250abd108..bcb396c5e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -20,7 +20,8 @@
 	- generate an rpm header on the fly for imported pubkeys.
 	- wire transactions through rpmcli signature modes.
 	- wire transactions through rpmcli query/verify modes.
-	- legacy signatures always checked on -qp and -Vp.
+	- wire transactions through rpmcli install/erase modes.
+	- legacy signatures always checked on package read.
 
 4.0.3 -> 4.0.4:
 
diff --git a/Makefile.am b/Makefile.am
index b69e37b51..d65438eed 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,6 +16,7 @@ INCLUDES = \
 	-I$(top_srcdir)/lib \
 	-I$(top_srcdir)/rpmdb \
 	-I$(top_srcdir)/rpmio \
+	-I$(top_srcdir)/beecrypt \
 	-I$(top_srcdir)/popt \
 	@INCPATH@
 
diff --git a/build/.lclintrc b/build/.lclintrc
index cc7d9acbe..01fb73cac 100644
--- a/build/.lclintrc
+++ b/build/.lclintrc
@@ -1,36 +1,60 @@
--I. -I.. -I../lib -I../rpmdb -I../rpmio -I../popt -DHAVE_CONFIG_H -D_GNU_SOURCE
+-I. -I.. -I../lib -I../rpmdb -I../rpmio -I../beecrypt -I../popt -DHAVE_CONFIG_H -D_GNU_SOURCE
 
 +partial
++forcehints
 
 -warnunixlib
 -warnposix
 
 +unixlib
 
-# XXX ignore doxygen markings
--unrecogcomments
-
-# don't-bother-me-yet parameters
--branchstate		# ~39
--mustfree		# ~325
-
-# not-yet normal parameters
--boolops		# ~351 w->n
--predboolint		# ~200 w->n
--type			# ~271
-
-# -weak paramaters
-#+boolint
-#-boolops
-#+ignorequals
-#+ignoresigns
-#-mustfree
-#+longintegral
-#+matchanyintegral
-#-nullpass
-#-observertrans
-#-predboolint
-#-predboolothers
-#-retvalint
-#-retvalother
-#-shiftsigned
+-unrecogcomments	# XXX ignore doxygen markings
+
++strict			# lclint level
+-includenest 16		# getting deep, sigh
+
+# --- +partial artifacts
+-declundef
+-exportheadervar
+-exportlocal
+
+-enummemuse
+-fcnuse
+-typeuse
+-varuse
+
+# --- not-yet at strict level
+-bitwisesigned		# pita
+-elseifcomplete		# 95 occurences
+-exportconst		# 839 occurences
+-exportfcn
+-exporttype
+-exportvar
+-fielduse		# 1 occurence <bits/sigset.h>
+-forblock		# tedious
+-ifblock		# tedious
+-incondefs		# <bits/{ipc,pthreadtypes}.h> heartburn
+-matchfields		# <bits/ipc.h> heartburn
+-namechecks		# tedious ANSI compliance checks
+-numenummembers 1024	# RPMTAG has 138 members
+-numstructfields 256	# Java jni.h has 229 fields
+-ptrarith		# tedious
+-strictops
+-strictusereleased
+-stringliterallen 4096	# redhat*PubKey's are big
+-whileblock		# tedious
+
+# --- not-yet at checks level
+-ansi-reserved
++enumint
+-mustfree
+-predboolptr
+-usedef
+
+# --- not-yet at standard level
+-boolops
+-predboolint
++boolint
++charint
++ignorequals
++matchanyintegral
diff --git a/build/pack.c b/build/pack.c
index 80340281f..285d1ba93 100644
--- a/build/pack.c
+++ b/build/pack.c
@@ -9,15 +9,18 @@
 #include <rpmbuild.h>
 #include "buildio.h"
 
+#include "depends.h"
+
 #include "legacy.h"	/* XXX providePackageNVR */
 #include "signature.h"
 #include "rpmlead.h"
 #include "debug.h"
 
-/*@access StringBuf @*/	/* compared with NULL */
+/*@access rpmTransactionSet @*/
 /*@access TFI_t @*/	/* compared with NULL */
 /*@access Header @*/	/* compared with NULL */
 /*@access FD_t @*/	/* compared with NULL */
+/*@access StringBuf @*/	/* compared with NULL */
 /*@access CSA_t @*/
 
 /**
@@ -313,8 +316,26 @@ int readRPM(const char *fileName, Spec *specp, struct rpmlead *lead,
     /* XXX the header just allocated will be allocated again */
     spec->packages->header = headerFree(spec->packages->header);
 
-   /* Read the rpm lead, signatures, and header */
-    rc = rpmReadPackageInfo(fdi, sigs, &spec->packages->header);
+    /* Read the rpm lead, signatures, and header */
+    {	const char * rootDir = "";
+	rpmdb db = NULL;
+	rpmTransactionSet ts = rpmtransCreateSet(db, rootDir);
+	int xx;
+
+	ts->need_payload = 1;
+	/* XXX W2DO? pass fileName? */
+	/*@-mustmod@*/      /* LCL: segfault */
+	xx = rpmReadPackageFile(ts, fdi, "readRPM",
+			 &spec->packages->header);
+	/*@=mustmod@*/
+	ts->need_payload = 0;
+	rc = (xx ? RPMRC_FAIL : RPMRC_OK);	/* XXX HACK */
+
+	ts = rpmtransFree(ts);
+
+	if (sigs) *sigs = NULL;			/* XXX HACK */
+    }
+
     switch (rc) {
     case RPMRC_BADMAGIC:
 	rpmError(RPMERR_BADMAGIC, _("readRPM: %s is not an RPM package\n"),
diff --git a/lib/depends.c b/lib/depends.c
index 4a9b8be1a..635287c31 100644
--- a/lib/depends.c
+++ b/lib/depends.c
@@ -909,6 +909,7 @@ int rpmtransRemovePackage(rpmTransactionSet ts, int dboffset)
     return removePackage(ts, dboffset, -1);
 }
 
+/*@-nullstate@*/ /* FIX: better annotations */
 void rpmtransClean(rpmTransactionSet ts)
 {
     if (ts) {
@@ -953,6 +954,7 @@ rpmTransactionSet rpmtransFree(rpmTransactionSet ts)
     }
     return NULL;
 }
+/*@=nullstate@*/
 
 rpmDependencyConflict rpmdepFreeConflicts(rpmDependencyConflict conflicts,
 		int numConflicts)
diff --git a/lib/depends.h b/lib/depends.h
index fa6587240..0547b10dc 100644
--- a/lib/depends.h
+++ b/lib/depends.h
@@ -159,7 +159,10 @@ struct rpmTransactionSet_s {
 /*@only@*/ const char * currDir;/*!< Current working directory. */
 /*@null@*/ FD_t scriptFd;	/*!< Scriptlet stdout/stderr. */
     int delta;			/*!< Delta for reallocation. */
-    int id;			/*!< Transaction id. */
+    int_32 id;			/*!< Transaction id. */
+
+    int need_payload;		/*!< Leave fd positioned at payload? */
+
 /*@observer@*/ /*@dependent@*/ /*@null@*/
     const char * fn;		/*!< Current package fn. */
     int_32  sigtag;		/*!< Current package signature tag. */
@@ -167,6 +170,7 @@ struct rpmTransactionSet_s {
 /*@null@*/ const void * sig;	/*!< Current package signature. */
     int_32 siglen;		/*!< Current package signature length. */
 /*@null@*/ struct pgpDig_s * dig;/*!< Current signature/pubkey parametrs. */
+
 } ;
 
 /** \ingroup rpmdep
diff --git a/lib/misc.c b/lib/misc.c
index 322cfd16f..ad61d1b0b 100644
--- a/lib/misc.c
+++ b/lib/misc.c
@@ -453,36 +453,3 @@ int rpmHeaderGetEntry(Header h, int_32 tag, int_32 *type,
     }
     /*@notreached@*/
 }
-
-/*
- * XXX Yet Another dressed entry to unify signature/header tag retrieval.
- */
-int rpmPackageGetEntry( /*@unused@*/ void *leadp, Header sigs, Header h,
-	int_32 tag, int_32 *type, void **p, int_32 *c)
-{
-    int_32 sigtag;
-
-    switch (tag) {
-    case RPMTAG_SIGSIZE:	sigtag = RPMSIGTAG_SIZE;	break;
-    case RPMTAG_SIGLEMD5_1:	sigtag = RPMSIGTAG_LEMD5_1;	break;
-    case RPMTAG_SIGPGP:		sigtag = RPMSIGTAG_PGP;		break;
-    case RPMTAG_SIGLEMD5_2:	sigtag = RPMSIGTAG_LEMD5_2;	break;
-    case RPMTAG_SIGMD5:		sigtag = RPMSIGTAG_MD5;		break;
-    case RPMTAG_SIGGPG:		sigtag = RPMSIGTAG_GPG;		break;
-    case RPMTAG_SIGPGP5:	sigtag = RPMSIGTAG_GPG;		break;
-	
-    default:
-	return rpmHeaderGetEntry(h, tag, type, p, c);
-	/*@notreached@*/ break;
-    }
-
-    if (headerIsEntry(h, tag))
-	return rpmHeaderGetEntry(h, tag, type, p, c);
-
-    if (sigs == NULL) {
-	if (c)	*c = 0;
-	return 0;
-    }
-
-    return headerGetEntry(sigs, sigtag, type, p, c);
-}
diff --git a/lib/package.c b/lib/package.c
index dea9941f1..0dc889972 100644
--- a/lib/package.c
+++ b/lib/package.c
@@ -6,16 +6,21 @@
 
 #include <netinet/in.h>
 
+#include <rpmio_internal.h>
 #include <rpmlib.h>
 
+#include "depends.h"
+
 #include "misc.h"	/* XXX stripTrailingChar() */
 #include "legacy.h"	/* XXX providePackageNVR() and compressFileList() */
 #include "rpmlead.h"
+
 #include "signature.h"
 #include "debug.h"
 
 #define	alloca_strdup(_s)	strcpy(alloca(strlen(_s)+1), (_s))
 
+/*@access rpmTransactionSet@*/
 /*@access Header@*/		/* XXX compared with NULL */
 
 void headerMergeLegacySigs(Header h, const Header sig)
@@ -118,6 +123,7 @@ Header headerRegenSigHeader(const Header h)
     return sig;
 }
 
+#ifdef	DYING
 /**
  * Retrieve package components from file handle.
  * @param fd		file handle
@@ -175,9 +181,7 @@ static rpmRC readPackageHeaders(FD_t fd,
 	    return RPMRC_FAIL;
 	}
 
-	/*
-	 * Convert legacy headers on the fly ...
-	 */
+	/* Convert legacy headers on the fly ... */
 	legacyRetrofit(*hdr, lead);
 	break;
     default:
@@ -192,40 +196,184 @@ static rpmRC readPackageHeaders(FD_t fd,
     
     return RPMRC_OK;
 }
+#endif
 
-rpmRC rpmReadPackageInfo(FD_t fd, Header * sigp, Header * hdrp)
+int rpmReadPackageFile(rpmTransactionSet ts, FD_t fd,
+		const char * fn, Header * hdrp)
 {
-    rpmRC rc = readPackageHeaders(fd, NULL, sigp, hdrp);
-    if (rc != RPMRC_OK)
-	return rc;
-    if (hdrp == NULL || sigp == NULL)
-	return rc;
-    if (*hdrp && *sigp)
-	headerMergeLegacySigs(*hdrp, *sigp);
-    return rc;
-}
+    byte buf[8*BUFSIZ];
+    ssize_t count;
+    struct rpmlead * l = alloca(sizeof(*l));
+    Header sig;
+    Header h = NULL;
+    int hmagic;
+    rpmRC rc = RPMRC_FAIL;	/* assume failure */
+    int xx;
+    int i;
 
-rpmRC rpmReadPackageHeader(FD_t fd, Header * hdrp, int * isSource, int * major,
-		  int * minor)
-{
-    struct rpmlead lead;
-    Header sig = NULL;
-    rpmRC rc = readPackageHeaders(fd, &lead, &sig, hdrp);
+    {	struct stat st;
+	memset(&st, 0, sizeof(st));
+	(void) fstat(Fileno(fd), &st);
+	/* if fd points to a socket, pipe, etc, st.st_size is *always* zero */
+	if (S_ISREG(st.st_mode) && st.st_size < sizeof(*l))
+	    goto exit;
+    }
 
-    if (rc != RPMRC_OK)
+    memset(l, 0, sizeof(*l));
+    if (readLead(fd, l)) {
+	rpmError(RPMERR_READLEAD, _("%s: readLead failed\n"), fn);
 	goto exit;
+    }
 
-    if (hdrp && *hdrp && sig) {
-	headerMergeLegacySigs(*hdrp, sig);
-	sig = rpmFreeSignature(sig);
+    if (l->magic[0] != RPMLEAD_MAGIC0 || l->magic[1] != RPMLEAD_MAGIC1
+     || l->magic[2] != RPMLEAD_MAGIC2 || l->magic[3] != RPMLEAD_MAGIC3) {
+	rpmError(RPMERR_READLEAD, _("%s: bad magic\n"), fn);
+	rc = RPMRC_BADMAGIC;
+	goto exit;
     }
-   
-    if (isSource) *isSource = lead.type == RPMLEAD_SOURCE;
-    /*@-mods@*/	/* FIX: undocumented modification */
-    if (major) *major = lead.major;
-    if (minor) *minor = lead.minor;
-    /*@=mods@*/
-   
+
+    switch (l->major) {
+    case 1:
+	rpmError(RPMERR_NEWPACKAGE,
+	    _("packaging version 1 is not supported by this version of RPM\n"));
+	goto exit;
+	/*@notreached@*/ break;
+    case 2:
+    case 3:
+    case 4:
+	break;
+    default:
+	rpmError(RPMERR_NEWPACKAGE, _("only packaging with major numbers <= 4 "
+		"is supported by this version of RPM\n"));
+	goto exit;
+	/*@notreached@*/ break;
+    }
+
+    rc = rpmReadSignature(fd, &sig, l->signature_type);
+    if (!(rc == RPMRC_OK || rc == RPMRC_BADSIZE)) {
+	rpmError(RPMERR_SIGGEN, _("%s: rpmReadSignature failed\n"), fn);
+	goto exit;
+    }
+    if (sig == NULL) {
+	rpmError(RPMERR_SIGGEN, _("%s: No signature available\n"), fn);
+	rc = RPMRC_FAIL;
+	goto exit;
+    }
+
+    if (ts->need_payload)	/* leave fd ready to install payload */
+	ts->sigtag = 0;
+    else if (headerIsEntry(sig, RPMSIGTAG_GPG))
+	ts->sigtag = RPMSIGTAG_GPG;
+    else if (headerIsEntry(sig, RPMSIGTAG_PGP))
+	ts->sigtag = RPMSIGTAG_PGP;
+    else if (headerIsEntry(sig, RPMSIGTAG_MD5))
+	ts->sigtag = RPMSIGTAG_MD5;
+    else
+	ts->sigtag = 0;
+
+    /*@-type@*/ /* FIX: cast? */
+    if (ts->sigtag == RPMSIGTAG_GPG)
+	fdInitDigest(fd, PGPHASHALGO_SHA1, 0);
+    else if (ts->sigtag == RPMSIGTAG_PGP || ts->sigtag == RPMSIGTAG_MD5)
+	fdInitDigest(fd, PGPHASHALGO_MD5, 0);
+    /*@=type@*/
+
+    hmagic = ((l->major >= 3) ? HEADER_MAGIC_YES : HEADER_MAGIC_NO);
+    h = headerRead(fd, hmagic);
+    if (h == NULL) {
+	rpmError(RPMERR_FREAD, _("%s: headerRead failed\n"), fn);
+	rc = RPMRC_FAIL;
+	goto exit;
+    }
+
+    /* Any signatures to check? */
+    if (ts->sigtag == 0) {
+	rc = RPMRC_OK;
+	goto exit;
+    }
+
+    ts->dig = pgpNewDig();
+    ts->dig->nbytes = headerSizeof(h, hmagic);
+
+    /* Read the compressed payload. */
+    while ((count = Fread(buf, sizeof(buf[0]), sizeof(buf), fd)) > 0)
+	ts->dig->nbytes += count;
+
+    if (count < 0) {
+	rpmError(RPMERR_FREAD, _("%s: Fread failed: %s\n"), fn, Fstrerror(fd));
+	rc = RPMRC_FAIL;
+	goto exit;
+    }
+    ts->dig->nbytes += count;
+
+    xx = headerGetEntry(sig, ts->sigtag, &ts->sigtype,
+		(void **) &ts->sig, &ts->siglen);
+
+    xx = pgpPrtPkts(ts->sig, ts->siglen, ts->dig, rpmIsDebug());
+
+    /*@-type@*/ /* FIX: cast? */
+    for (i = fd->ndigests - 1; i >= 0; i--) {
+	FDDIGEST_t fddig = fd->digests + i;
+	if (fddig->hashctx == NULL)
+	    continue;
+	if (fddig->hashalgo == PGPHASHALGO_MD5) {
+	    /*@-branchstate@*/
+	    if (ts->dig->md5ctx != NULL)
+		(void) rpmDigestFinal(ts->dig->md5ctx, NULL, NULL, 0);
+	    /*@=branchstate@*/
+	    ts->dig->md5ctx = fddig->hashctx;
+	    fddig->hashctx = NULL;
+	    continue;
+	}
+	if (fddig->hashalgo == PGPHASHALGO_SHA1) {
+	    /*@-branchstate@*/
+	    if (ts->dig->sha1ctx != NULL)
+		(void) rpmDigestFinal(ts->dig->sha1ctx, NULL, NULL, 0);
+	    /*@=branchstate@*/
+	    ts->dig->sha1ctx = fddig->hashctx;
+	    fddig->hashctx = NULL;
+	    continue;
+	}
+    }
+    /*@=type@*/
+
+/** @todo Implement disable/enable/warn/error/anal policy. */
+
+    buf[0] = '\0';
+    switch (rpmVerifySignature(ts, buf)) {
+    case RPMSIG_OK:		/*!< Signature is OK. */
+	rpmMessage(RPMMESS_VERBOSE, "%s: %s", fn, buf);
+	rc = RPMRC_OK;
+	break;
+    case RPMSIG_UNKNOWN:	/*!< Signature is unknown. */
+    case RPMSIG_NOKEY:		/*!< Key is unavailable. */
+    case RPMSIG_NOTTRUSTED:	/*!< Signature is OK, but key is not trusted. */
+	rpmMessage(RPMMESS_WARNING, "%s: %s", fn, buf);
+	rc = RPMRC_OK;
+	break;
+    default:
+    case RPMSIG_BAD:		/*!< Signature does not verify. */
+	rpmMessage(RPMMESS_ERROR, "%s: %s", fn, buf);
+	rc = RPMRC_OK;
+	break;
+    }
+
 exit:
+    if (rc == 0 && hdrp != NULL) {
+	/* Convert legacy headers on the fly ... */
+	legacyRetrofit(h, l);
+	
+	/* Append (and remap) signature tags. */
+	headerMergeLegacySigs(h, sig);
+
+	/* Bump reference count for return. */
+	*hdrp = headerLink(h);
+    }
+    h = headerFree(h);
+    if (ts->sig != NULL)
+	ts->sig = headerFreeData(ts->sig, ts->sigtype);
+    if (ts->dig != NULL)
+	ts->dig = pgpFreeDig(ts->dig);
+    sig = rpmFreeSignature(sig);
     return rc;
 }
diff --git a/lib/psm.c b/lib/psm.c
index b53039618..128ebcd42 100644
--- a/lib/psm.c
+++ b/lib/psm.c
@@ -673,7 +673,7 @@ void loadFi(const rpmTransactionSet ts, TFI_t fi, Header h, int scareMem)
 	/* 0 makes for noops */
 	fi->replacedSizes = xcalloc(fi->fc, sizeof(*fi->replacedSizes));
 
-	if (ts != NULL && fi->ap != NULL)
+	if (ts != NULL && fi->ap != NULL && fi->h != NULL)
 	{   Header foo = relocateFileList(ts, fi, fi->ap, fi->h, fi->actions);
 	    foo = headerFree(foo);
 	}
@@ -1179,13 +1179,12 @@ static rpmRC chkdir (const char * dpath, const char * dname)
     return RPMRC_OK;
 }
 
-rpmRC rpmInstallSourcePackage(const char * rootDir, FD_t fd,
-			const char ** specFilePtr,
-			rpmCallbackFunction notify, rpmCallbackData notifyData,
-			const char ** cookie)
+rpmRC rpmInstallSourcePackage(rpmTransactionSet ts,
+		FD_t fd,
+		const char ** specFilePtr,
+		rpmCallbackFunction notify, rpmCallbackData notifyData,
+		const char ** cookie)
 {
-    rpmdb rpmdb = NULL;
-    rpmTransactionSet ts = rpmtransCreateSet(rpmdb, rootDir);
     TFI_t fi = xcalloc(sizeof(*fi), 1);
     const char * _sourcedir = NULL;
     const char * _specdir = NULL;
@@ -1197,18 +1196,22 @@ rpmRC rpmInstallSourcePackage(const char * rootDir, FD_t fd,
     PSM_t psm = &psmbuf;
     int isSource;
     rpmRC rc;
-    int i;
+    int i, xx;
 
+    /*@-mods -temptrans -assignexpose@*/
     ts->notify = notify;
-    /*@-temptrans -assignexpose@*/
     ts->notifyData = notifyData;
-    /*@=temptrans =assignexpose@*/
+    /*@=mods =temptrans =assignexpose@*/
 
     /*@-mustmod@*/	/* LCL: segfault */
-    rc = rpmReadPackageHeader(fd, &h, &isSource, NULL, NULL);
+    xx = rpmReadPackageFile(ts, fd, "InstallSourcePackage", &h);
     /*@=mustmod@*/
-    if (rc)
+    if (xx || h == NULL) {
+	rc = RPMRC_FAIL;			/* XXX HACK */
 	goto exit;
+    }
+    rc = RPMRC_OK;				/* XXX HACK */
+    isSource = headerIsEntry(h, RPMTAG_SOURCEPACKAGE);
 
     if (!isSource) {
 	rpmError(RPMERR_NOTSRPM, _("source package expected, binary found\n"));
@@ -1233,8 +1236,10 @@ rpmRC rpmInstallSourcePackage(const char * rootDir, FD_t fd,
     (void) rpmInstallLoadMacros(fi, fi->h);
 
     memset(psm, 0, sizeof(*psm));
+    /*@-assignexpose@*/
     psm->ts = ts;
     psm->fi = fi;
+    /*@=assignexpose@*/
 
     if (cookie) {
 	*cookie = NULL;
@@ -1352,7 +1357,6 @@ exit:
 	freeFi(fi);
 	fi = _free(fi);
     }
-    ts = rpmtransFree(ts);
 
     return rc;
 }
diff --git a/lib/query.c b/lib/query.c
index ea67323af..58e745390 100644
--- a/lib/query.c
+++ b/lib/query.c
@@ -18,10 +18,6 @@
 #include "depends.h"
 #include "manifest.h"
 
-#include "rpmlead.h"
-#include "legacy.h"
-#include "signature.h"	/* XXX rpmReadSignature */
-
 #include "debug.h"
 
 /*@access rpmTransactionSet@*/		/* XXX ts->rpmdb */
@@ -556,160 +552,6 @@ int showMatches(QVA_t qva, rpmTransactionSet ts)
     return ec;
 }
 
-/**
- */
-static int xxxReadPackageHeader(rpmTransactionSet ts, FD_t fd,
-		const char * fn, /*@null@*/ /*@out@*/ Header * hdrp)
-	/*@globals fileSystem, internalState @*/
-	/*@modifies ts, fd, *hdrp, fileSystem, internalState @*/
-
-{
-    byte buf[8*BUFSIZ];
-    ssize_t count;
-    struct rpmlead lead, *l = &lead;
-    Header sig;
-    Header h = NULL;
-    int hmagic;
-    rpmRC rpmrc;
-    int rc = 1;	/* assume failure */
-    int xx;
-    int i;
-
-    memset(l, 0, sizeof(*l));
-    if (readLead(fd, l)
-     || l->magic[0] != RPMLEAD_MAGIC0 || l->magic[1] != RPMLEAD_MAGIC1
-     || l->magic[2] != RPMLEAD_MAGIC2 || l->magic[3] != RPMLEAD_MAGIC3) {
-	rpmError(RPMERR_READLEAD, _("%s: readLead failed\n"), fn);
-	goto exit;
-    }
-
-    switch (l->major) {
-    case 1:
-	rpmError(RPMERR_BADSIGTYPE, _("%s: No signature available (v1.0 RPM)\n"), fn);
-	goto exit;
-	/*@notreached@*/ /*@switchbreak@*/ break;
-    default:
-	/*@switchbreak@*/ break;
-    }
-
-    rpmrc = rpmReadSignature(fd, &sig, l->signature_type);
-    if (!(rpmrc == RPMRC_OK || rpmrc == RPMRC_BADSIZE)) {
-	rpmError(RPMERR_SIGGEN, _("%s: rpmReadSignature failed\n"), fn);
-	goto exit;
-    }
-    if (sig == NULL) {
-	rpmError(RPMERR_SIGGEN, _("%s: No signature available\n"), fn);
-	goto exit;
-    }
-
-    if (headerIsEntry(sig, RPMSIGTAG_GPG))
-	ts->sigtag = RPMSIGTAG_GPG;
-    else if (headerIsEntry(sig, RPMSIGTAG_PGP))
-	ts->sigtag = RPMSIGTAG_PGP;
-    else if (headerIsEntry(sig, RPMSIGTAG_MD5))
-	ts->sigtag = RPMSIGTAG_MD5;
-    else
-	ts->sigtag = 0;
-
-    /*@-type@*/ /* FIX: cast? */
-    if (ts->sigtag == RPMSIGTAG_GPG)
-	fdInitDigest(fd, PGPHASHALGO_SHA1, 0);
-    else
-	fdInitDigest(fd, PGPHASHALGO_MD5, 0);
-    /*@=type@*/
-
-    hmagic = ((l->major >= 3) ? HEADER_MAGIC_YES : HEADER_MAGIC_NO);
-    h = headerRead(fd, hmagic);
-    if (h == NULL) {
-	rpmError(RPMERR_FREAD, _("%s: headerRead failed\n"), fn);
-	goto exit;
-    }
-
-    if (ts->sigtag == 0) {
-	rc = 0;
-	goto exit;
-    }
-
-    ts->dig = pgpNewDig();
-    ts->dig->nbytes = headerSizeof(h, hmagic);
-
-    /* Read the compressed payload. */
-    while ((count = Fread(buf, sizeof(buf[0]), sizeof(buf), fd)) > 0)
-	ts->dig->nbytes += count;
-
-    if (count < 0) {
-	rpmError(RPMERR_FREAD, _("%s: Fread failed: %s\n"), fn, Fstrerror(fd));
-	goto exit;
-    }
-    ts->dig->nbytes += count;
-
-    (void) headerGetEntry(sig, ts->sigtag, &ts->sigtype,
-		(void **) &ts->sig, &ts->siglen);
-
-    xx = pgpPrtPkts(ts->sig, ts->siglen, ts->dig, rpmIsDebug());
-
-    /*@-type@*/ /* FIX: cast? */
-    for (i = fd->ndigests - 1; i >= 0; i--) {
-	FDDIGEST_t fddig = fd->digests + i;
-	if (fddig->hashctx == NULL)
-	    continue;
-	if (fddig->hashalgo == PGPHASHALGO_MD5) {
-	    /*@-branchstate@*/
-	    if (ts->dig->md5ctx != NULL)
-		(void) rpmDigestFinal(ts->dig->md5ctx, NULL, NULL, 0);
-	    /*@=branchstate@*/
-	    ts->dig->md5ctx = fddig->hashctx;
-	    fddig->hashctx = NULL;
-	    continue;
-	}
-	if (fddig->hashalgo == PGPHASHALGO_SHA1) {
-	    /*@-branchstate@*/
-	    if (ts->dig->sha1ctx != NULL)
-		(void) rpmDigestFinal(ts->dig->sha1ctx, NULL, NULL, 0);
-	    /*@=branchstate@*/
-	    ts->dig->sha1ctx = fddig->hashctx;
-	    fddig->hashctx = NULL;
-	    continue;
-	}
-    }
-    /*@=type@*/
-
-/** @todo Implement disable/enable/warn/error/anal policy. */
-
-    buf[0] = '\0';
-    switch (rpmVerifySignature(ts, buf)) {
-    case RPMSIG_OK:		/*!< Signature is OK. */
-	rpmMessage(RPMMESS_VERBOSE, "%s: %s", fn, buf);
-	rc = 0;
-	break;
-    case RPMSIG_UNKNOWN:	/*!< Signature is unknown. */
-    case RPMSIG_NOKEY:		/*!< Key is unavailable. */
-    case RPMSIG_NOTTRUSTED:	/*!< Signature is OK, but key is not trusted. */
-	rpmMessage(RPMMESS_WARNING, "%s: %s", fn, buf);
-	rc = 0;
-	break;
-    default:
-    case RPMSIG_BAD:		/*!< Signature does not verify. */
-	rpmMessage(RPMMESS_ERROR, "%s: %s", fn, buf);
-	rc = 0;
-	break;
-    }
-
-exit:
-    if (rc == 0 && hdrp != NULL) {
-	legacyRetrofit(h, l);
-	headerMergeLegacySigs(h, sig);
-	*hdrp = headerLink(h);
-    }
-    h = headerFree(h);
-    if (ts->sig != NULL)
-	ts->sig = headerFreeData(ts->sig, ts->sigtype);
-    if (ts->dig != NULL)
-	ts->dig = pgpFreeDig(ts->dig);
-    sig = rpmFreeSignature(sig);
-    return rc;
-}
-
 /*@-redecl@*/
 /**
  * @todo Eliminate linkage loop into librpmbuild.a
@@ -763,7 +605,7 @@ restart:
 	    }
 
 	    /*@-mustmod@*/	/* LCL: something fishy here, was segfault */
-    	    rc = xxxReadPackageHeader(ts, fd, fileURL, &h);
+    	    rc = rpmReadPackageFile(ts, fd, fileURL, &h);
 	    /*@=mustmod@*/
 	    rpmrc = (rc == 0 ? RPMRC_OK : RPMRC_BADMAGIC);
 	    /* XXX rpmrc tests below need work */
@@ -1024,9 +866,9 @@ restart:
 int rpmcliQuery(QVA_t qva, const char ** argv)
 {
     const char * rootDir = qva->qva_prefix;
-    const char * arg;
     rpmdb db = NULL;
-    rpmTransactionSet ts;
+    rpmTransactionSet ts = NULL;
+    const char * arg;
     int ec = 0;
 
     switch (qva->qva_source) {
diff --git a/lib/rpmchecksig.c b/lib/rpmchecksig.c
index 940971a4c..57b2e4930 100644
--- a/lib/rpmchecksig.c
+++ b/lib/rpmchecksig.c
@@ -18,8 +18,7 @@
 
 /*@access rpmTransactionSet @*/	/* ts->rpmdb, ts->id */
 /*@access Header @*/		/* XXX compared with NULL */
-/*@access FD_t @*/		/* XXX compared with NULL */
-/*@access DIGEST_CTX @*/	/* XXX compared with NULL */
+/*@access FD_t @*/
 /*@access pgpDig @*/
 
 static int manageFile(FD_t *fdp, const char **fnp, int flags,
@@ -260,67 +259,6 @@ exit:
     return res;
 }
 
-/**
- */
-static int readFile(FD_t *sfdp, const char **sfnp, pgpDig dig)
-	/*@globals fileSystem, internalState @*/
-	/*@modifies *sfdp, *dig,
-		fileSystem, internalState @*/
-{
-    byte buf[4*BUFSIZ];
-    ssize_t count;
-    int rc = 1;
-    int i;
-
-    /*@-type@*/ /* FIX: cast? */
-    fdInitDigest(*sfdp, PGPHASHALGO_MD5, 0);
-    fdInitDigest(*sfdp, PGPHASHALGO_SHA1, 0);
-    /*@=type@*/
-    dig->nbytes = 0;
-
-    while ((count = Fread(buf, sizeof(buf[0]), sizeof(buf), *sfdp)) > 0)
-    {
-	dig->nbytes += count;
-    }
-
-    if (count < 0) {
-	rpmError(RPMERR_FREAD, _("%s: Fread failed: %s\n"), *sfnp, Fstrerror(*sfdp));
-	goto exit;
-    } else
-	dig->nbytes += count;
-
-    /*@-type@*/ /* FIX: cast? */
-    for (i = (*sfdp)->ndigests - 1; i >= 0; i--) {
-	FDDIGEST_t fddig = (*sfdp)->digests + i;
-	if (fddig->hashctx == NULL)
-	    continue;
-	if (fddig->hashalgo == PGPHASHALGO_MD5) {
-	    /*@-branchstate@*/
-	    if (dig->md5ctx != NULL)
-		(void) rpmDigestFinal(dig->md5ctx, NULL, NULL, 0);
-	    /*@=branchstate@*/
-	    dig->md5ctx = fddig->hashctx;
-	    fddig->hashctx = NULL;
-	    continue;
-	}
-	if (fddig->hashalgo == PGPHASHALGO_SHA1) {
-	    /*@-branchstate@*/
-	    if (dig->sha1ctx != NULL)
-		(void) rpmDigestFinal(dig->sha1ctx, NULL, NULL, 0);
-	    /*@=branchstate@*/
-	    dig->sha1ctx = fddig->hashctx;
-	    fddig->hashctx = NULL;
-	    continue;
-	}
-    }
-    /*@=type@*/
-
-    rc = 0;
-
-exit:
-    return rc;
-}
-
 /** \ingroup rpmcli
  * Import public key(s).
  * @param ts		transaction set
@@ -471,6 +409,81 @@ bottom:
     return res;
 }
 
+/**
+ * @todo If the GPG key was known aavailable, the md5 digest could be skipped.
+ */
+static int readFile(FD_t fd, int_32 sigtag, const char * fn, pgpDig dig)
+	/*@globals fileSystem, internalState @*/
+	/*@modifies fd, *dig,
+		fileSystem, internalState @*/
+{
+    byte buf[4*BUFSIZ];
+    ssize_t count;
+    int rc = 1;
+    int i;
+
+    switch (sigtag) {
+    case RPMSIGTAG_GPG:
+    /*@-type@*/ /* FIX: cast? */
+	fdInitDigest(fd, PGPHASHALGO_SHA1, 0);
+    /*@=type@*/
+	/*@fallthrough@*/
+    case RPMSIGTAG_PGP5:	/* XXX legacy */
+    case RPMSIGTAG_PGP:
+    case RPMSIGTAG_MD5:
+    /*@-type@*/ /* FIX: cast? */
+	fdInitDigest(fd, PGPHASHALGO_MD5, 0);
+    /*@=type@*/
+	break;
+    case RPMSIGTAG_LEMD5_2:
+    case RPMSIGTAG_LEMD5_1:
+    case RPMSIGTAG_SIZE:
+    default:
+	break;
+    }
+    dig->nbytes = 0;
+
+    while ((count = Fread(buf, sizeof(buf[0]), sizeof(buf), fd)) > 0)
+	dig->nbytes += count;
+
+    if (count < 0) {
+	rpmError(RPMERR_FREAD, _("%s: Fread failed: %s\n"), fn, Fstrerror(fd));
+	goto exit;
+    }
+    dig->nbytes += count;
+
+    /*@-type@*/ /* FIX: cast? */
+    for (i = fd->ndigests - 1; i >= 0; i--) {
+	FDDIGEST_t fddig = fd->digests + i;
+	if (fddig->hashctx == NULL)
+	    continue;
+	if (fddig->hashalgo == PGPHASHALGO_MD5) {
+	    /*@-branchstate@*/
+	    if (dig->md5ctx != NULL)
+		(void) rpmDigestFinal(dig->md5ctx, NULL, NULL, 0);
+	    /*@=branchstate@*/
+	    dig->md5ctx = fddig->hashctx;
+	    fddig->hashctx = NULL;
+	    continue;
+	}
+	if (fddig->hashalgo == PGPHASHALGO_SHA1) {
+	    /*@-branchstate@*/
+	    if (dig->sha1ctx != NULL)
+		(void) rpmDigestFinal(dig->sha1ctx, NULL, NULL, 0);
+	    /*@=branchstate@*/
+	    dig->sha1ctx = fddig->hashctx;
+	    fddig->hashctx = NULL;
+	    continue;
+	}
+    }
+    /*@=type@*/
+
+    rc = 0;
+
+exit:
+    return rc;
+}
+
 int rpmVerifySignatures(QVA_t qva, rpmTransactionSet ts, FD_t fd,
 		const char * fn)
 {
@@ -480,6 +493,7 @@ int rpmVerifySignatures(QVA_t qva, rpmTransactionSet ts, FD_t fd,
     char buf[8192], * b;
     char missingKeys[7164], * m;
     char untrustedKeys[7164], * u;
+    int_32 sigtag;
     Header sig;
     HeaderIterator hi;
     int res = 0;
@@ -515,11 +529,21 @@ int rpmVerifySignatures(QVA_t qva, rpmTransactionSet ts, FD_t fd,
 	    goto bottom;
 	}
 
+	/* Grab a hint of what needs doing to avoid duplication. */
+	if (headerIsEntry(sig, RPMSIGTAG_GPG))
+	    sigtag = RPMSIGTAG_GPG;
+	else if (headerIsEntry(sig, RPMSIGTAG_PGP))
+	    sigtag = RPMSIGTAG_PGP;
+	else if (headerIsEntry(sig, RPMSIGTAG_MD5))
+	    sigtag = RPMSIGTAG_MD5;
+	else
+	    sigtag = 0;	/* XXX never happens */
+
 	ts->dig = pgpNewDig();
 
 	/* Read the file, generating digest(s) on the fly. */
 	/*@-mods@*/ /* FIX: double indirection */
-	if (readFile(&fd, &fn, ts->dig)) {
+	if (readFile(fd, sigtag, fn, ts->dig)) {
 	    res++;
 	    goto bottom;
 	}
@@ -536,8 +560,10 @@ int rpmVerifySignatures(QVA_t qva, rpmTransactionSet ts, FD_t fd,
 	    headerNextIterator(hi, &ts->sigtag, &ts->sigtype, &ts->sig, &ts->siglen);
 	    ts->sig = headerFreeData(ts->sig, ts->sigtype))
 	{
+
 	    if (ts->sig == NULL) /* XXX can't happen */
 		continue;
+
 	    switch (ts->sigtag) {
 	    case RPMSIGTAG_PGP5:	/* XXX legacy */
 	    case RPMSIGTAG_PGP:
@@ -546,44 +572,6 @@ int rpmVerifySignatures(QVA_t qva, rpmTransactionSet ts, FD_t fd,
 if (rpmIsDebug())
 fprintf(stderr, "========================= Package RSA Signature\n");
 		xx = pgpPrtPkts(ts->sig, ts->siglen, ts->dig, rpmIsDebug());
-
-#ifdef	DYING
-
-		/* XXX sanity check on ts->sigtag and signature agreement. */
-
-    /*@-type@*/ /* FIX: cast? */
-	    /*@-nullpass@*/ /* FIX: ts->dig->md5ctx may be null */
-	    {	DIGEST_CTX ctx = rpmDigestDup(ts->dig->md5ctx);
-		struct pgpDigParams_s * dsig = &ts->dig->signature;
-
-		xx = rpmDigestUpdate(ctx, dsig->hash, dsig->hashlen);
-		xx = rpmDigestFinal(ctx, (void **)&ts->dig->md5, &ts->dig->md5len, 1);
-
-		/* XXX compare leading 16 bits of digest for quick check. */
-	    }
-	    /*@=nullpass@*/
-    /*@=type@*/
-
-	    {	const char * prefix = "3020300c06082a864886f70d020505000410";
-		unsigned int nbits = 1024;
-		unsigned int nb = (nbits + 7) >> 3;
-		const char * hexstr;
-		char * t;
-
-		hexstr = t = xmalloc(2 * nb + 1);
-		memset(t, 'f', (2 * nb));
-		t[0] = '0'; t[1] = '0';
-		t[2] = '0'; t[3] = '1';
-		t += (2 * nb) - strlen(prefix) - strlen(ts->dig->md5) - 2;
-		*t++ = '0'; *t++ = '0';
-		t = stpcpy(t, prefix);
-		t = stpcpy(t, ts->dig->md5);
-		
-		mp32nzero(&ts->dig->rsahm);	mp32nsethex(&ts->dig->rsahm, hexstr);
-
-		hexstr = _free(hexstr);
-	    }
-#endif
 		/*@switchbreak@*/ break;
 	    case RPMSIGTAG_GPG:
 		if (!(qva->qva_flags & VERIFY_SIGNATURE)) 
@@ -591,35 +579,23 @@ fprintf(stderr, "========================= Package RSA Signature\n");
 if (rpmIsDebug())
 fprintf(stderr, "========================= Package DSA Signature\n");
 		xx = pgpPrtPkts(ts->sig, ts->siglen, ts->dig, rpmIsDebug());
-
-#ifdef	DYING
-		/* XXX sanity check on ts->sigtag and signature agreement. */
-
-    /*@-type@*/ /* FIX: cast? */
-	    /*@-nullpass@*/ /* FIX: ts->dig->sha1ctx may be null */
-	    {	DIGEST_CTX ctx = rpmDigestDup(ts->dig->sha1ctx);
-		struct pgpDigParams_s * dsig = &ts->dig->signature;
-
-		xx = rpmDigestUpdate(ctx, dsig->hash, dsig->hashlen);
-		xx = rpmDigestFinal(ctx, (void **)&ts->dig->sha1, &ts->dig->sha1len, 1);
-		mp32nzero(&ts->dig->hm);	mp32nsethex(&ts->dig->hm, ts->dig->sha1);
-	    }
-	    /*@=nullpass@*/
-    /*@=type@*/
-#endif
 		/*@switchbreak@*/ break;
 	    case RPMSIGTAG_LEMD5_2:
 	    case RPMSIGTAG_LEMD5_1:
 	    case RPMSIGTAG_MD5:
 		if (!(qva->qva_flags & VERIFY_DIGEST)) 
 		     continue;
+		/*
+		 * Don't bother with md5 if pgp, as RSA/MD5 is more reliable
+		 * than the legacy -- now unsupported -- legacy md5 breakage.
+		 */
+		if (sigtag == RPMSIGTAG_PGP)
+		    continue;
 		/*@switchbreak@*/ break;
 	    default:
 		continue;
 		/*@notreached@*/ /*@switchbreak@*/ break;
 	    }
-	    if (ts->sig == NULL) /* XXX can't happen */
-		continue;
 
 	    res3 = rpmVerifySignature(ts, result);
 	    if (res3) {
@@ -630,18 +606,18 @@ fprintf(stderr, "========================= Package DSA Signature\n");
 		} else {
 		    char *tempKey;
 		    switch (ts->sigtag) {
-		      case RPMSIGTAG_SIZE:
+		    case RPMSIGTAG_SIZE:
 			b = stpcpy(b, "SIZE ");
 			res2 = 1;
 			/*@switchbreak@*/ break;
-		      case RPMSIGTAG_LEMD5_2:
-		      case RPMSIGTAG_LEMD5_1:
-		      case RPMSIGTAG_MD5:
+		    case RPMSIGTAG_LEMD5_2:
+		    case RPMSIGTAG_LEMD5_1:
+		    case RPMSIGTAG_MD5:
 			b = stpcpy(b, "MD5 ");
 			res2 = 1;
 			/*@switchbreak@*/ break;
-		      case RPMSIGTAG_PGP5:	/* XXX legacy */
-		      case RPMSIGTAG_PGP:
+		    case RPMSIGTAG_PGP5:	/* XXX legacy */
+		    case RPMSIGTAG_PGP:
 			switch (res3) {
 			/* Do not consider these a failure */
 			case RPMSIG_NOKEY:
@@ -669,7 +645,7 @@ fprintf(stderr, "========================= Package DSA Signature\n");
 			    /*@innerbreak@*/ break;
 			}
 			/*@switchbreak@*/ break;
-		      case RPMSIGTAG_GPG:
+		    case RPMSIGTAG_GPG:
 			/* Do not consider this a failure */
 			switch (res3) {
 			case RPMSIG_NOKEY:
@@ -685,7 +661,7 @@ fprintf(stderr, "========================= Package DSA Signature\n");
 			    /*@innerbreak@*/ break;
 			}
 			/*@switchbreak@*/ break;
-		      default:
+		    default:
 			b = stpcpy(b, "?UnknownSignatureType? ");
 			res2 = 1;
 			/*@switchbreak@*/ break;
diff --git a/lib/rpmcli.h b/lib/rpmcli.h
index 547ffcc0b..f0caf1e71 100644
--- a/lib/rpmcli.h
+++ b/lib/rpmcli.h
@@ -413,7 +413,7 @@ extern int packagesTotal;
 
 /** \ingroup rpmcli
  * Install/upgrade/freshen binary rpm package.
- * @param rootdir	path to top of install tree
+ * @param rootDir	path to top of install tree
  * @param fileArgv	array of package file names (NULL terminated)
  * @param transFlags	bits to control rpmRunTransactions()
  * @param interfaceFlags bits to control rpmInstall()
@@ -421,7 +421,7 @@ extern int packagesTotal;
  * @param relocations	package file relocations
  * @return		0 on success
  */
-int rpmInstall(/*@null@*/ const char * rootdir,
+int rpmInstall(/*@null@*/ const char * rootDir,
 		/*@null@*/ const char ** fileArgv,
 		rpmtransFlags transFlags, 
 		rpmInstallInterfaceFlags interfaceFlags,
@@ -434,29 +434,29 @@ int rpmInstall(/*@null@*/ const char * rootdir,
 
 /** \ingroup rpmcli
  * Install source rpm package.
- * @param rootdir	path to top of install tree
+ * @param ts		transaction set
  * @param arg		source rpm file name
  * @retval specFile	address of (installed) spec file name
  * @retval cookie
  * @return		0 on success
  */
-int rpmInstallSource(const char * rootdir, const char * arg,
+int rpmInstallSource(rpmTransactionSet ts, const char * arg,
 		/*@null@*/ /*@out@*/ const char ** specFile,
 		/*@null@*/ /*@out@*/ const char ** cookie)
 	/*@globals rpmGlobalMacroContext,
 		fileSystem, internalState@*/
-	/*@modifies *specFile, *cookie, rpmGlobalMacroContext,
+	/*@modifies ts, *specFile, *cookie, rpmGlobalMacroContext,
 		fileSystem, internalState @*/;
 
 /** \ingroup rpmcli
  * Erase binary rpm package.
- * @param rootdir	path to top of install tree
+ * @param rootDir	path to top of install tree
  * @param argv		array of package file names (NULL terminated)
  * @param transFlags	bits to control rpmRunTransactions()
  * @param interfaceFlags bits to control rpmInstall()
  * @return		0 on success
  */
-int rpmErase(/*@null@*/ const char * rootdir, /*@null@*/ const char ** argv,
+int rpmErase(/*@null@*/ const char * rootDir, /*@null@*/ const char ** argv,
 		rpmtransFlags transFlags, 
 		rpmEraseInterfaceFlags interfaceFlags)
 	/*@globals rpmGlobalMacroContext,
@@ -550,14 +550,15 @@ typedef /*@abstract@*/ struct IDTindex_s {
 
 /**
  * Load tag (instance,value) pairs from packages, and return sorted id index.
+ * @param ts		transaction set
  * @param globstr	glob expression
  * @param tag		rpm tag
  * @return 		id index
  */
-/*@only@*/ /*@null@*/ IDTX IDTXglob(const char * globstr, rpmTag tag)
-	/*@globals fileSystem@*/
-	/*@modifies fileSystem @*/;
-
+/*@only@*/ /*@null@*/ IDTX IDTXglob(rpmTransactionSet ts,
+		const char * globstr, rpmTag tag)
+	/*@globals fileSystem, internalState @*/
+	/*@modifies ts, fileSystem, internalState @*/;
 
 /** \ingroup rpmcli
  * Rollback transactions, erasing new, reinstalling old, package(s).
@@ -566,9 +567,9 @@ typedef /*@abstract@*/ struct IDTindex_s {
 int rpmRollback(struct rpmInstallArguments_s * ia,
 		/*@null@*/ const char ** argv)
 	/*@globals rpmGlobalMacroContext,
-		fileSystem@*/
+		fileSystem, internalState @*/
 	/*@modifies rpmGlobalMacroContext,
-		fileSystem @*/;
+		fileSystem, internalState @*/;
 
 /** \ingroup rpmcli
  */
diff --git a/lib/rpminstall.c b/lib/rpminstall.c
index da9c0baf2..6fa5a48f5 100644
--- a/lib/rpminstall.c
+++ b/lib/rpminstall.c
@@ -176,8 +176,6 @@ void * rpmShowProgress(/*@null@*/ const void * arg,
 typedef /*@only@*/ /*@null@*/ const char * str_t;
 
 struct rpmEIU {
-/*@only@*/ rpmTransactionSet ts;
-/*@only@*/ /*@null@*/ rpmdb db;
     Header h;
     FD_t fd;
     int numFailed;
@@ -198,15 +196,19 @@ struct rpmEIU {
 };
 
 /** @todo Generalize --freshen policies. */
-int rpmInstall(const char * rootdir, const char ** fileArgv,
+int rpmInstall(const char * rootDir, const char ** fileArgv,
 		rpmtransFlags transFlags,
 		rpmInstallInterfaceFlags interfaceFlags,
 		rpmprobFilterFlags probFilter,
 		rpmRelocation * relocations)
 {
-    struct rpmEIU * eiu = alloca(sizeof(*eiu));
+    int mode = (transFlags & RPMTRANS_FLAG_TEST) ? O_RDONLY : (O_RDWR|O_CREAT);
+    rpmdb db = NULL;
+    rpmTransactionSet ts = NULL;
+
+    struct rpmEIU * eiu = memset(alloca(sizeof(*eiu)), 0, sizeof(*eiu));
     int notifyFlags = interfaceFlags | (rpmIsVerbose() ? INSTALL_LABEL : 0 );
-    /*@only@*/ /*@null@*/ const char * fileURL = NULL;
+/*@only@*/ /*@null@*/ const char * fileURL = NULL;
     int stopInstall = 0;
     const char ** av = NULL;
     int ac = 0;
@@ -214,12 +216,21 @@ int rpmInstall(const char * rootdir, const char ** fileArgv,
     int xx;
     int i;
 
-    if (fileArgv == NULL) return 0;
+    if (fileArgv == NULL) goto exit;
+    /*@-branchstate@*/
+    if (rootDir == NULL) rootDir = "";
+    /*@=branchstate@*/
 
-    memset(eiu, 0, sizeof(*eiu));
-    eiu->numPkgs = 0;
-    eiu->prevx = 0;
-    eiu->pkgx = 0;
+    if (rpmdbOpen(rootDir, &db, mode, 0644)) {
+	const char *dn;
+	dn = rpmGetPath(rootDir, "%{_dbpath}", NULL);
+	rpmMessage(RPMMESS_ERROR,
+				_("cannot open Packages database in %s\n"), dn);
+	dn = _free(dn);
+	eiu->numFailed++;
+	goto exit;
+    }
+    ts = rpmtransCreateSet(db, rootDir);
 
     if ((eiu->relocations = relocations) != NULL) {
 	while (eiu->relocations->oldPath)
@@ -276,7 +287,7 @@ restart:
 	    {	char tfnbuf[64];
 		strcpy(tfnbuf, "rpm-xfer.XXXXXX");
 		(void) mktemp(tfnbuf);
-		tfn = rpmGenPath(rootdir, "%{_tmppath}/", tfnbuf);
+		tfn = rpmGenPath(rootDir, "%{_tmppath}/", tfnbuf);
 	    }
 
 	    /* XXX undefined %{name}/%{version}/%{release} here */
@@ -332,9 +343,11 @@ restart:
 	}
 
 	/*@-mustmod@*/	/* LCL: segfault */
-	eiu->rpmrc = rpmReadPackageHeader(eiu->fd, &eiu->h,
-				&eiu->isSource, NULL, NULL);
+	xx = rpmReadPackageFile(ts, eiu->fd, *eiu->fnp, &eiu->h);
 	/*@=mustmod@*/
+	eiu->rpmrc = (xx ? RPMRC_FAIL : RPMRC_OK);	/* XXX HACK */
+	eiu->isSource = headerIsEntry(eiu->h, RPMTAG_SOURCEPACKAGE);
+
 	xx = Fclose(eiu->fd);
 	eiu->fd = NULL;
 
@@ -358,24 +371,6 @@ restart:
 	}
 
 	if (eiu->rpmrc == RPMRC_OK || eiu->rpmrc == RPMRC_BADSIZE) {
-	    if (eiu->db == NULL) {
-		int mode = (transFlags & RPMTRANS_FLAG_TEST)
-				? O_RDONLY : (O_RDWR | O_CREAT);
-
-		if (rpmdbOpen(rootdir, &eiu->db, mode, 0644)) {
-		    const char *dn;
-		    dn = rpmGetPath( (rootdir ? rootdir : ""),
-					"%{_dbpath}", NULL);
-		    rpmMessage(RPMMESS_ERROR,
-				_("cannot open Packages database in %s\n"), dn);
-		    dn = _free(dn);
-		    eiu->numFailed++; *eiu->fnp = NULL;
-		    break;
-		}
-		/*@-onlytrans@*/
-		eiu->ts = rpmtransCreateSet(eiu->db, rootdir);
-		/*@=onlytrans@*/
-	    }
 
 	    if (eiu->relocations) {
 		const char ** paths;
@@ -406,7 +401,7 @@ restart:
 
 		xx = headerNVR(eiu->h, &name, NULL, NULL);
 		/*@-onlytrans@*/
-		mi = rpmdbInitIterator(eiu->db, RPMTAG_NAME, name, 0);
+		mi = rpmdbInitIterator(db, RPMTAG_NAME, name, 0);
 		/*@=onlytrans@*/
 		count = rpmdbGetIteratorCount(mi);
 		while ((oldH = rpmdbNextIterator(mi)) != NULL) {
@@ -424,7 +419,7 @@ restart:
 		/* Package is newer than those currently installed. */
 	    }
 
-	    rc = rpmtransAddPackage(eiu->ts, eiu->h, NULL, fileName,
+	    rc = rpmtransAddPackage(ts, eiu->h, NULL, fileName,
 			       (interfaceFlags & INSTALL_UPGRADE) != 0,
 			       relocations);
 	    /* XXX reference held by transaction set */
@@ -502,7 +497,7 @@ restart:
 	rpmDependencyConflict conflicts;
 	int numConflicts;
 
-	if (rpmdepCheck(eiu->ts, &conflicts, &numConflicts)) {
+	if (rpmdepCheck(ts, &conflicts, &numConflicts)) {
 	    eiu->numFailed = eiu->numPkgs;
 	    stopInstall = 1;
 	}
@@ -519,7 +514,7 @@ restart:
     }
 
     if (eiu->numRPMS && !(interfaceFlags & INSTALL_NOORDER)) {
-	if (rpmdepOrder(eiu->ts)) {
+	if (rpmdepOrder(ts)) {
 	    eiu->numFailed = eiu->numPkgs;
 	    stopInstall = 1;
 	}
@@ -531,7 +526,7 @@ restart:
 	packagesTotal = eiu->numRPMS + eiu->numSRPMS;
 
 	rpmMessage(RPMMESS_DEBUG, _("installing binary packages\n"));
-	rc = rpmRunTransactions(eiu->ts, rpmShowProgress,
+	rc = rpmRunTransactions(ts, rpmShowProgress,
 			(void *) ((long)notifyFlags),
 		 	NULL, &probs, transFlags, probFilter);
 
@@ -562,7 +557,7 @@ restart:
 
 	    if (!(transFlags & RPMTRANS_FLAG_TEST)) {
 #if !defined(__LCLINT__) /* LCL: segfault */
-		eiu->rpmrc = rpmInstallSourcePackage(rootdir, eiu->fd, NULL,
+		eiu->rpmrc = rpmInstallSourcePackage(ts, eiu->fd, NULL,
 			rpmShowProgress, (void *) ((long)notifyFlags), NULL);
 #endif
 		if (eiu->rpmrc != RPMRC_OK) eiu->numFailed++;
@@ -574,7 +569,6 @@ restart:
     }
 
 exit:
-    eiu->ts = rpmtransFree(eiu->ts);
     if (eiu->pkgURL != NULL)
     for (i = 0; i < eiu->numPkgs; i++) {
 	if (eiu->pkgURL[i] == NULL) continue;
@@ -585,23 +579,24 @@ exit:
     eiu->pkgState = _free(eiu->pkgState);
     eiu->pkgURL = _free(eiu->pkgURL);
     eiu->argv = _free(eiu->argv);
-    if (eiu->db != NULL) {
-	xx = rpmdbClose(eiu->db);
-	eiu->db = NULL;
-    }
+
+    ts = rpmtransFree(ts);
+
     return eiu->numFailed;
 }
 
-int rpmErase(const char * rootdir, const char ** argv,
+int rpmErase(const char * rootDir, const char ** argv,
 		rpmtransFlags transFlags,
 		rpmEraseInterfaceFlags interfaceFlags)
 {
-    rpmdb db;
-    int mode;
+    /* XXX W2DO? O_EXCL??? */
+    int mode = (transFlags & RPMTRANS_FLAG_TEST) ? O_RDONLY : (O_RDWR|O_EXCL);
+    rpmdb db = NULL;
+    rpmTransactionSet ts = NULL;
+
     int count;
     const char ** arg;
     int numFailed = 0;
-    rpmTransactionSet ts;
     rpmDependencyConflict conflicts;
     int numConflicts;
     int stopUninstall = 0;
@@ -610,20 +605,15 @@ int rpmErase(const char * rootdir, const char ** argv,
 
     if (argv == NULL) return 0;
 
-    if (transFlags & RPMTRANS_FLAG_TEST)
-	mode = O_RDONLY;
-    else
-	mode = O_RDWR | O_EXCL;
-	
-    if (rpmdbOpen(rootdir, &db, mode, 0644)) {
+    if (rpmdbOpen(rootDir, &db, mode, 0644)) {
 	const char *dn;
-	dn = rpmGetPath( (rootdir ? rootdir : ""), "%{_dbpath}", NULL);
+	dn = rpmGetPath( (rootDir ? rootDir : ""), "%{_dbpath}", NULL);
 	rpmMessage(RPMMESS_ERROR, _("cannot open %s/packages.rpm\n"), dn);
 	dn = _free(dn);
 	return -1;
     }
+    ts = rpmtransCreateSet(db, rootDir);
 
-    ts = rpmtransCreateSet(db, rootdir);
     for (arg = argv; *arg; arg++) {
 	rpmdbMatchIterator mi;
 
@@ -675,12 +665,11 @@ int rpmErase(const char * rootdir, const char ** argv,
     }
 
     ts = rpmtransFree(ts);
-    (void) rpmdbClose(db);
 
     return numFailed;
 }
 
-int rpmInstallSource(const char * rootdir, const char * arg,
+int rpmInstallSource(rpmTransactionSet ts, const char * arg,
 		const char ** specFile, const char ** cookie)
 {
     FD_t fd;
@@ -697,7 +686,7 @@ int rpmInstallSource(const char * rootdir, const char * arg,
 	fprintf(stdout, _("Installing %s\n"), arg);
 
     {
-	rpmRC rpmrc = rpmInstallSourcePackage(rootdir, fd, specFile, NULL, NULL,
+	rpmRC rpmrc = rpmInstallSourcePackage(ts, fd, specFile, NULL, NULL,
 				 cookie);
 	rc = (rpmrc == RPMRC_OK ? 0 : 1);
     }
@@ -821,7 +810,7 @@ IDTX IDTXload(rpmTransactionSet ts, rpmTag tag)
     return IDTXsort(idtx);
 }
 
-IDTX IDTXglob(const char * globstr, rpmTag tag)
+IDTX IDTXglob(rpmTransactionSet ts, const char * globstr, rpmTag tag)
 {
     IDTX idtx = NULL;
     HGE_t hge = (HGE_t) headerGetEntry;
@@ -831,6 +820,7 @@ IDTX IDTXglob(const char * globstr, rpmTag tag)
     const char ** av = NULL;
     int ac = 0;
     int rc;
+    int xx;
     int i;
 
     av = NULL;	ac = 0;
@@ -852,8 +842,11 @@ IDTX IDTXglob(const char * globstr, rpmTag tag)
 	}
 
 	/*@-mustmod@*/	/* LCL: segfault */
-	rpmrc = rpmReadPackageHeader(fd, &h, &isSource, NULL, NULL);
+	xx = rpmReadPackageFile(ts, fd, av[i], &h);
 	/*@=mustmod@*/
+	rpmrc = (xx ? RPMRC_FAIL : RPMRC_OK);		/* XXX HACK */
+	isSource = headerIsEntry(h, RPMTAG_SOURCEPACKAGE);
+
 	if (rpmrc != RPMRC_OK || isSource) {
 	    (void) Fclose(fd);
 	    continue;
@@ -907,7 +900,7 @@ int rpmRollback(/*@unused@*/ struct rpmInstallArguments_s * ia,
     ts = rpmtransCreateSet(db, ia->rootdir);
 
     itids = IDTXload(ts, RPMTAG_INSTALLTID);
-    rtids = IDTXglob(globstr, RPMTAG_REMOVETID);
+    rtids = IDTXglob(ts, globstr, RPMTAG_REMOVETID);
 
     globstr = _free(globstr);
     rtids = IDTXfree(rtids);
diff --git a/lib/rpmlib.h b/lib/rpmlib.h
index b0041fffc..9aec7c59f 100644
--- a/lib/rpmlib.h
+++ b/lib/rpmlib.h
@@ -50,36 +50,6 @@ _free(/*@only@*/ /*@null@*/ /*@out@*/ const void * p)
     return NULL;
 }
 
-/**
- * Return package signatures and header from file handle.
- * @deprecated Signature tags are appended to header in rpm-4.0.2.
- * @todo Eliminate.
- * @param fd		file handle
- * @retval sigp		address of signature header (or NULL)
- * @retval hdrp		address of header (or NULL)
- * @return		rpmRC return code
- */
-rpmRC rpmReadPackageInfo(FD_t fd, /*@null@*/ /*@out@*/ Header * sigp,
-		/*@null@*/ /*@out@*/ Header * hdrp)
-	/*@globals fileSystem@*/
-	/*@modifies fd, *sigp, *hdrp, fileSystem @*/;
-
-/**
- * Return package header and lead info from file handle.
- * @param fd		file handle
- * @retval hdrp		address of header (or NULL)
- * @retval isSource	address to return lead source flag (or NULL)
- * @retval major	address to return lead major (or NULL)
- * @retval minor	address to return lead minor (or NULL)
- * @return		rpmRC return code
- */
-rpmRC rpmReadPackageHeader(FD_t fd, /*@null@*/ /*@out@*/ Header * hdrp,
-		/*@null@*/ /*@out@*/ int * isSource,
-		/*@null@*/ /*@out@*/ int * major,
-		/*@null@*/ /*@out@*/ int * minor)
-	/*@globals fileSystem@*/
-	/*@modifies fd, *hdrp, *isSource, *major, *minor, fileSystem @*/;
-
 /** \ingroup header
  * Return name, version, release strings from header.
  * @param h		header
@@ -140,31 +110,12 @@ void rpmBuildFileList(Header h, /*@out@*/ const char *** fileListPtr,
  * @retval c		address of number of values
  * @return		0 on success, 1 on bad magic, 2 on error
  */
+/*@unused@*/
 int rpmHeaderGetEntry(Header h, int_32 tag, /*@out@*/ int_32 *type,
 		/*@out@*/ void **p, /*@out@*/ int_32 *c)
 	/*@modifies *type, *p, *c @*/;
 
 /**
- * Retrieve tag info from header.
- * Yet Another "dressed" entry to headerGetEntry in order to unify
- * signature/header tag retrieval.
- * @deprecated Signature tags are now duplicated into header when installed.
- * @todo Eliminate from API.
- * @param leadp		rpm lead
- * @param h		header
- * @param sigs		signatures
- * @param tag		tag
- * @retval type		address of tag value data type
- * @retval p		address of pointer to tag value(s)
- * @retval c		address of number of values
- * @return		0 on success, 1 on bad magic, 2 on error
- */
-/*@unused@*/
-int rpmPackageGetEntry(void *leadp, Header sigs, Header h,
-		int_32 tag, int_32 *type, void **p, int_32 *c)
-	/*@modifies h, *type, *p, *c @*/;
-
-/**
  * Automatically generated table of tag name/value pairs.
  */
 /*@-redecl@*/
@@ -1127,33 +1078,13 @@ typedef int (*HRE_t) (Header h, int_32 tag)
  * We pass these around as an array with a sentinel.
  */
 typedef struct rpmRelocation_s {
-/*@only@*/ /*@null@*/ const char * oldPath;
-				/*!< NULL here evals to RPMTAG_DEFAULTPREFIX, */
-/*@only@*/ /*@null@*/ const char * newPath;
-				/*!< NULL means to omit the file completely! */
+/*@only@*/ /*@null@*/
+    const char * oldPath;	/*!< NULL here evals to RPMTAG_DEFAULTPREFIX, */
+/*@only@*/ /*@null@*/
+    const char * newPath;	/*!< NULL means to omit the file completely! */
 } rpmRelocation;
 
 /**
- * Install source package.
- * @param rootDir	path to top of install tree (or NULL)
- * @param fd		file handle
- * @retval specFilePtr	address of spec file name (or NULL)
- * @param notify	progress callback
- * @param notifyData	progress callback private data
- * @retval cooke	address of cookie pointer (or NULL)
- * @return		rpmRC return code
- */
-rpmRC rpmInstallSourcePackage(/*@null@*/ const char * rootDir, FD_t fd,
-			/*@null@*/ /*@out@*/ const char ** specFilePtr,
-			/*@null@*/ rpmCallbackFunction notify,
-			/*@null@*/ rpmCallbackData notifyData,
-			/*@null@*/ /*@out@*/ const char ** cookie)
-	/*@globals rpmGlobalMacroContext,
-		fileSystem, internalState @*/
-	/*@modifies fd, *specFilePtr, *cookie, rpmGlobalMacroContext,
-		fileSystem, internalState @*/;
-
-/**
  * Compare headers to determine which header is "newer".
  * @param first		1st header
  * @param second	2nd header
@@ -1227,6 +1158,39 @@ typedef /*@abstract@*/ struct transactionFileInfo_s * TFI_t;
  */
 typedef /*@abstract@*/ struct rpmTransactionSet_s * rpmTransactionSet;
 
+/**
+ * Return package header from file handle.
+ * @param ts		transaction set
+ * @param fd		file handle
+ * @param fn		file name
+ * @retval hdrp		address of header (or NULL)
+ * @return		0 on success
+ */
+int rpmReadPackageFile(rpmTransactionSet ts, FD_t fd,
+		const char * fn, /*@null@*/ /*@out@*/ Header * hdrp)
+	/*@globals fileSystem, internalState @*/
+	/*@modifies ts, fd, *hdrp, fileSystem, internalState @*/;
+
+/**
+ * Install source package.
+ * @param ts		transaction set
+ * @param fd		file handle
+ * @retval specFilePtr	address of spec file name (or NULL)
+ * @param notify	progress callback
+ * @param notifyData	progress callback private data
+ * @retval cooke	address of cookie pointer (or NULL)
+ * @return		rpmRC return code
+ */
+rpmRC rpmInstallSourcePackage(rpmTransactionSet ts, FD_t fd,
+			/*@null@*/ /*@out@*/ const char ** specFilePtr,
+			/*@null@*/ rpmCallbackFunction notify,
+			/*@null@*/ rpmCallbackData notifyData,
+			/*@null@*/ /*@out@*/ const char ** cookie)
+	/*@globals rpmGlobalMacroContext,
+		fileSystem, internalState @*/
+	/*@modifies ts, fd, *specFilePtr, *cookie, rpmGlobalMacroContext,
+		fileSystem, internalState @*/;
+
 /** \ingroup rpmtrans
  * Create an empty transaction set.
  * @param db		rpm database (may be NULL if database is not accessed)
diff --git a/lib/transaction.c b/lib/transaction.c
index 0c009dfe4..4b9d2563e 100644
--- a/lib/transaction.c
+++ b/lib/transaction.c
@@ -1546,9 +1546,19 @@ assert(alp == fi->ap);
 
 		    h = headerFree(h);
 
+#ifdef	DYING
 		    /*@-mustmod@*/	/* LCL: segfault */
 		    rpmrc = rpmReadPackageHeader(alp->fd, &h, NULL, NULL, NULL);
 		    /*@=mustmod@*/
+#else
+		    /* XXX Leave fd positioned at payload. */
+		    ts->need_payload = 1;
+		    /*@-mustmod@*/	/* LCL: segfault */
+		    xx = rpmReadPackageFile(ts, alp->fd, "rpmRunTransactions", &h);
+		    /*@=mustmod@*/
+		    ts->need_payload = 0;
+		    rpmrc = (xx ? RPMRC_FAIL : RPMRC_OK);      /* XXX HACK */
+#endif
 		    if (!(rpmrc == RPMRC_OK || rpmrc == RPMRC_BADSIZE)) {
 			/*@-noeffectuncon @*/ /* FIX: check rc */
 			(void)ts->notify(fi->h, RPMCALLBACK_INST_CLOSE_FILE,
diff --git a/lib/verify.c b/lib/verify.c
index efd0d0d0c..7f0142a1b 100644
--- a/lib/verify.c
+++ b/lib/verify.c
@@ -13,10 +13,10 @@
 #include "misc.h"	/* XXX for uidToUname() and gnameToGid() */
 #include "debug.h"
 
+/*@access rpmTransactionSet*/
 /*@access TFI_t*/
 /*@access PSM_t*/
 /*@access FD_t*/	/* XXX compared with NULL */
-/*@access rpmdb*/	/* XXX compared with NULL */
 
 #define S_ISDEV(m) (S_ISBLK((m)) || S_ISCHR((m)))
 
@@ -289,10 +289,11 @@ static int rpmVerifyScript(/*@unused@*/ QVA_t qva, rpmTransactionSet ts,
     PSM_t psm = &psmbuf;
     int rc;
 
-    /*@-type@*/ /* FIX: cast? */
-    if (scriptFd != NULL)
+    if (scriptFd != NULL) {
+	/*@-type@*/ /* FIX: ??? */
 	ts->scriptFd = fdLink(scriptFd, "rpmVerifyScript");
-    /*@=type@*/
+	/*@=type@*/
+    }
     fi->magic = TFIMAGIC;
     loadFi(ts, fi, h, 1);
     memset(psm, 0, sizeof(*psm));
@@ -308,7 +309,9 @@ static int rpmVerifyScript(/*@unused@*/ QVA_t qva, rpmTransactionSet ts,
     fi = _free(fi);
 
     if (scriptFd != NULL) {
+	/*@-type@*/ /* FIX: ??? */
 	ts->scriptFd = fdFree(ts->scriptFd, "rpmVerifyScript");
+	/*@=type@*/
 	ts->scriptFd = NULL;
     }
 
diff --git a/po/cs.po b/po/cs.po
index 63f76247f..4fd5f5f82 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-24 21:17-0400\n"
+"POT-Creation-Date: 2001-10-26 00:15-0400\n"
 "PO-Revision-Date: 2001-07-24 10:02+0100\n"
 "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -65,15 +65,15 @@ msgstr "Sestavuji cílové platformy: %s\n"
 msgid "Building for target %s\n"
 msgstr "Sestavuji pro cíl %s\n"
 
-#: rpm2cpio.c:34
+#: rpm2cpio.c:55
 msgid "argument is not an RPM package\n"
 msgstr "parametr není RPM balíèek\n"
 
-#: rpm2cpio.c:38
+#: rpm2cpio.c:61
 msgid "error reading header from package\n"
 msgstr "chyba pøi pøi ètení hlavièky balíèku\n"
 
-#: rpm2cpio.c:60
+#: rpm2cpio.c:83
 #, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr "nemohu znovu otevøít payload: %s\n"
@@ -404,44 +404,44 @@ msgstr "--sign mù¾e být pou¾it jen pøi sestavování balíèkù"
 msgid "exec failed\n"
 msgstr "spu¹tìní selhalo\n"
 
-#: rpmqv.c:959
+#: rpmqv.c:963
 msgid "no packages files given for rebuild"
 msgstr "ke znovusestavení nezadány ¾ádné balíèky"
 
-#: rpmqv.c:1026
+#: rpmqv.c:1038
 msgid "no spec files given for build"
 msgstr "pro sestavení nezadány ¾ádné spec soubory"
 
-#: rpmqv.c:1028
+#: rpmqv.c:1040
 msgid "no tar files given for build"
 msgstr "pro sestavení nezadány ¾ádné tar soubory"
 
-#: rpmqv.c:1047
+#: rpmqv.c:1059
 msgid "no packages given for uninstall"
 msgstr "nezadány ¾ádné balíèky pro odstranìní"
 
-#: rpmqv.c:1058
+#: rpmqv.c:1070
 msgid "no packages given for install"
 msgstr "nezadány ¾ádné balíèky pro instalaci"
 
-#: rpmqv.c:1106
+#: rpmqv.c:1118
 msgid "no arguments given for query"
 msgstr "k dotazu nezadány ¾ádné parametry"
 
-#: rpmqv.c:1120
+#: rpmqv.c:1132
 msgid "no arguments given for verify"
 msgstr "pro kontrolu nezadány ¾ádné balíèky"
 
-#: rpmqv.c:1128
+#: rpmqv.c:1140
 msgid "unexpected arguments to --querytags "
 msgstr "neoèekávané parametry pro --querytags "
 
-#: rpmqv.c:1144
+#: rpmqv.c:1156
 #, fuzzy
 msgid "no arguments given"
 msgstr "k dotazu nezadány ¾ádné parametry"
 
-#: build/build.c:125 build/pack.c:466
+#: build/build.c:125 build/pack.c:487
 msgid "Unable to open temp file.\n"
 msgstr "Nelze otevøít doèasný soubor.\n"
 
@@ -652,7 +652,7 @@ msgstr "Soubor nenalezen globem: %s\n"
 msgid "Could not open %%files file %s: %s\n"
 msgstr "Nemohu otevøít %%files soubor %s: %s\n"
 
-#: build/files.c:1777 build/pack.c:145
+#: build/files.c:1777 build/pack.c:148
 #, c-format
 msgid "line: %s\n"
 msgstr "øádek: %s\n"
@@ -727,156 +727,156 @@ msgstr "getGidS: pøíli¹ mnoho GID\n"
 msgid "Could not canonicalize hostname: %s\n"
 msgstr "Nemohu získat jméno poèítaèe: %s\n"
 
-#: build/pack.c:78
+#: build/pack.c:81
 #, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr "vytváøení archívu selhalo na souboru %s: %s\n"
 
-#: build/pack.c:81
+#: build/pack.c:84
 #, c-format
 msgid "create archive failed: %s\n"
 msgstr "vytváøení archívu selhalo: %s\n"
 
-#: build/pack.c:103
+#: build/pack.c:106
 #, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr "zápis cpio_copy selhal: %s\n"
 
-#: build/pack.c:110
+#: build/pack.c:113
 #, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr "ètení cpio_copy selhalo: %s\n"
 
-#: build/pack.c:213
+#: build/pack.c:216
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr "Nemohu otevøít PreIn soubor: %s\n"
 
-#: build/pack.c:220
+#: build/pack.c:223
 #, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr "Nemohu otevøít PreUn soubor: %s\n"
 
-#: build/pack.c:227
+#: build/pack.c:230
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr "Nemohu otevøít PostIn soubor: %s\n"
 
-#: build/pack.c:234
+#: build/pack.c:237
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr "Nemohu otevøít PostUn soubor: %s\n"
 
-#: build/pack.c:242
+#: build/pack.c:245
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr "Nemohu otevøít VerifyScript soubor: %s\n"
 
-#: build/pack.c:257
+#: build/pack.c:260
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr "Nemohu otevøít soubor se spu¹tí (trigger): %s\n"
 
-#: build/pack.c:285
+#: build/pack.c:288
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "readRPM: otevøení %s: %s\n"
 
-#: build/pack.c:295
+#: build/pack.c:298
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr "readRPM: ètení %s: %s\n"
 
-#: build/pack.c:304 build/pack.c:508
+#: build/pack.c:307 build/pack.c:529
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: Fseek selhal: %s\n"
 
-#: build/pack.c:320
+#: build/pack.c:341
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr "readRPM: %s není RPM balíèek\n"
 
-#: build/pack.c:329
+#: build/pack.c:350
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: ètení hlavièky z %s\n"
 
-#: build/pack.c:454
+#: build/pack.c:475
 #, fuzzy
 msgid "Unable to create immutable header region.\n"
 msgstr "Nemohu pøeèíst hlavièku z %s: %s\n"
 
-#: build/pack.c:472
+#: build/pack.c:493
 #, fuzzy
 msgid "Unable to write temp header\n"
 msgstr "Nemohu zapsat hlavièku do %s: %s\n"
 
-#: build/pack.c:480
+#: build/pack.c:501
 msgid "Bad CSA data\n"
 msgstr "©patná CSA data\n"
 
-#: build/pack.c:515
+#: build/pack.c:536
 #, fuzzy
 msgid "Unable to write final header\n"
 msgstr "Nemohu zapsat hlavièku do %s: %s\n"
 
-#: build/pack.c:533
+#: build/pack.c:554
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "Generuji podpis: %d\n"
 
-#: build/pack.c:546
+#: build/pack.c:567
 #, fuzzy
 msgid "Unable to reload signature header.\n"
 msgstr "Nemohu pøeèíst hlavièku z %s: %s\n"
 
-#: build/pack.c:554
+#: build/pack.c:575
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr "Nemohu otevøít %s: %s\n"
 
-#: build/pack.c:590 lib/psm.c:2149
+#: build/pack.c:611 lib/psm.c:2153
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Nemohu zapsat balíèek: %s\n"
 
-#: build/pack.c:605
+#: build/pack.c:626
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "Nemohu otevøít cíl pro podepsání %s: %s\n"
 
-#: build/pack.c:615
+#: build/pack.c:636
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "Nemohu pøeèíst hlavièku z %s: %s\n"
 
-#: build/pack.c:629
+#: build/pack.c:650
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "Nemohu zapsat hlavièku do %s: %s\n"
 
-#: build/pack.c:639
+#: build/pack.c:660
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "Nemohu pøeèíst payload z %s: %s\n"
 
-#: build/pack.c:645
+#: build/pack.c:666
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Nemohu zapsat payload do %s: %s\n"
 
-#: build/pack.c:670 lib/psm.c:2415
+#: build/pack.c:691 lib/psm.c:2419
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Zapsáno: %s\n"
 
-#: build/pack.c:737
+#: build/pack.c:758
 #, 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:754
+#: build/pack.c:775
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr "nemohu vytvoøit %s: %s\n"
@@ -1452,60 +1452,60 @@ msgstr ""
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
-#: lib/depends.c:585 lib/depends.c:1248 lib/depends.c:1381
+#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
 msgid "YES"
 msgstr "ANO"
 
-#: lib/depends.c:585 lib/depends.c:1248 lib/depends.c:1381
+#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
 msgid "NO "
 msgstr "NE "
 
-#: lib/depends.c:1042
+#: lib/depends.c:1044
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr "%s: %-45s ANO (pøidány soubory)\n"
 
-#: lib/depends.c:1153
+#: lib/depends.c:1155
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr "%s: %-45s ANO (pøidáno poskytuje)\n"
 
-#: lib/depends.c:1247
+#: lib/depends.c:1249
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr "%s: %-45s %-s (ke¹ováno)\n"
 
-#: lib/depends.c:1276
+#: lib/depends.c:1278
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr "%s: %-45s ANO (rpmrc poskytuje)\n"
 
-#: lib/depends.c:1293
+#: lib/depends.c:1295
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "%s: %-45s ANO (rpmlib poskytuje)\n"
 
-#: lib/depends.c:1317
+#: lib/depends.c:1319
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr "%s: %-45s ANO (db soubory)\n"
 
-#: lib/depends.c:1330
+#: lib/depends.c:1332
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr "%s: %-45s ANO (db poskytuje)\n"
 
-#: lib/depends.c:1344
+#: lib/depends.c:1346
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr "%s: %-45s ANO (db balíèek)\n"
 
-#: lib/depends.c:1360
+#: lib/depends.c:1362
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr "%s: %-45s NE\n"
 
-#: lib/depends.c:1381
+#: lib/depends.c:1383
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: (%s, %s) pøidáno do ke¹e závislostí.\n"
@@ -1513,43 +1513,43 @@ msgstr "%s: (%s, %s) pøidáno do ke¹e závislostí.\n"
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1454
+#: lib/depends.c:1456
 #, 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:1533
+#: lib/depends.c:1535
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "balíèek %s koliduje: %s\n"
 
-#: lib/depends.c:1786
+#: lib/depends.c:1788
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr "odstraòuji %s-%s-%s \"%s\" z tsort relací.\n"
 
 #. Record all relations.
-#: lib/depends.c:1936
+#: lib/depends.c:1938
 msgid "========== recording tsort relations\n"
 msgstr "========== ukládání tsort relací\n"
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1996
+#: lib/depends.c:1998
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 "========== tsorting balíèkù (poøadí, #pøedchùdce, #následovník, hloubka)\n"
 
-#: lib/depends.c:2046
+#: lib/depends.c:2048
 msgid "========== successors only (presentation order)\n"
 msgstr "========== pouze úspì¹né (poøadí dle prezentace)\n"
 
-#: lib/depends.c:2099
+#: lib/depends.c:2101
 msgid "LOOP:\n"
 msgstr "SMYÈKA:\n"
 
-#: lib/depends.c:2129
+#: lib/depends.c:2131
 msgid "========== continuing tsort ...\n"
 msgstr "========== pokraèuje tsort ...\n"
 
@@ -1738,15 +1738,45 @@ msgstr "(neznámý typ)"
 msgid "error creating temporary file %s\n"
 msgstr "chyba pøi vytváøení doèasného souboru %s\n"
 
-#: lib/package.c:161
+#: lib/package.c:167 lib/package.c:238
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr "práce s balíèky verze 1 není podporována touto verzí RPM\n"
 
-#: lib/package.c:184
+#: lib/package.c:188 lib/package.c:246
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr "tato verze RPM podporuje práci s balíèky s verzí <= 4\n"
 
+#: lib/package.c:224 lib/rpmchecksig.c:158 lib/rpmchecksig.c:506
+#, c-format
+msgid "%s: readLead failed\n"
+msgstr "%s: readLead selhalo\n"
+
+#: lib/package.c:230
+#, fuzzy, c-format
+msgid "%s: bad magic\n"
+msgstr "©patné magické èíslo"
+
+#: lib/package.c:254 lib/rpmchecksig.c:176 lib/rpmchecksig.c:522
+#, c-format
+msgid "%s: rpmReadSignature failed\n"
+msgstr "%s: rpmReadSignature selhalo\n"
+
+#: lib/package.c:258 lib/rpmchecksig.c:180 lib/rpmchecksig.c:527
+#, c-format
+msgid "%s: No signature available\n"
+msgstr "%s: Není dostupný ¾ádný podpis\n"
+
+#: lib/package.c:284
+#, fuzzy, c-format
+msgid "%s: headerRead failed\n"
+msgstr "%s: readLead selhalo\n"
+
+#: lib/package.c:303 lib/rpmchecksig.c:109 lib/rpmchecksig.c:450
+#, c-format
+msgid "%s: Fread failed: %s\n"
+msgstr "%s: Fread selhalo: %s\n"
+
 #: lib/poptI.c:47
 msgid "exclude paths must begin with a /"
 msgstr "vynechané cesty musí zaèínat znakem /"
@@ -2253,275 +2283,250 @@ msgstr "nemohu vytvoøit %s: %s\n"
 msgid "cannot write to %%%s %s\n"
 msgstr "nemohu zapsat do %%%s %s\n"
 
-#: lib/psm.c:1214
+#: lib/psm.c:1217
 msgid "source package expected, binary found\n"
 msgstr "oèekávám balíèek se zdrojovými kódy, nalezen v¹ak binární\n"
 
-#: lib/psm.c:1325
+#: lib/psm.c:1330
 msgid "source package contains no .spec file\n"
 msgstr "zdrojový balíèek neobsahuje .spec soubor\n"
 
-#: lib/psm.c:1432
+#: lib/psm.c:1436
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "%s: spou¹tím %s skript(y) (pokud existují)\n"
 
-#: lib/psm.c:1600
+#: lib/psm.c:1604
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr "provedení skripletu %s z %s-%s-%s selhalo, návratový kód byl: %s\n"
 
-#: lib/psm.c:1607
+#: lib/psm.c:1611
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr "provedení %s skripletu z %s-%s-%s selhalo, návratový kód: %d\n"
 
-#: lib/psm.c:1954
+#: lib/psm.c:1958
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr "%s: %s-%s-%s obsahuje %d souborù, test = %d\n"
 
-#: lib/psm.c:2071
+#: lib/psm.c:2075
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr "%s: scriptlet %s selhal (%d), pøeskakuji %s-%s-%s\n"
 
-#: lib/psm.c:2186
+#: lib/psm.c:2190
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "u¾ivatel %s neexistuje - pou¾it u¾ivatel root\n"
 
-#: lib/psm.c:2195
+#: lib/psm.c:2199
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "skupina %s neexistuje - pou¾ita skupina root\n"
 
-#: lib/psm.c:2236
+#: lib/psm.c:2240
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "rozbalování archívu selhalo %s%s: %s\n"
 
-#: lib/psm.c:2237
+#: lib/psm.c:2241
 msgid " on file "
 msgstr " na souboru "
 
-#: lib/psm.c:2423
+#: lib/psm.c:2427
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "nemohu otevøít %s: %s\n"
 
-#: lib/psm.c:2426
+#: lib/psm.c:2430
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s selhalo\n"
 
-#: lib/query.c:128
+#: lib/query.c:124
 #, c-format
 msgid "incorrect format: %s\n"
 msgstr "nesprávný formát: %s\n"
 
-#: lib/query.c:225
+#: lib/query.c:221
 msgid "(contains no files)"
 msgstr "(neobsahuje ¾ádné soubory)"
 
-#: lib/query.c:286
+#: lib/query.c:282
 msgid "normal        "
 msgstr "normální      "
 
-#: lib/query.c:289
+#: lib/query.c:285
 msgid "replaced      "
 msgstr "nahrazen      "
 
-#: lib/query.c:292
+#: lib/query.c:288
 msgid "not installed "
 msgstr "neinstalován  "
 
-#: lib/query.c:295
+#: lib/query.c:291
 msgid "net shared    "
 msgstr "sdílen v síti "
 
-#: lib/query.c:298
+#: lib/query.c:294
 #, c-format
 msgid "(unknown %3d) "
 msgstr "(neznámý %3d) "
 
-#: lib/query.c:303
+#: lib/query.c:299
 msgid "(no state)    "
 msgstr "(chybí stav)  "
 
-#: lib/query.c:322 lib/query.c:378
+#: lib/query.c:318 lib/query.c:374
 msgid "package has neither file owner or id lists\n"
 msgstr "balíèek nemá vlastníka souboru ani seznamy id\n"
 
-#: lib/query.c:467
+#: lib/query.c:463
 #, c-format
 msgid "can't query %s: %s\n"
 msgstr "nemohu provést dotaz %s: %s\n"
 
-#: lib/query.c:582 lib/rpmchecksig.c:159 lib/rpmchecksig.c:492
-#, c-format
-msgid "%s: readLead failed\n"
-msgstr "%s: readLead selhalo\n"
-
-#: lib/query.c:588 lib/rpmchecksig.c:498
-#, c-format
-msgid "%s: No signature available (v1.0 RPM)\n"
-msgstr "%s: Není dostupný ¾ádný podpis (RPM v1.0)\n"
-
-#: lib/query.c:597 lib/rpmchecksig.c:177 lib/rpmchecksig.c:508
-#, c-format
-msgid "%s: rpmReadSignature failed\n"
-msgstr "%s: rpmReadSignature selhalo\n"
-
-#: lib/query.c:601 lib/rpmchecksig.c:181 lib/rpmchecksig.c:513
-#, c-format
-msgid "%s: No signature available\n"
-msgstr "%s: Není dostupný ¾ádný podpis\n"
-
-#: lib/query.c:624
-#, fuzzy, c-format
-msgid "%s: headerRead failed\n"
-msgstr "%s: readLead selhalo\n"
-
-#: lib/query.c:641 lib/rpmchecksig.c:110 lib/rpmchecksig.c:287
-#, c-format
-msgid "%s: Fread failed: %s\n"
-msgstr "%s: Fread selhalo: %s\n"
-
-#: lib/query.c:758 lib/query.c:796 lib/rpminstall.c:324 lib/rpminstall.c:468
-#: lib/rpminstall.c:848
+#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463
+#: lib/rpminstall.c:838
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "otevøení %s selhalo: %s\n"
 
-#: lib/query.c:774
+#: lib/query.c:616
 #, c-format
 msgid "query of %s failed\n"
 msgstr "dotaz na %s se nezdaøil\n"
 
-#: lib/query.c:780
+#: lib/query.c:622
 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:806 lib/rpminstall.c:481
+#: lib/query.c:648 lib/rpminstall.c:476
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: Fread selhalo: %s\n"
 
-#: lib/query.c:850
+#: lib/query.c:692
 #, 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:874
+#: lib/query.c:716
 msgid "no packages\n"
 msgstr "¾ádné balíèky\n"
 
-#: lib/query.c:894
+#: lib/query.c:736
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "skupina %s neobsahuje ¾ádné balíèky\n"
 
-#: lib/query.c:904
+#: lib/query.c:746
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "¾ádný balíèek neaktivuje %s\n"
 
-#: lib/query.c:914
+#: lib/query.c:756
 #, c-format
 msgid "no package requires %s\n"
 msgstr "¾ádný balíèek nevy¾aduje %s\n"
 
-#: lib/query.c:925
+#: lib/query.c:767
 #, c-format
 msgid "no package provides %s\n"
 msgstr "¾ádný balíèek neposkytuje %s\n"
 
-#: lib/query.c:962
+#: lib/query.c:804
 #, c-format
 msgid "file %s: %s\n"
 msgstr "soubor %s: %s\n"
 
-#: lib/query.c:966
+#: lib/query.c:808
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "soubor %s nevlastní ¾ádný balíèek\n"
 
-#: lib/query.c:993
+#: lib/query.c:835
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "neplatné èíslo balíèku: %s\n"
 
-#: lib/query.c:996
+#: lib/query.c:838
 #, c-format
 msgid "package record number: %u\n"
 msgstr "záznam balíèku èíslo: %u\n"
 
-#: lib/query.c:1001
+#: lib/query.c:843
 #, c-format
 msgid "record %u could not be read\n"
 msgstr "záznam %d nelze pøeèíst\n"
 
-#: lib/query.c:1012 lib/rpminstall.c:634
+#: lib/query.c:854 lib/rpminstall.c:624
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "balíèek %s není nainstalován\n"
 
-#: lib/rpmchecksig.c:50
+#: lib/rpmchecksig.c:49
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s: otevøení selhalo: %s\n"
 
-#: lib/rpmchecksig.c:62
+#: lib/rpmchecksig.c:61
 msgid "makeTempFile failed\n"
 msgstr "makeTempFile selhalo\n"
 
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:103
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: Fwrite selhalo: %s\n"
 
-#: lib/rpmchecksig.c:164
+#: lib/rpmchecksig.c:163
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr "%s: RPM v1.0 nelze podepsat\n"
 
-#: lib/rpmchecksig.c:168
+#: lib/rpmchecksig.c:167
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr "%s: Nemohu znovu podepsat RPM v2.0\n"
 
-#: lib/rpmchecksig.c:214
+#: lib/rpmchecksig.c:213
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: writeLead selhalo: %s\n"
 
-#: lib/rpmchecksig.c:220
+#: lib/rpmchecksig.c:219
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmWriteSignature selhalo: %s\n"
 
-#: lib/rpmchecksig.c:731
+#: lib/rpmchecksig.c:512
+#, c-format
+msgid "%s: No signature available (v1.0 RPM)\n"
+msgstr "%s: Není dostupný ¾ádný podpis (RPM v1.0)\n"
+
+#: lib/rpmchecksig.c:707
 msgid "NOT OK"
 msgstr "NENÍ OK"
 
-#: lib/rpmchecksig.c:732 lib/rpmchecksig.c:746
+#: lib/rpmchecksig.c:708 lib/rpmchecksig.c:722
 msgid " (MISSING KEYS:"
 msgstr " (CHYBÍ KLÍÈ:"
 
-#: lib/rpmchecksig.c:734 lib/rpmchecksig.c:748
+#: lib/rpmchecksig.c:710 lib/rpmchecksig.c:724
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:735 lib/rpmchecksig.c:749
+#: lib/rpmchecksig.c:711 lib/rpmchecksig.c:725
 msgid " (UNTRUSTED KEYS:"
 msgstr " (NEDÙVÌRYHODNÝ KLÍÈ:"
 
-#: lib/rpmchecksig.c:737 lib/rpmchecksig.c:751
+#: lib/rpmchecksig.c:713 lib/rpmchecksig.c:727
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:745
+#: lib/rpmchecksig.c:721
 msgid "OK"
 msgstr "OK"
 
@@ -2533,86 +2538,86 @@ msgstr "Pøipravuji..."
 msgid "Preparing packages for installation..."
 msgstr "Pøipravuji balíèky pro instalaci..."
 
-#: lib/rpminstall.c:274
+#: lib/rpminstall.c:228
+#, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr "nemohu otevøít databázi balíèkù v %s\n"
+
+#: lib/rpminstall.c:285
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "Stahuji %s\n"
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:284
+#: lib/rpminstall.c:295
 #, c-format
 msgid " ... as %s\n"
 msgstr " ... jako %s\n"
 
-#: lib/rpminstall.c:288
+#: lib/rpminstall.c:299
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "pøeskakuji %s - pøenos selhal - %s\n"
 
-#: lib/rpminstall.c:370
-#, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr "nemohu otevøít databázi balíèkù v %s\n"
-
-#: lib/rpminstall.c:393
+#: lib/rpminstall.c:388
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr "balíèek %s není pøemístitelný\n"
 
-#: lib/rpminstall.c:442
+#: lib/rpminstall.c:437
 #, c-format
 msgid "error reading from file %s\n"
 msgstr "chyba pøi ètení ze souboru %s\n"
 
-#: lib/rpminstall.c:448
+#: lib/rpminstall.c:443
 #, 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:460 lib/rpminstall.c:705
+#: lib/rpminstall.c:455 lib/rpminstall.c:694
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr "%s nemù¾e být nainstalován\n"
 
-#: lib/rpminstall.c:496
+#: lib/rpminstall.c:491
 #, 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:512
+#: lib/rpminstall.c:507
 msgid "failed dependencies:\n"
 msgstr "nevyøe¹ené závislosti:\n"
 
-#: lib/rpminstall.c:533
+#: lib/rpminstall.c:528
 msgid "installing binary packages\n"
 msgstr "instaluji binární balíèky\n"
 
-#: lib/rpminstall.c:554
+#: lib/rpminstall.c:549
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "nemohu otevøít soubor %s: %s\n"
 
-#: lib/rpminstall.c:621
+#: lib/rpminstall.c:611
 #, c-format
 msgid "cannot open %s/packages.rpm\n"
 msgstr "chyba: nemohu otevøít %s/packages.rpm\n"
 
-#: lib/rpminstall.c:637
+#: lib/rpminstall.c:627
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" urèuje více balíèkù\n"
 
-#: lib/rpminstall.c:661
+#: lib/rpminstall.c:651
 msgid "removing these packages would break dependencies:\n"
 msgstr "odstranìní tìchto balíèkù by poru¹ilo závislosti:\n"
 
-#: lib/rpminstall.c:691
+#: lib/rpminstall.c:680
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr "nemohu otevøít %s: %s\n"
 
-#: lib/rpminstall.c:697
+#: lib/rpminstall.c:686
 #, c-format
 msgid "Installing %s\n"
 msgstr "Instaluji %s\n"
@@ -2885,17 +2890,17 @@ msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 "balíèek neobsahuje ani jména skupin ani seznam id (nemìlo by se nikdy stát)\n"
 
-#: lib/verify.c:414
+#: lib/verify.c:417
 #, c-format
 msgid "missing    %s"
 msgstr "chybí      %s"
 
-#: lib/verify.c:511
+#: lib/verify.c:514
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr "Nevyøe¹ené závislosti pro %s-%s-%s: "
 
-#: lib/verify.c:556
+#: lib/verify.c:559
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr "%s-%s-%s: kontrola digestu v hlavièce selhala\n"
diff --git a/po/da.po b/po/da.po
index cfa50a050..832998d0b 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-24 21:17-0400\n"
+"POT-Creation-Date: 2001-10-26 00:15-0400\n"
 "PO-Revision-Date: 2001-04-05 23:03GMT\n"
 "Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -66,15 +66,15 @@ msgstr "Opbygger mål-platforme: %s\n"
 msgid "Building for target %s\n"
 msgstr "Opbygger for mål %s\n"
 
-#: rpm2cpio.c:34
+#: rpm2cpio.c:55
 msgid "argument is not an RPM package\n"
 msgstr "parameter er ikke en RPM-pakke\n"
 
-#: rpm2cpio.c:38
+#: rpm2cpio.c:61
 msgid "error reading header from package\n"
 msgstr "fejl ved læsning af hovedet på pakke\n"
 
-#: rpm2cpio.c:60
+#: rpm2cpio.c:83
 #, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr "kan ikke genåbne pakkeindhold: %s\n"
@@ -399,44 +399,44 @@ msgstr "--sign kan kun bruges ved pakkeopbygning"
 msgid "exec failed\n"
 msgstr "eksekvering mislykkedes\n"
 
-#: rpmqv.c:959
+#: rpmqv.c:963
 msgid "no packages files given for rebuild"
 msgstr "ingen pakkefiler angivet til genopbygning"
 
-#: rpmqv.c:1026
+#: rpmqv.c:1038
 msgid "no spec files given for build"
 msgstr "ingen spec-fil angivet til opbygning"
 
-#: rpmqv.c:1028
+#: rpmqv.c:1040
 msgid "no tar files given for build"
 msgstr "ingen tar-arkiver angivet til opbygning"
 
-#: rpmqv.c:1047
+#: rpmqv.c:1059
 msgid "no packages given for uninstall"
 msgstr "ingen pakker angivet ved afinstallation"
 
-#: rpmqv.c:1058
+#: rpmqv.c:1070
 msgid "no packages given for install"
 msgstr "ingen pakker angivet ved installation"
 
-#: rpmqv.c:1106
+#: rpmqv.c:1118
 msgid "no arguments given for query"
 msgstr "ingen parametre angivet ved forespørgsel"
 
-#: rpmqv.c:1120
+#: rpmqv.c:1132
 msgid "no arguments given for verify"
 msgstr "ingen parametre angivet ved verifikation"
 
-#: rpmqv.c:1128
+#: rpmqv.c:1140
 msgid "unexpected arguments to --querytags "
 msgstr "uventede parametre til --querytags "
 
-#: rpmqv.c:1144
+#: rpmqv.c:1156
 #, fuzzy
 msgid "no arguments given"
 msgstr "ingen parametre angivet ved forespørgsel"
 
-#: build/build.c:125 build/pack.c:466
+#: build/build.c:125 build/pack.c:487
 msgid "Unable to open temp file.\n"
 msgstr "Kunne ikke åbne midlertidig fil.\n"
 
@@ -647,7 +647,7 @@ msgstr "Fil ikke fundet med glob: %s\n"
 msgid "Could not open %%files file %s: %s\n"
 msgstr "Kunne ikke åbne '%%files'-fil %s: %s\n"
 
-#: build/files.c:1777 build/pack.c:145
+#: build/files.c:1777 build/pack.c:148
 #, c-format
 msgid "line: %s\n"
 msgstr "linie: %s\n"
@@ -724,156 +724,156 @@ msgstr "getGnameS: for mange gid'er\n"
 msgid "Could not canonicalize hostname: %s\n"
 msgstr "Kunne ikke kanonisere værtsnavn: %s\n"
 
-#: build/pack.c:78
+#: build/pack.c:81
 #, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr "arkivoprettelse mislykkedes ved fil %s: %s\n"
 
-#: build/pack.c:81
+#: build/pack.c:84
 #, fuzzy, c-format
 msgid "create archive failed: %s\n"
 msgstr "arkivoprettelse mislykkedes ved fil %s: %s\n"
 
-#: build/pack.c:103
+#: build/pack.c:106
 #, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr "cpio_copy-skrivning mislykkedes: %s\n"
 
-#: build/pack.c:110
+#: build/pack.c:113
 #, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr "cpio_copy-læsning mislykkedes: %s\n"
 
-#: build/pack.c:213
+#: build/pack.c:216
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr "Kunne ikke åbne 'PreIn'-fil: %s\n"
 
-#: build/pack.c:220
+#: build/pack.c:223
 #, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr "Kunne ikke åbne 'PreUn'-fil: %s\n"
 
-#: build/pack.c:227
+#: build/pack.c:230
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr "Kunne ikke åbne 'PostIn'-fil: %s\n"
 
-#: build/pack.c:234
+#: build/pack.c:237
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr "Kunne ikke åbne 'PostUn'-fil: %s\n"
 
-#: build/pack.c:242
+#: build/pack.c:245
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr "Kunne ikke åbne 'VerifyScript'-fil: %s\n"
 
-#: build/pack.c:257
+#: build/pack.c:260
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr "Kunne ikke åbne skriptfilen Trigger: %s\n"
 
-#: build/pack.c:285
+#: build/pack.c:288
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "readRPM: åbn %s: %s\n"
 
-#: build/pack.c:295
+#: build/pack.c:298
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr "readRPM: læs %s: %s\n"
 
-#: build/pack.c:304 build/pack.c:508
+#: build/pack.c:307 build/pack.c:529
 #, fuzzy, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: Fread mislykkedes: %s\n"
 
-#: build/pack.c:320
+#: build/pack.c:341
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr "readRPM: %s er ikke nogen RPM-pakke\n"
 
-#: build/pack.c:329
+#: build/pack.c:350
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: læser hoved fra %s\n"
 
-#: build/pack.c:454
+#: build/pack.c:475
 #, fuzzy
 msgid "Unable to create immutable header region.\n"
 msgstr "Kunne ikke læse hoved fra %s: %s\n"
 
-#: build/pack.c:472
+#: build/pack.c:493
 #, fuzzy
 msgid "Unable to write temp header\n"
 msgstr "Kunne ikke skrive hoved til %s: %s\n"
 
-#: build/pack.c:480
+#: build/pack.c:501
 msgid "Bad CSA data\n"
 msgstr "Ugyldige CSA-data\n"
 
-#: build/pack.c:515
+#: build/pack.c:536
 #, fuzzy
 msgid "Unable to write final header\n"
 msgstr "Kunne ikke skrive hoved til %s: %s\n"
 
-#: build/pack.c:533
+#: build/pack.c:554
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "Genererer signatur: %d\n"
 
-#: build/pack.c:546
+#: build/pack.c:567
 #, fuzzy
 msgid "Unable to reload signature header.\n"
 msgstr "Kunne ikke læse hoved fra %s: %s\n"
 
-#: build/pack.c:554
+#: build/pack.c:575
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr "Kunne ikke åbne %s: %s\n"
 
-#: build/pack.c:590 lib/psm.c:2149
+#: build/pack.c:611 lib/psm.c:2153
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Kunne ikke skrive pakke: %s\n"
 
-#: build/pack.c:605
+#: build/pack.c:626
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "Kunne ikke åbne sigtarget %s: %s\n"
 
-#: build/pack.c:615
+#: build/pack.c:636
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "Kunne ikke læse hoved fra %s: %s\n"
 
-#: build/pack.c:629
+#: build/pack.c:650
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "Kunne ikke skrive hoved til %s: %s\n"
 
-#: build/pack.c:639
+#: build/pack.c:660
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "Kunne ikke læse pakkeindhold fra %s: %s\n"
 
-#: build/pack.c:645
+#: build/pack.c:666
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Kunne ikke skrive pakkeindhold til %s: %s\n"
 
-#: build/pack.c:670 lib/psm.c:2415
+#: build/pack.c:691 lib/psm.c:2419
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Skrev: %s\n"
 
-#: build/pack.c:737
+#: build/pack.c:758
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr "Kunne ikke generere filnavn til oprettelse af pakke %s: %s\n"
 
-#: build/pack.c:754
+#: build/pack.c:775
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr "kan ikke oprette %s: %s\n"
@@ -1453,61 +1453,61 @@ msgstr ""
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
-#: lib/depends.c:585 lib/depends.c:1248 lib/depends.c:1381
+#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1248 lib/depends.c:1381
+#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
 #, fuzzy
 msgid "NO "
 msgstr "IKKE O.K."
 
-#: lib/depends.c:1042
+#: lib/depends.c:1044
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr "%s: %-45s JA (tilføjede filer)\n"
 
-#: lib/depends.c:1153
+#: lib/depends.c:1155
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr "%s: %-45s JA (tilføjede 'provide')\n"
 
-#: lib/depends.c:1247
+#: lib/depends.c:1249
 #, fuzzy, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr "%s: %-45s %-3s (husket)\n"
 
-#: lib/depends.c:1276
+#: lib/depends.c:1278
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr "%s: %-45s JA (rpmrc tilfører)\n"
 
-#: lib/depends.c:1293
+#: lib/depends.c:1295
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "%s: %-45s JA (rpmlib tilfører)\n"
 
-#: lib/depends.c:1317
+#: lib/depends.c:1319
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr "%s: %-45s JA (db-filer)\n"
 
-#: lib/depends.c:1330
+#: lib/depends.c:1332
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr "%s: %-45s JA (db tilfører)\n"
 
-#: lib/depends.c:1344
+#: lib/depends.c:1346
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr "%s: %-45s JA (db-pakke)\n"
 
-#: lib/depends.c:1360
+#: lib/depends.c:1362
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr "%s: %-45s NEJ\n"
 
-#: lib/depends.c:1381
+#: lib/depends.c:1383
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: (%s, %s) tilføjet til afhængigheds-buffer.\n"
@@ -1515,42 +1515,42 @@ msgstr "%s: (%s, %s) tilføjet til afhængigheds-buffer.\n"
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1454
+#: lib/depends.c:1456
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "pakke %s-%s-%s krav ikke opfyldt: %s\n"
 
 #. conflicts exist.
-#: lib/depends.c:1533
+#: lib/depends.c:1535
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "pakke %s skaber konflikt: %s\n"
 
-#: lib/depends.c:1786
+#: lib/depends.c:1788
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr "fjerne %s-%s-%s \"%s\" fra tsort-relationer.\n"
 
 #. Record all relations.
-#: lib/depends.c:1936
+#: lib/depends.c:1938
 msgid "========== recording tsort relations\n"
 msgstr "========== gemmer tsort-relationer\n"
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1996
+#: lib/depends.c:1998
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2046
+#: lib/depends.c:2048
 msgid "========== successors only (presentation order)\n"
 msgstr "========== kun efterfølgere (præsentationsrækkefølge)\n"
 
-#: lib/depends.c:2099
+#: lib/depends.c:2101
 msgid "LOOP:\n"
 msgstr "LØKKE:\n"
 
-#: lib/depends.c:2129
+#: lib/depends.c:2131
 msgid "========== continuing tsort ...\n"
 msgstr "========== fortsætter tsort ...\n"
 
@@ -1738,16 +1738,46 @@ msgstr "(ukendt type)"
 msgid "error creating temporary file %s\n"
 msgstr "fejl ved oprettelse af midlertidig fil %s\n"
 
-#: lib/package.c:161
+#: lib/package.c:167 lib/package.c:238
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr "indpakningsversion 1 understøttes ikke af denne udgave af RPM\n"
 
-#: lib/package.c:184
+#: lib/package.c:188 lib/package.c:246
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 "kun indpakninger med hovedversion <= 4 understøttes af denne udgave af RPM\n"
 
+#: lib/package.c:224 lib/rpmchecksig.c:158 lib/rpmchecksig.c:506
+#, c-format
+msgid "%s: readLead failed\n"
+msgstr "%s: readLead mislykkedes\n"
+
+#: lib/package.c:230
+#, fuzzy, c-format
+msgid "%s: bad magic\n"
+msgstr "Ugyldigt magisk tal"
+
+#: lib/package.c:254 lib/rpmchecksig.c:176 lib/rpmchecksig.c:522
+#, c-format
+msgid "%s: rpmReadSignature failed\n"
+msgstr "%s: rpmReadSignature mislykkedes\n"
+
+#: lib/package.c:258 lib/rpmchecksig.c:180 lib/rpmchecksig.c:527
+#, c-format
+msgid "%s: No signature available\n"
+msgstr "%s: Ingen tilgængelig signatur\n"
+
+#: lib/package.c:284
+#, fuzzy, c-format
+msgid "%s: headerRead failed\n"
+msgstr "%s: readLead mislykkedes\n"
+
+#: lib/package.c:303 lib/rpmchecksig.c:109 lib/rpmchecksig.c:450
+#, c-format
+msgid "%s: Fread failed: %s\n"
+msgstr "%s: Fread mislykkedes: %s\n"
+
 #: lib/poptI.c:47
 msgid "exclude paths must begin with a /"
 msgstr "udeladte stier skal begynde med et /"
@@ -2272,277 +2302,252 @@ msgstr "kan ikke oprette %s: %s\n"
 msgid "cannot write to %%%s %s\n"
 msgstr "kunne ikke skrive til %s\n"
 
-#: lib/psm.c:1214
+#: lib/psm.c:1217
 msgid "source package expected, binary found\n"
 msgstr "kildepakke forventet, binær fundet\n"
 
-#: lib/psm.c:1325
+#: lib/psm.c:1330
 msgid "source package contains no .spec file\n"
 msgstr "kildepakke indeholder ingen .spec-fil\n"
 
-#: lib/psm.c:1432
+#: lib/psm.c:1436
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "kører postinstallations-skript (hvis det findes)\n"
 
-#: lib/psm.c:1600
+#: lib/psm.c:1604
 #, fuzzy, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 "kørsel af småskriptet %s fra %s-%s-%s mislykkedes, afslutningsstatus %d\n"
 
-#: lib/psm.c:1607
+#: lib/psm.c:1611
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 "kørsel af småskriptet %s fra %s-%s-%s mislykkedes, afslutningsstatus %d\n"
 
-#: lib/psm.c:1954
+#: lib/psm.c:1958
 #, fuzzy, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr "pakke: %s-%s-%s filer test = %d\n"
 
-#: lib/psm.c:2071
+#: lib/psm.c:2075
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2186
+#: lib/psm.c:2190
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "bruger %s eksisterer ikke - bruger root\n"
 
-#: lib/psm.c:2195
+#: lib/psm.c:2199
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "gruppe %s eksisterer ikke - bruger root\n"
 
-#: lib/psm.c:2236
+#: lib/psm.c:2240
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "udpakning af arkiv mislykkedes%s%s: %s\n"
 
-#: lib/psm.c:2237
+#: lib/psm.c:2241
 msgid " on file "
 msgstr " for fil "
 
-#: lib/psm.c:2423
+#: lib/psm.c:2427
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "kunne ikke åbne %s: %s\n"
 
-#: lib/psm.c:2426
+#: lib/psm.c:2430
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s mislykkedes\n"
 
-#: lib/query.c:128
+#: lib/query.c:124
 #, c-format
 msgid "incorrect format: %s\n"
 msgstr "ugyldigt format: %s\n"
 
-#: lib/query.c:225
+#: lib/query.c:221
 msgid "(contains no files)"
 msgstr "(indeholder ingen filer)"
 
-#: lib/query.c:286
+#: lib/query.c:282
 msgid "normal        "
 msgstr "normal        "
 
-#: lib/query.c:289
+#: lib/query.c:285
 msgid "replaced      "
 msgstr "erstattet     "
 
-#: lib/query.c:292
+#: lib/query.c:288
 msgid "not installed "
 msgstr "ej installeret"
 
-#: lib/query.c:295
+#: lib/query.c:291
 msgid "net shared    "
 msgstr "ej delt       "
 
-#: lib/query.c:298
+#: lib/query.c:294
 #, c-format
 msgid "(unknown %3d) "
 msgstr "(ukendt %3d)  "
 
-#: lib/query.c:303
+#: lib/query.c:299
 msgid "(no state)    "
 msgstr "(ingen status)"
 
-#: lib/query.c:322 lib/query.c:378
+#: lib/query.c:318 lib/query.c:374
 msgid "package has neither file owner or id lists\n"
 msgstr "pakke har hverken filejerskabs- eller id-lister\n"
 
-#: lib/query.c:467
+#: lib/query.c:463
 #, c-format
 msgid "can't query %s: %s\n"
 msgstr "kunne ikke forespørge %s: %s\n"
 
-#: lib/query.c:582 lib/rpmchecksig.c:159 lib/rpmchecksig.c:492
-#, c-format
-msgid "%s: readLead failed\n"
-msgstr "%s: readLead mislykkedes\n"
-
-#: lib/query.c:588 lib/rpmchecksig.c:498
-#, c-format
-msgid "%s: No signature available (v1.0 RPM)\n"
-msgstr "%s: Ingen tilgængelig signatur (v1.0 RPM)\n"
-
-#: lib/query.c:597 lib/rpmchecksig.c:177 lib/rpmchecksig.c:508
-#, c-format
-msgid "%s: rpmReadSignature failed\n"
-msgstr "%s: rpmReadSignature mislykkedes\n"
-
-#: lib/query.c:601 lib/rpmchecksig.c:181 lib/rpmchecksig.c:513
-#, c-format
-msgid "%s: No signature available\n"
-msgstr "%s: Ingen tilgængelig signatur\n"
-
-#: lib/query.c:624
-#, fuzzy, c-format
-msgid "%s: headerRead failed\n"
-msgstr "%s: readLead mislykkedes\n"
-
-#: lib/query.c:641 lib/rpmchecksig.c:110 lib/rpmchecksig.c:287
-#, c-format
-msgid "%s: Fread failed: %s\n"
-msgstr "%s: Fread mislykkedes: %s\n"
-
-#: lib/query.c:758 lib/query.c:796 lib/rpminstall.c:324 lib/rpminstall.c:468
-#: lib/rpminstall.c:848
+#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463
+#: lib/rpminstall.c:838
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "åbning af %s mislykkedes %s\n"
 
-#: lib/query.c:774
+#: lib/query.c:616
 #, c-format
 msgid "query of %s failed\n"
 msgstr "forespørgsel af %s mislykkedes\n"
 
-#: lib/query.c:780
+#: lib/query.c:622
 msgid "old format source packages cannot be queried\n"
 msgstr "pakke med gammelt kildeformat kan ikke forespørges\n"
 
-#: lib/query.c:806 lib/rpminstall.c:481
+#: lib/query.c:648 lib/rpminstall.c:476
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: læs manifest mislykkedes: %s\n"
 
-#: lib/query.c:850
+#: lib/query.c:692
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "forespørgsel af spec-fil %s mislykkedes, kunne ikke tolkes\n"
 
-#: lib/query.c:874
+#: lib/query.c:716
 msgid "no packages\n"
 msgstr "ingen pakker\n"
 
-#: lib/query.c:894
+#: lib/query.c:736
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "gruppe %s indeholder ingen pakker\n"
 
-#: lib/query.c:904
+#: lib/query.c:746
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "ingen pakker udløser %s\n"
 
-#: lib/query.c:914
+#: lib/query.c:756
 #, c-format
 msgid "no package requires %s\n"
 msgstr "ingen pakker kræver %s\n"
 
-#: lib/query.c:925
+#: lib/query.c:767
 #, c-format
 msgid "no package provides %s\n"
 msgstr "ingen pakker tilfører %s\n"
 
-#: lib/query.c:962
+#: lib/query.c:804
 #, c-format
 msgid "file %s: %s\n"
 msgstr "fil %s: %s\n"
 
-#: lib/query.c:966
+#: lib/query.c:808
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "filen %s tilhører ingen pakke\n"
 
-#: lib/query.c:993
+#: lib/query.c:835
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "ugyldigt pakkenummer: %s\n"
 
-#: lib/query.c:996
+#: lib/query.c:838
 #, c-format
 msgid "package record number: %u\n"
 msgstr "pakkens post-nummer: %u\n"
 
-#: lib/query.c:1001
+#: lib/query.c:843
 #, fuzzy, c-format
 msgid "record %u could not be read\n"
 msgstr "post %d kunne ikke læses\n"
 
-#: lib/query.c:1012 lib/rpminstall.c:634
+#: lib/query.c:854 lib/rpminstall.c:624
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "pakken %s er ikke installeret\n"
 
-#: lib/rpmchecksig.c:50
+#: lib/rpmchecksig.c:49
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s: åbning mislykkedes: %s\n"
 
-#: lib/rpmchecksig.c:62
+#: lib/rpmchecksig.c:61
 msgid "makeTempFile failed\n"
 msgstr "makeTempFile mislykkedes\n"
 
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:103
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: Fwrite mislykkedes: %s\n"
 
-#: lib/rpmchecksig.c:164
+#: lib/rpmchecksig.c:163
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr "%s: Kan ikke underskrive v1.0 RPM\n"
 
-#: lib/rpmchecksig.c:168
+#: lib/rpmchecksig.c:167
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr "%s: Kan ikke genunderskrive v2.0 RPM\n"
 
-#: lib/rpmchecksig.c:214
+#: lib/rpmchecksig.c:213
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: writeLead mislykkedes: %s\n"
 
-#: lib/rpmchecksig.c:220
+#: lib/rpmchecksig.c:219
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmWriteSignature mislykkedes: %s\n"
 
-#: lib/rpmchecksig.c:731
+#: lib/rpmchecksig.c:512
+#, c-format
+msgid "%s: No signature available (v1.0 RPM)\n"
+msgstr "%s: Ingen tilgængelig signatur (v1.0 RPM)\n"
+
+#: lib/rpmchecksig.c:707
 msgid "NOT OK"
 msgstr "IKKE O.K."
 
-#: lib/rpmchecksig.c:732 lib/rpmchecksig.c:746
+#: lib/rpmchecksig.c:708 lib/rpmchecksig.c:722
 msgid " (MISSING KEYS:"
 msgstr " (MANGLENDE NØGLER:    "
 
-#: lib/rpmchecksig.c:734 lib/rpmchecksig.c:748
+#: lib/rpmchecksig.c:710 lib/rpmchecksig.c:724
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:735 lib/rpmchecksig.c:749
+#: lib/rpmchecksig.c:711 lib/rpmchecksig.c:725
 msgid " (UNTRUSTED KEYS:"
 msgstr " (IKKE-BETROEDE NØGLER:"
 
-#: lib/rpmchecksig.c:737 lib/rpmchecksig.c:751
+#: lib/rpmchecksig.c:713 lib/rpmchecksig.c:727
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:745
+#: lib/rpmchecksig.c:721
 msgid "OK"
 msgstr "O.K."
 
@@ -2554,86 +2559,86 @@ msgstr "Forbereder..."
 msgid "Preparing packages for installation..."
 msgstr "Forbereder pakker til installation..."
 
-#: lib/rpminstall.c:274
+#: lib/rpminstall.c:228
+#, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr "kunne ikke åbne Packages-database i %s\n"
+
+#: lib/rpminstall.c:285
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "Modtager %s\n"
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:284
+#: lib/rpminstall.c:295
 #, c-format
 msgid " ... as %s\n"
 msgstr " ... som %s\n"
 
-#: lib/rpminstall.c:288
+#: lib/rpminstall.c:299
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "overspringer %s - overførsel mislykkedes - %s\n"
 
-#: lib/rpminstall.c:370
-#, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr "kunne ikke åbne Packages-database i %s\n"
-
-#: lib/rpminstall.c:393
+#: lib/rpminstall.c:388
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr "pakke %s kan ikke omrokeres\n"
 
-#: lib/rpminstall.c:442
+#: lib/rpminstall.c:437
 #, c-format
 msgid "error reading from file %s\n"
 msgstr "fejl ved læsning fra filen %s\n"
 
-#: lib/rpminstall.c:448
+#: lib/rpminstall.c:443
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr "filen %s kræver en nyere version af RPM\n"
 
-#: lib/rpminstall.c:460 lib/rpminstall.c:705
+#: lib/rpminstall.c:455 lib/rpminstall.c:694
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr "%s kunne ikke installeres\n"
 
-#: lib/rpminstall.c:496
+#: lib/rpminstall.c:491
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "fandt %d kilde- og %d binærpakker\n"
 
-#: lib/rpminstall.c:512
+#: lib/rpminstall.c:507
 msgid "failed dependencies:\n"
 msgstr "afhængighedskrav, der ikke kunne imødekommes:\n"
 
-#: lib/rpminstall.c:533
+#: lib/rpminstall.c:528
 msgid "installing binary packages\n"
 msgstr "installerer binærpakker\n"
 
-#: lib/rpminstall.c:554
+#: lib/rpminstall.c:549
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "kunne ikke åbne fil %s: %s\n"
 
-#: lib/rpminstall.c:621
+#: lib/rpminstall.c:611
 #, c-format
 msgid "cannot open %s/packages.rpm\n"
 msgstr "kunne ikke åbne %s/packages.rpm\n"
 
-#: lib/rpminstall.c:637
+#: lib/rpminstall.c:627
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" angiver flere pakker\n"
 
-#: lib/rpminstall.c:661
+#: lib/rpminstall.c:651
 msgid "removing these packages would break dependencies:\n"
 msgstr "fjernelse af disse pakker ville bryde afhængighederne:\n"
 
-#: lib/rpminstall.c:691
+#: lib/rpminstall.c:680
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr "kunne ikke åbne %s: %s\n"
 
-#: lib/rpminstall.c:697
+#: lib/rpminstall.c:686
 #, c-format
 msgid "Installing %s\n"
 msgstr "Installerer %s\n"
@@ -2908,17 +2913,17 @@ msgstr ""
 "pakken har hverken en liste over gruppenavne eller id (det burde ikke kunne "
 "ske)\n"
 
-#: lib/verify.c:414
+#: lib/verify.c:417
 #, c-format
 msgid "missing    %s"
 msgstr "manglende  %s"
 
-#: lib/verify.c:511
+#: lib/verify.c:514
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr "Ikke-tilfredsstillede afhængighedskrav for %s-%s-%s: "
 
-#: lib/verify.c:556
+#: lib/verify.c:559
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
diff --git a/po/de.po b/po/de.po
index 6dba3f799..031bf9838 100644
--- a/po/de.po
+++ b/po/de.po
@@ -37,7 +37,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-24 21:17-0400\n"
+"POT-Creation-Date: 2001-10-26 00:15-0400\n"
 "PO-Revision-Date: 1998-08-03 18:02+02:00\n"
 "Last-Translator: Karl Eichwalder <ke@SuSE.DE>\n"
 "Language-Team: German <de@li.org>\n"
@@ -107,16 +107,16 @@ msgstr ""
 msgid "Building for target %s\n"
 msgstr "Fehler beim Suchen nach Paket %s\n"
 
-#: rpm2cpio.c:34
+#: rpm2cpio.c:55
 msgid "argument is not an RPM package\n"
 msgstr ""
 
-#: rpm2cpio.c:38
+#: rpm2cpio.c:61
 #, fuzzy
 msgid "error reading header from package\n"
 msgstr "Fehler beim Suchen nach Paket %s\n"
 
-#: rpm2cpio.c:60
+#: rpm2cpio.c:83
 #, fuzzy, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr "kann Datei %s nicht öffnen: "
@@ -466,45 +466,45 @@ msgstr "--sign darf nur während der Paketerstellung benutzt werden"
 msgid "exec failed\n"
 msgstr "%s: Öffnen fehlgeschlagen\n"
 
-#: rpmqv.c:959
+#: rpmqv.c:963
 msgid "no packages files given for rebuild"
 msgstr "Es wurden keine Paketdateien für die Neuerstellung angegeben"
 
-#: rpmqv.c:1026
+#: rpmqv.c:1038
 msgid "no spec files given for build"
 msgstr "Es wurde kein spec-Datei für die Erstellung angegeben"
 
-#: rpmqv.c:1028
+#: rpmqv.c:1040
 msgid "no tar files given for build"
 msgstr "Es wurde keine tar-Datei für die Erstellung angegeben"
 
-#: rpmqv.c:1047
+#: rpmqv.c:1059
 msgid "no packages given for uninstall"
 msgstr "Es wurden keine Pakete für die Deinstallation angegeben"
 
-#: rpmqv.c:1058
+#: rpmqv.c:1070
 msgid "no packages given for install"
 msgstr "Es wurden keine Pakete für die Installation angegeben"
 
-#: rpmqv.c:1106
+#: rpmqv.c:1118
 msgid "no arguments given for query"
 msgstr "Es wurden keine Argumente für die Anfrage angegeben"
 
-#: rpmqv.c:1120
+#: rpmqv.c:1132
 msgid "no arguments given for verify"
 msgstr "Es wurden keine Argumente für die Überprüfung angegeben"
 
-#: rpmqv.c:1128
+#: rpmqv.c:1140
 msgid "unexpected arguments to --querytags "
 msgstr "Unerwartete Argumente zu --querytags "
 
-#: rpmqv.c:1144
+#: rpmqv.c:1156
 #, fuzzy
 msgid "no arguments given"
 msgstr "Es wurden keine Argumente für die Anfrage angegeben"
 
 # , c-format
-#: build/build.c:125 build/pack.c:466
+#: build/build.c:125 build/pack.c:487
 #, fuzzy
 msgid "Unable to open temp file.\n"
 msgstr "Datei %s kann nicht zum Lesen geöffnet werden: %s."
@@ -728,7 +728,7 @@ msgid "Could not open %%files file %s: %s\n"
 msgstr "Fehler: kann Datei %s nicht öffnen\n"
 
 # , c-format
-#: build/files.c:1777 build/pack.c:145
+#: build/files.c:1777 build/pack.c:148
 #, fuzzy, c-format
 msgid "line: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
@@ -808,170 +808,170 @@ msgid "Could not canonicalize hostname: %s\n"
 msgstr ""
 
 # , c-format
-#: build/pack.c:78
+#: build/pack.c:81
 #, fuzzy, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
 # , c-format
-#: build/pack.c:81
+#: build/pack.c:84
 #, fuzzy, c-format
 msgid "create archive failed: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: build/pack.c:103
+#: build/pack.c:106
 #, fuzzy, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr "lesen fehlgeschlagen: %s (%d)"
 
-#: build/pack.c:110
+#: build/pack.c:113
 #, fuzzy, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr "lesen fehlgeschlagen: %s (%d)"
 
-#: build/pack.c:213
+#: build/pack.c:216
 #, fuzzy, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr "Fehler: kann Datei %s nicht öffnen\n"
 
-#: build/pack.c:220
+#: build/pack.c:223
 #, fuzzy, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr "Fehler: kann Datei %s nicht öffnen\n"
 
-#: build/pack.c:227
+#: build/pack.c:230
 #, fuzzy, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr "Fehler: kann Datei %s nicht öffnen\n"
 
-#: build/pack.c:234
+#: build/pack.c:237
 #, fuzzy, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr "Fehler: kann Datei %s nicht öffnen\n"
 
-#: build/pack.c:242
+#: build/pack.c:245
 #, fuzzy, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr "Fehler: kann Datei %s nicht öffnen\n"
 
-#: build/pack.c:257
+#: build/pack.c:260
 #, fuzzy, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr "Fehler: kann Datei %s nicht öffnen\n"
 
 # , c-format
-#: build/pack.c:285
+#: build/pack.c:288
 #, fuzzy, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
 # , c-format
-#: build/pack.c:295
+#: build/pack.c:298
 #, fuzzy, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr "Lesen von %s fehlgeschlagen: %s."
 
-#: build/pack.c:304 build/pack.c:508
+#: build/pack.c:307 build/pack.c:529
 #, fuzzy, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: »readLead« fehlgeschlagen\n"
 
-#: build/pack.c:320
+#: build/pack.c:341
 #, 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:329
+#: build/pack.c:350
 #, fuzzy, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "Fehler beim Eintrag %s von %s"
 
 # , c-format
-#: build/pack.c:454
+#: build/pack.c:475
 #, fuzzy
 msgid "Unable to create immutable header region.\n"
 msgstr "Nicht möglich %s zu schreiben"
 
 # , c-format
-#: build/pack.c:472
+#: build/pack.c:493
 #, fuzzy
 msgid "Unable to write temp header\n"
 msgstr "Nicht möglich %s zu schreiben"
 
-#: build/pack.c:480
+#: build/pack.c:501
 msgid "Bad CSA data\n"
 msgstr ""
 
 # , c-format
-#: build/pack.c:515
+#: build/pack.c:536
 #, fuzzy
 msgid "Unable to write final header\n"
 msgstr "Nicht möglich %s zu schreiben"
 
-#: build/pack.c:533
+#: build/pack.c:554
 #, fuzzy, c-format
 msgid "Generating signature: %d\n"
 msgstr "PGP-Signatur generieren"
 
 # , c-format
-#: build/pack.c:546
+#: build/pack.c:567
 #, fuzzy
 msgid "Unable to reload signature header.\n"
 msgstr "Nicht möglich %s zu schreiben"
 
 # , c-format
-#: build/pack.c:554
+#: build/pack.c:575
 #, fuzzy, c-format
 msgid "Could not open %s: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen\n"
 
 # , c-format
-#: build/pack.c:590 lib/psm.c:2149
+#: build/pack.c:611 lib/psm.c:2153
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Nicht möglich %s zu schreiben"
 
 # , c-format
-#: build/pack.c:605
+#: build/pack.c:626
 #, fuzzy, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "Nicht möglich %s zu schreiben"
 
 # , c-format
-#: build/pack.c:615
+#: build/pack.c:636
 #, fuzzy, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "Nicht möglich %s zu schreiben"
 
 # , c-format
-#: build/pack.c:629
+#: build/pack.c:650
 #, fuzzy, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "Nicht möglich %s zu schreiben"
 
 # , c-format
-#: build/pack.c:639
+#: build/pack.c:660
 #, fuzzy, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "Nicht möglich %s zu schreiben"
 
 # , c-format
-#: build/pack.c:645
+#: build/pack.c:666
 #, fuzzy, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Nicht möglich %s zu schreiben"
 
-#: build/pack.c:670 lib/psm.c:2415
+#: build/pack.c:691 lib/psm.c:2419
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:737
+#: build/pack.c:758
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:754
+#: build/pack.c:775
 #, fuzzy, c-format
 msgid "cannot create %s: %s\n"
 msgstr "kann Datei %s nicht öffnen: "
@@ -1586,60 +1586,60 @@ msgstr ""
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1248 lib/depends.c:1381
+#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1248 lib/depends.c:1381
+#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:1042
+#: lib/depends.c:1044
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:1153
+#: lib/depends.c:1155
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:1247
+#: lib/depends.c:1249
 #, fuzzy, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr "die Datei »%s« gehört zu keinem Paket\n"
 
-#: lib/depends.c:1276
+#: lib/depends.c:1278
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1293
+#: lib/depends.c:1295
 #, fuzzy, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "die Datei »%s« gehört zu keinem Paket\n"
 
-#: lib/depends.c:1317
+#: lib/depends.c:1319
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1330
+#: lib/depends.c:1332
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1344
+#: lib/depends.c:1346
 #, fuzzy, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr "die Datei »%s« gehört zu keinem Paket\n"
 
-#: lib/depends.c:1360
+#: lib/depends.c:1362
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1381
+#: lib/depends.c:1383
 #, fuzzy, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "die Datei »%s« gehört zu keinem Paket\n"
@@ -1647,43 +1647,43 @@ msgstr "die Datei »%s« gehört zu keinem Paket\n"
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1454
+#: lib/depends.c:1456
 #, 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:1533
+#: lib/depends.c:1535
 #, fuzzy, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "Paket %s wird nicht in %s aufgeführt"
 
 # FIXME
-#: lib/depends.c:1786
+#: lib/depends.c:1788
 #, 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:1936
+#: lib/depends.c:1938
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1996
+#: lib/depends.c:1998
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2046
+#: lib/depends.c:2048
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:2099
+#: lib/depends.c:2101
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:2129
+#: lib/depends.c:2131
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -1878,19 +1878,49 @@ msgstr "(unbekannter Typ)"
 msgid "error creating temporary file %s\n"
 msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
 
-#: lib/package.c:161
+#: lib/package.c:167 lib/package.c:238
 #, fuzzy
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr ""
 "Nur Pakete mit Hauptnummern <= 3 werden von dieser RPM-Version unterstützt"
 
-#: lib/package.c:184
+#: lib/package.c:188 lib/package.c:246
 #, fuzzy
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 "Nur Pakete mit Hauptnummern <= 3 werden von dieser RPM-Version unterstützt"
 
+#: lib/package.c:224 lib/rpmchecksig.c:158 lib/rpmchecksig.c:506
+#, c-format
+msgid "%s: readLead failed\n"
+msgstr "%s: »readLead« fehlgeschlagen\n"
+
+#: lib/package.c:230
+#, c-format
+msgid "%s: bad magic\n"
+msgstr ""
+
+#: lib/package.c:254 lib/rpmchecksig.c:176 lib/rpmchecksig.c:522
+#, c-format
+msgid "%s: rpmReadSignature failed\n"
+msgstr "%s: »rpmReadSignature« fehlgeschlagen\n"
+
+#: lib/package.c:258 lib/rpmchecksig.c:180 lib/rpmchecksig.c:527
+#, c-format
+msgid "%s: No signature available\n"
+msgstr "%s: Keine Signatur verfügbar\n"
+
+#: lib/package.c:284
+#, fuzzy, c-format
+msgid "%s: headerRead failed\n"
+msgstr "%s: »readLead« fehlgeschlagen\n"
+
+#: lib/package.c:303 lib/rpmchecksig.c:109 lib/rpmchecksig.c:450
+#, fuzzy, c-format
+msgid "%s: Fread failed: %s\n"
+msgstr "%s: »readLead« fehlgeschlagen\n"
+
 #: lib/poptI.c:47
 #, fuzzy
 msgid "exclude paths must begin with a /"
@@ -2444,285 +2474,260 @@ msgstr "kann Datei %s nicht öffnen: "
 msgid "cannot write to %%%s %s\n"
 msgstr "kann Datei %s nicht öffnen: "
 
-#: lib/psm.c:1214
+#: lib/psm.c:1217
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1325
+#: lib/psm.c:1330
 #, fuzzy
 msgid "source package contains no .spec file\n"
 msgstr "Anfrage nach Paket, das die Datei <DATEI> besitzt"
 
-#: lib/psm.c:1432
+#: lib/psm.c:1436
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "Keine Stufen ausführen"
 
-#: lib/psm.c:1600
+#: lib/psm.c:1604
 #, fuzzy, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr "Ausführung des Skripts fehlgeschlagen"
 
-#: lib/psm.c:1607
+#: lib/psm.c:1611
 #, fuzzy, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr "Ausführung des Skripts fehlgeschlagen"
 
 # FIXME shared, besser: "mit anderen geteilte ..."
-#: lib/psm.c:1954
+#: lib/psm.c:1958
 #, fuzzy, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr "Paket %s-%s-%s beinhaltet geteilte Dateien\n"
 
-#: lib/psm.c:2071
+#: lib/psm.c:2075
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2186
+#: lib/psm.c:2190
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2195
+#: lib/psm.c:2199
 #, fuzzy, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "Gruppe %s beinhaltet kein einziges Paket\n"
 
-#: lib/psm.c:2236
+#: lib/psm.c:2240
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "öffnen von %s fehlgeschlagen: %s\n"
 
-#: lib/psm.c:2237
+#: lib/psm.c:2241
 msgid " on file "
 msgstr ""
 
 # , c-format
-#: lib/psm.c:2423
+#: lib/psm.c:2427
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: lib/psm.c:2426
+#: lib/psm.c:2430
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "pgp fehlgeschlagen"
 
-#: lib/query.c:128
+#: lib/query.c:124
 #, fuzzy, c-format
 msgid "incorrect format: %s\n"
 msgstr "Fehler beim Format %s\n"
 
-#: lib/query.c:225
+#: lib/query.c:221
 msgid "(contains no files)"
 msgstr "(beinhaltet keine Dateien)"
 
-#: lib/query.c:286
+#: lib/query.c:282
 msgid "normal        "
 msgstr ""
 
-#: lib/query.c:289
+#: lib/query.c:285
 msgid "replaced      "
 msgstr ""
 
-#: lib/query.c:292
+#: lib/query.c:288
 #, fuzzy
 msgid "not installed "
 msgstr "Paket %s ist nicht installiert\n"
 
-#: lib/query.c:295
+#: lib/query.c:291
 msgid "net shared    "
 msgstr ""
 
-#: lib/query.c:298
+#: lib/query.c:294
 #, fuzzy, c-format
 msgid "(unknown %3d) "
 msgstr "(unbekannter Typ)"
 
-#: lib/query.c:303
+#: lib/query.c:299
 msgid "(no state)    "
 msgstr ""
 
-#: lib/query.c:322 lib/query.c:378
+#: lib/query.c:318 lib/query.c:374
 #, fuzzy
 msgid "package has neither file owner or id lists\n"
 msgstr "Paket hat keinen Namen"
 
-#: lib/query.c:467
+#: lib/query.c:463
 #, fuzzy, c-format
 msgid "can't query %s: %s\n"
 msgstr "Fehler: kann %s nicht öffnen\n"
 
-#: lib/query.c:582 lib/rpmchecksig.c:159 lib/rpmchecksig.c:492
-#, c-format
-msgid "%s: readLead failed\n"
-msgstr "%s: »readLead« fehlgeschlagen\n"
-
-#: lib/query.c:588 lib/rpmchecksig.c:498
-#, c-format
-msgid "%s: No signature available (v1.0 RPM)\n"
-msgstr "%s: Keine Signatur verfügbar (v1.0 RPM)\n"
-
-#: lib/query.c:597 lib/rpmchecksig.c:177 lib/rpmchecksig.c:508
-#, c-format
-msgid "%s: rpmReadSignature failed\n"
-msgstr "%s: »rpmReadSignature« fehlgeschlagen\n"
-
-#: lib/query.c:601 lib/rpmchecksig.c:181 lib/rpmchecksig.c:513
-#, c-format
-msgid "%s: No signature available\n"
-msgstr "%s: Keine Signatur verfügbar\n"
-
-#: lib/query.c:624
-#, fuzzy, c-format
-msgid "%s: headerRead failed\n"
-msgstr "%s: »readLead« fehlgeschlagen\n"
-
-#: lib/query.c:641 lib/rpmchecksig.c:110 lib/rpmchecksig.c:287
-#, fuzzy, c-format
-msgid "%s: Fread failed: %s\n"
-msgstr "%s: »readLead« fehlgeschlagen\n"
-
-#: lib/query.c:758 lib/query.c:796 lib/rpminstall.c:324 lib/rpminstall.c:468
-#: lib/rpminstall.c:848
+#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463
+#: lib/rpminstall.c:838
 #, fuzzy, c-format
 msgid "open of %s failed: %s\n"
 msgstr "öffnen von %s fehlgeschlagen: %s\n"
 
-#: lib/query.c:774
+#: lib/query.c:616
 #, c-format
 msgid "query of %s failed\n"
 msgstr "Anfrage von %s fehlgeschlagen\n"
 
-#: lib/query.c:780
+#: lib/query.c:622
 msgid "old format source packages cannot be queried\n"
 msgstr "altes Sourceformat-Paket kann nicht angefragt werden\n"
 
-#: lib/query.c:806 lib/rpminstall.c:481
+#: lib/query.c:648 lib/rpminstall.c:476
 #, fuzzy, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: »readLead« fehlgeschlagen\n"
 
-#: lib/query.c:850
+#: lib/query.c:692
 #, fuzzy, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "Anfrage von %s fehlgeschlagen\n"
 
-#: lib/query.c:874
+#: lib/query.c:716
 #, fuzzy
 msgid "no packages\n"
 msgstr "Anfrage an alle Pakete"
 
-#: lib/query.c:894
+#: lib/query.c:736
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "Gruppe %s beinhaltet kein einziges Paket\n"
 
-#: lib/query.c:904
+#: lib/query.c:746
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "kein Paket triggert %s\n"
 
-#: lib/query.c:914
+#: lib/query.c:756
 #, c-format
 msgid "no package requires %s\n"
 msgstr "kein Paket verlangt %s\n"
 
 # oder besser: ... listet %s auf? -ke-
-#: lib/query.c:925
+#: lib/query.c:767
 #, c-format
 msgid "no package provides %s\n"
 msgstr "kein Paket stellt %s bereit\n"
 
 # , c-format
-#: lib/query.c:962
+#: lib/query.c:804
 #, fuzzy, c-format
 msgid "file %s: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: lib/query.c:966
+#: lib/query.c:808
 #, 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:993
+#: lib/query.c:835
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "ungültige Paket-Nummer: %s\n"
 
-#: lib/query.c:996
+#: lib/query.c:838
 #, fuzzy, c-format
 msgid "package record number: %u\n"
 msgstr "ungültige Paket-Nummer: %s\n"
 
-#: lib/query.c:1001
+#: lib/query.c:843
 #, fuzzy, c-format
 msgid "record %u could not be read\n"
 msgstr "Eintrag %d konnte nicht gelesen werden\n"
 
-#: lib/query.c:1012 lib/rpminstall.c:634
+#: lib/query.c:854 lib/rpminstall.c:624
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "Paket %s ist nicht installiert\n"
 
-#: lib/rpmchecksig.c:50
+#: lib/rpmchecksig.c:49
 #, fuzzy, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s: Öffnen fehlgeschlagen\n"
 
-#: lib/rpmchecksig.c:62
+#: lib/rpmchecksig.c:61
 #, fuzzy
 msgid "makeTempFile failed\n"
 msgstr "%s: Öffnen fehlgeschlagen\n"
 
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:103
 #, fuzzy, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: »readLead« fehlgeschlagen\n"
 
-#: lib/rpmchecksig.c:164
+#: lib/rpmchecksig.c:163
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr "%s: Kann v1.0-RPM nicht signieren\n"
 
-#: lib/rpmchecksig.c:168
+#: lib/rpmchecksig.c:167
 #, 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:214
+#: lib/rpmchecksig.c:213
 #, fuzzy, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: »readLead« fehlgeschlagen\n"
 
-#: lib/rpmchecksig.c:220
+#: lib/rpmchecksig.c:219
 #, fuzzy, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: »rpmReadSignature« fehlgeschlagen\n"
 
-#: lib/rpmchecksig.c:731
+#: lib/rpmchecksig.c:512
+#, c-format
+msgid "%s: No signature available (v1.0 RPM)\n"
+msgstr "%s: Keine Signatur verfügbar (v1.0 RPM)\n"
+
+#: lib/rpmchecksig.c:707
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:732 lib/rpmchecksig.c:746
+#: lib/rpmchecksig.c:708 lib/rpmchecksig.c:722
 #, fuzzy
 msgid " (MISSING KEYS:"
 msgstr " (FEHLENDE SCHLüSSEL)"
 
-#: lib/rpmchecksig.c:734 lib/rpmchecksig.c:748
+#: lib/rpmchecksig.c:710 lib/rpmchecksig.c:724
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:735 lib/rpmchecksig.c:749
+#: lib/rpmchecksig.c:711 lib/rpmchecksig.c:725
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:737 lib/rpmchecksig.c:751
+#: lib/rpmchecksig.c:713 lib/rpmchecksig.c:727
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:745
+#: lib/rpmchecksig.c:721
 msgid "OK"
 msgstr ""
 
@@ -2735,89 +2740,89 @@ msgstr ""
 msgid "Preparing packages for installation..."
 msgstr "Es wurden keine Pakete für die Installation angegeben"
 
+#: lib/rpminstall.c:228
+#, fuzzy, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr "Fehler: kann nicht öffnen %s%s/packages.rpm\n"
+
 # , c-format
-#: lib/rpminstall.c:274
+#: lib/rpminstall.c:285
 #, 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:284
+#: lib/rpminstall.c:295
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:288
+#: lib/rpminstall.c:299
 #, fuzzy, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "Fehler: überspringe %s - Übertragung fehlgeschlagen - %s\n"
 
-#: lib/rpminstall.c:370
-#, fuzzy, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr "Fehler: kann nicht öffnen %s%s/packages.rpm\n"
-
-#: lib/rpminstall.c:393
+#: lib/rpminstall.c:388
 #, fuzzy, c-format
 msgid "package %s is not relocateable\n"
 msgstr "Paket %s ist nicht installiert\n"
 
-#: lib/rpminstall.c:442
+#: lib/rpminstall.c:437
 #, fuzzy, c-format
 msgid "error reading from file %s\n"
 msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
 
-#: lib/rpminstall.c:448
+#: lib/rpminstall.c:443
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:460 lib/rpminstall.c:705
+#: lib/rpminstall.c:455 lib/rpminstall.c:694
 #, fuzzy, c-format
 msgid "%s cannot be installed\n"
 msgstr "Fehler: %s kann nicht installiert werden\n"
 
-#: lib/rpminstall.c:496
+#: lib/rpminstall.c:491
 #, fuzzy, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "Gruppe %s beinhaltet kein einziges Paket\n"
 
-#: lib/rpminstall.c:512
+#: lib/rpminstall.c:507
 msgid "failed dependencies:\n"
 msgstr "fehlgeschlagene Paket-Abhängigkeiten:\n"
 
-#: lib/rpminstall.c:533
+#: lib/rpminstall.c:528
 #, fuzzy
 msgid "installing binary packages\n"
 msgstr "Paket installieren"
 
-#: lib/rpminstall.c:554
+#: lib/rpminstall.c:549
 #, fuzzy, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "kann Datei %s nicht öffnen: "
 
-#: lib/rpminstall.c:621
+#: lib/rpminstall.c:611
 #, fuzzy, c-format
 msgid "cannot open %s/packages.rpm\n"
 msgstr "Fehler: kann nicht öffnen %s%s/packages.rpm\n"
 
-#: lib/rpminstall.c:637
+#: lib/rpminstall.c:627
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" bezeichnet mehrere Pakete\n"
 
 # oder besser: "... verletzen" ?
-#: lib/rpminstall.c:661
+#: lib/rpminstall.c:651
 msgid "removing these packages would break dependencies:\n"
 msgstr "Das Enfernen dieser Pakete würde Paket-Abhängigkeiten missachten:\n"
 
-#: lib/rpminstall.c:691
+#: lib/rpminstall.c:680
 #, fuzzy, c-format
 msgid "cannot open %s: %s\n"
 msgstr "Fehler: kann %s nicht öffnen\n"
 
-#: lib/rpminstall.c:697
+#: lib/rpminstall.c:686
 #, c-format
 msgid "Installing %s\n"
 msgstr "Installiere %s\n"
@@ -3100,17 +3105,17 @@ msgstr ""
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:414
+#: lib/verify.c:417
 #, fuzzy, c-format
 msgid "missing    %s"
 msgstr "fehlende { nach %{"
 
-#: lib/verify.c:511
+#: lib/verify.c:514
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr "Nicht erfüllte Abhängigkeiten von %s-%s-%s: "
 
-#: lib/verify.c:556
+#: lib/verify.c:559
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
diff --git a/po/en_RN.po b/po/en_RN.po
index ce4f15bfb..285b4d05b 100644
--- a/po/en_RN.po
+++ b/po/en_RN.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-24 21:17-0400\n"
+"POT-Creation-Date: 2001-10-26 00:15-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"
@@ -70,15 +70,15 @@ msgstr ""
 msgid "Building for target %s\n"
 msgstr ""
 
-#: rpm2cpio.c:34
+#: rpm2cpio.c:55
 msgid "argument is not an RPM package\n"
 msgstr ""
 
-#: rpm2cpio.c:38
+#: rpm2cpio.c:61
 msgid "error reading header from package\n"
 msgstr ""
 
-#: rpm2cpio.c:60
+#: rpm2cpio.c:83
 #, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr ""
@@ -397,43 +397,43 @@ msgstr ""
 msgid "exec failed\n"
 msgstr ""
 
-#: rpmqv.c:959
+#: rpmqv.c:963
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1026
+#: rpmqv.c:1038
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1028
+#: rpmqv.c:1040
 msgid "no tar files given for build"
 msgstr ""
 
-#: rpmqv.c:1047
+#: rpmqv.c:1059
 msgid "no packages given for uninstall"
 msgstr ""
 
-#: rpmqv.c:1058
+#: rpmqv.c:1070
 msgid "no packages given for install"
 msgstr ""
 
-#: rpmqv.c:1106
+#: rpmqv.c:1118
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpmqv.c:1120
+#: rpmqv.c:1132
 msgid "no arguments given for verify"
 msgstr ""
 
-#: rpmqv.c:1128
+#: rpmqv.c:1140
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpmqv.c:1144
+#: rpmqv.c:1156
 msgid "no arguments given"
 msgstr ""
 
-#: build/build.c:125 build/pack.c:466
+#: build/build.c:125 build/pack.c:487
 msgid "Unable to open temp file.\n"
 msgstr ""
 
@@ -641,7 +641,7 @@ msgstr ""
 msgid "Could not open %%files file %s: %s\n"
 msgstr ""
 
-#: build/files.c:1777 build/pack.c:145
+#: build/files.c:1777 build/pack.c:148
 #, c-format
 msgid "line: %s\n"
 msgstr ""
@@ -716,152 +716,152 @@ msgstr ""
 msgid "Could not canonicalize hostname: %s\n"
 msgstr ""
 
-#: build/pack.c:78
+#: build/pack.c:81
 #, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr ""
 
-#: build/pack.c:81
+#: build/pack.c:84
 #, c-format
 msgid "create archive failed: %s\n"
 msgstr ""
 
-#: build/pack.c:103
+#: build/pack.c:106
 #, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr ""
 
-#: build/pack.c:110
+#: build/pack.c:113
 #, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr ""
 
-#: build/pack.c:213
+#: build/pack.c:216
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr ""
 
-#: build/pack.c:220
+#: build/pack.c:223
 #, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr ""
 
-#: build/pack.c:227
+#: build/pack.c:230
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr ""
 
-#: build/pack.c:234
+#: build/pack.c:237
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr ""
 
-#: build/pack.c:242
+#: build/pack.c:245
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr ""
 
-#: build/pack.c:257
+#: build/pack.c:260
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr ""
 
-#: build/pack.c:285
+#: build/pack.c:288
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:295
+#: build/pack.c:298
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr ""
 
-#: build/pack.c:304 build/pack.c:508
+#: build/pack.c:307 build/pack.c:529
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr ""
 
-#: build/pack.c:320
+#: build/pack.c:341
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr ""
 
-#: build/pack.c:329
+#: build/pack.c:350
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:454
+#: build/pack.c:475
 msgid "Unable to create immutable header region.\n"
 msgstr ""
 
-#: build/pack.c:472
+#: build/pack.c:493
 msgid "Unable to write temp header\n"
 msgstr ""
 
-#: build/pack.c:480
+#: build/pack.c:501
 msgid "Bad CSA data\n"
 msgstr ""
 
-#: build/pack.c:515
+#: build/pack.c:536
 msgid "Unable to write final header\n"
 msgstr ""
 
-#: build/pack.c:533
+#: build/pack.c:554
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr ""
 
-#: build/pack.c:546
+#: build/pack.c:567
 msgid "Unable to reload signature header.\n"
 msgstr ""
 
-#: build/pack.c:554
+#: build/pack.c:575
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:590 lib/psm.c:2149
+#: build/pack.c:611 lib/psm.c:2153
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
 
-#: build/pack.c:605
+#: build/pack.c:626
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr ""
 
-#: build/pack.c:615
+#: build/pack.c:636
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr ""
 
-#: build/pack.c:629
+#: build/pack.c:650
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:639
+#: build/pack.c:660
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr ""
 
-#: build/pack.c:645
+#: build/pack.c:666
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:670 lib/psm.c:2415
+#: build/pack.c:691 lib/psm.c:2419
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:737
+#: build/pack.c:758
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:754
+#: build/pack.c:775
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr ""
@@ -1428,60 +1428,60 @@ msgstr ""
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1248 lib/depends.c:1381
+#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1248 lib/depends.c:1381
+#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:1042
+#: lib/depends.c:1044
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:1153
+#: lib/depends.c:1155
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:1247
+#: lib/depends.c:1249
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1276
+#: lib/depends.c:1278
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1293
+#: lib/depends.c:1295
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:1317
+#: lib/depends.c:1319
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1330
+#: lib/depends.c:1332
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1344
+#: lib/depends.c:1346
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:1360
+#: lib/depends.c:1362
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1381
+#: lib/depends.c:1383
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
@@ -1489,42 +1489,42 @@ msgstr ""
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1454
+#: lib/depends.c:1456
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1533
+#: lib/depends.c:1535
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1786
+#: lib/depends.c:1788
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1936
+#: lib/depends.c:1938
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1996
+#: lib/depends.c:1998
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2046
+#: lib/depends.c:2048
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:2099
+#: lib/depends.c:2101
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:2129
+#: lib/depends.c:2131
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -1710,15 +1710,45 @@ msgstr ""
 msgid "error creating temporary file %s\n"
 msgstr ""
 
-#: lib/package.c:161
+#: lib/package.c:167 lib/package.c:238
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:184
+#: lib/package.c:188 lib/package.c:246
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 
+#: lib/package.c:224 lib/rpmchecksig.c:158 lib/rpmchecksig.c:506
+#, c-format
+msgid "%s: readLead failed\n"
+msgstr ""
+
+#: lib/package.c:230
+#, c-format
+msgid "%s: bad magic\n"
+msgstr ""
+
+#: lib/package.c:254 lib/rpmchecksig.c:176 lib/rpmchecksig.c:522
+#, c-format
+msgid "%s: rpmReadSignature failed\n"
+msgstr ""
+
+#: lib/package.c:258 lib/rpmchecksig.c:180 lib/rpmchecksig.c:527
+#, c-format
+msgid "%s: No signature available\n"
+msgstr ""
+
+#: lib/package.c:284
+#, c-format
+msgid "%s: headerRead failed\n"
+msgstr ""
+
+#: lib/package.c:303 lib/rpmchecksig.c:109 lib/rpmchecksig.c:450
+#, c-format
+msgid "%s: Fread failed: %s\n"
+msgstr ""
+
 #: lib/poptI.c:47
 msgid "exclude paths must begin with a /"
 msgstr ""
@@ -2211,275 +2241,250 @@ msgstr ""
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1214
+#: lib/psm.c:1217
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1325
+#: lib/psm.c:1330
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1432
+#: lib/psm.c:1436
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1600
+#: lib/psm.c:1604
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1607
+#: lib/psm.c:1611
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1954
+#: lib/psm.c:1958
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2071
+#: lib/psm.c:2075
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2186
+#: lib/psm.c:2190
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2195
+#: lib/psm.c:2199
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2236
+#: lib/psm.c:2240
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2237
+#: lib/psm.c:2241
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2423
+#: lib/psm.c:2427
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2426
+#: lib/psm.c:2430
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:128
+#: lib/query.c:124
 #, c-format
 msgid "incorrect format: %s\n"
 msgstr ""
 
-#: lib/query.c:225
+#: lib/query.c:221
 msgid "(contains no files)"
 msgstr ""
 
-#: lib/query.c:286
+#: lib/query.c:282
 msgid "normal        "
 msgstr ""
 
-#: lib/query.c:289
+#: lib/query.c:285
 msgid "replaced      "
 msgstr ""
 
-#: lib/query.c:292
+#: lib/query.c:288
 msgid "not installed "
 msgstr ""
 
-#: lib/query.c:295
+#: lib/query.c:291
 msgid "net shared    "
 msgstr ""
 
-#: lib/query.c:298
+#: lib/query.c:294
 #, c-format
 msgid "(unknown %3d) "
 msgstr ""
 
-#: lib/query.c:303
+#: lib/query.c:299
 msgid "(no state)    "
 msgstr ""
 
-#: lib/query.c:322 lib/query.c:378
+#: lib/query.c:318 lib/query.c:374
 msgid "package has neither file owner or id lists\n"
 msgstr ""
 
-#: lib/query.c:467
+#: lib/query.c:463
 #, c-format
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:582 lib/rpmchecksig.c:159 lib/rpmchecksig.c:492
-#, c-format
-msgid "%s: readLead failed\n"
-msgstr ""
-
-#: lib/query.c:588 lib/rpmchecksig.c:498
-#, c-format
-msgid "%s: No signature available (v1.0 RPM)\n"
-msgstr ""
-
-#: lib/query.c:597 lib/rpmchecksig.c:177 lib/rpmchecksig.c:508
-#, c-format
-msgid "%s: rpmReadSignature failed\n"
-msgstr ""
-
-#: lib/query.c:601 lib/rpmchecksig.c:181 lib/rpmchecksig.c:513
-#, c-format
-msgid "%s: No signature available\n"
-msgstr ""
-
-#: lib/query.c:624
-#, c-format
-msgid "%s: headerRead failed\n"
-msgstr ""
-
-#: lib/query.c:641 lib/rpmchecksig.c:110 lib/rpmchecksig.c:287
-#, c-format
-msgid "%s: Fread failed: %s\n"
-msgstr ""
-
-#: lib/query.c:758 lib/query.c:796 lib/rpminstall.c:324 lib/rpminstall.c:468
-#: lib/rpminstall.c:848
+#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463
+#: lib/rpminstall.c:838
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:774
+#: lib/query.c:616
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:780
+#: lib/query.c:622
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:806 lib/rpminstall.c:481
+#: lib/query.c:648 lib/rpminstall.c:476
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr ""
 
-#: lib/query.c:850
+#: lib/query.c:692
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:874
+#: lib/query.c:716
 msgid "no packages\n"
 msgstr ""
 
-#: lib/query.c:894
+#: lib/query.c:736
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:904
+#: lib/query.c:746
 #, c-format
 msgid "no package triggers %s\n"
 msgstr ""
 
-#: lib/query.c:914
+#: lib/query.c:756
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:925
+#: lib/query.c:767
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:962
+#: lib/query.c:804
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:966
+#: lib/query.c:808
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:993
+#: lib/query.c:835
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:996
+#: lib/query.c:838
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:1001
+#: lib/query.c:843
 #, c-format
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:1012 lib/rpminstall.c:634
+#: lib/query.c:854 lib/rpminstall.c:624
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:50
+#: lib/rpmchecksig.c:49
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:62
+#: lib/rpmchecksig.c:61
 msgid "makeTempFile failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:103
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:164
+#: lib/rpmchecksig.c:163
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:168
+#: lib/rpmchecksig.c:167
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:214
+#: lib/rpmchecksig.c:213
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:220
+#: lib/rpmchecksig.c:219
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:731
+#: lib/rpmchecksig.c:512
+#, c-format
+msgid "%s: No signature available (v1.0 RPM)\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:707
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:732 lib/rpmchecksig.c:746
+#: lib/rpmchecksig.c:708 lib/rpmchecksig.c:722
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:734 lib/rpmchecksig.c:748
+#: lib/rpmchecksig.c:710 lib/rpmchecksig.c:724
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:735 lib/rpmchecksig.c:749
+#: lib/rpmchecksig.c:711 lib/rpmchecksig.c:725
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:737 lib/rpmchecksig.c:751
+#: lib/rpmchecksig.c:713 lib/rpmchecksig.c:727
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:745
+#: lib/rpmchecksig.c:721
 msgid "OK"
 msgstr ""
 
@@ -2491,86 +2496,86 @@ msgstr ""
 msgid "Preparing packages for installation..."
 msgstr ""
 
-#: lib/rpminstall.c:274
+#: lib/rpminstall.c:228
+#, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr ""
+
+#: lib/rpminstall.c:285
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:284
+#: lib/rpminstall.c:295
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:288
+#: lib/rpminstall.c:299
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:370
-#, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr ""
-
-#: lib/rpminstall.c:393
+#: lib/rpminstall.c:388
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:442
+#: lib/rpminstall.c:437
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:448
+#: lib/rpminstall.c:443
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:460 lib/rpminstall.c:705
+#: lib/rpminstall.c:455 lib/rpminstall.c:694
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:496
+#: lib/rpminstall.c:491
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:512
+#: lib/rpminstall.c:507
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:533
+#: lib/rpminstall.c:528
 msgid "installing binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:554
+#: lib/rpminstall.c:549
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:621
+#: lib/rpminstall.c:611
 #, c-format
 msgid "cannot open %s/packages.rpm\n"
 msgstr ""
 
-#: lib/rpminstall.c:637
+#: lib/rpminstall.c:627
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:661
+#: lib/rpminstall.c:651
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:691
+#: lib/rpminstall.c:680
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:697
+#: lib/rpminstall.c:686
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
@@ -2836,17 +2841,17 @@ msgstr ""
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:414
+#: lib/verify.c:417
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:511
+#: lib/verify.c:514
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
 
-#: lib/verify.c:556
+#: lib/verify.c:559
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
diff --git a/po/es.po b/po/es.po
index ce4f15bfb..285b4d05b 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-24 21:17-0400\n"
+"POT-Creation-Date: 2001-10-26 00:15-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"
@@ -70,15 +70,15 @@ msgstr ""
 msgid "Building for target %s\n"
 msgstr ""
 
-#: rpm2cpio.c:34
+#: rpm2cpio.c:55
 msgid "argument is not an RPM package\n"
 msgstr ""
 
-#: rpm2cpio.c:38
+#: rpm2cpio.c:61
 msgid "error reading header from package\n"
 msgstr ""
 
-#: rpm2cpio.c:60
+#: rpm2cpio.c:83
 #, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr ""
@@ -397,43 +397,43 @@ msgstr ""
 msgid "exec failed\n"
 msgstr ""
 
-#: rpmqv.c:959
+#: rpmqv.c:963
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1026
+#: rpmqv.c:1038
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1028
+#: rpmqv.c:1040
 msgid "no tar files given for build"
 msgstr ""
 
-#: rpmqv.c:1047
+#: rpmqv.c:1059
 msgid "no packages given for uninstall"
 msgstr ""
 
-#: rpmqv.c:1058
+#: rpmqv.c:1070
 msgid "no packages given for install"
 msgstr ""
 
-#: rpmqv.c:1106
+#: rpmqv.c:1118
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpmqv.c:1120
+#: rpmqv.c:1132
 msgid "no arguments given for verify"
 msgstr ""
 
-#: rpmqv.c:1128
+#: rpmqv.c:1140
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpmqv.c:1144
+#: rpmqv.c:1156
 msgid "no arguments given"
 msgstr ""
 
-#: build/build.c:125 build/pack.c:466
+#: build/build.c:125 build/pack.c:487
 msgid "Unable to open temp file.\n"
 msgstr ""
 
@@ -641,7 +641,7 @@ msgstr ""
 msgid "Could not open %%files file %s: %s\n"
 msgstr ""
 
-#: build/files.c:1777 build/pack.c:145
+#: build/files.c:1777 build/pack.c:148
 #, c-format
 msgid "line: %s\n"
 msgstr ""
@@ -716,152 +716,152 @@ msgstr ""
 msgid "Could not canonicalize hostname: %s\n"
 msgstr ""
 
-#: build/pack.c:78
+#: build/pack.c:81
 #, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr ""
 
-#: build/pack.c:81
+#: build/pack.c:84
 #, c-format
 msgid "create archive failed: %s\n"
 msgstr ""
 
-#: build/pack.c:103
+#: build/pack.c:106
 #, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr ""
 
-#: build/pack.c:110
+#: build/pack.c:113
 #, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr ""
 
-#: build/pack.c:213
+#: build/pack.c:216
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr ""
 
-#: build/pack.c:220
+#: build/pack.c:223
 #, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr ""
 
-#: build/pack.c:227
+#: build/pack.c:230
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr ""
 
-#: build/pack.c:234
+#: build/pack.c:237
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr ""
 
-#: build/pack.c:242
+#: build/pack.c:245
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr ""
 
-#: build/pack.c:257
+#: build/pack.c:260
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr ""
 
-#: build/pack.c:285
+#: build/pack.c:288
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:295
+#: build/pack.c:298
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr ""
 
-#: build/pack.c:304 build/pack.c:508
+#: build/pack.c:307 build/pack.c:529
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr ""
 
-#: build/pack.c:320
+#: build/pack.c:341
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr ""
 
-#: build/pack.c:329
+#: build/pack.c:350
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:454
+#: build/pack.c:475
 msgid "Unable to create immutable header region.\n"
 msgstr ""
 
-#: build/pack.c:472
+#: build/pack.c:493
 msgid "Unable to write temp header\n"
 msgstr ""
 
-#: build/pack.c:480
+#: build/pack.c:501
 msgid "Bad CSA data\n"
 msgstr ""
 
-#: build/pack.c:515
+#: build/pack.c:536
 msgid "Unable to write final header\n"
 msgstr ""
 
-#: build/pack.c:533
+#: build/pack.c:554
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr ""
 
-#: build/pack.c:546
+#: build/pack.c:567
 msgid "Unable to reload signature header.\n"
 msgstr ""
 
-#: build/pack.c:554
+#: build/pack.c:575
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:590 lib/psm.c:2149
+#: build/pack.c:611 lib/psm.c:2153
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
 
-#: build/pack.c:605
+#: build/pack.c:626
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr ""
 
-#: build/pack.c:615
+#: build/pack.c:636
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr ""
 
-#: build/pack.c:629
+#: build/pack.c:650
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:639
+#: build/pack.c:660
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr ""
 
-#: build/pack.c:645
+#: build/pack.c:666
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:670 lib/psm.c:2415
+#: build/pack.c:691 lib/psm.c:2419
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:737
+#: build/pack.c:758
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:754
+#: build/pack.c:775
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr ""
@@ -1428,60 +1428,60 @@ msgstr ""
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1248 lib/depends.c:1381
+#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1248 lib/depends.c:1381
+#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:1042
+#: lib/depends.c:1044
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:1153
+#: lib/depends.c:1155
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:1247
+#: lib/depends.c:1249
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1276
+#: lib/depends.c:1278
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1293
+#: lib/depends.c:1295
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:1317
+#: lib/depends.c:1319
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1330
+#: lib/depends.c:1332
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1344
+#: lib/depends.c:1346
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:1360
+#: lib/depends.c:1362
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1381
+#: lib/depends.c:1383
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
@@ -1489,42 +1489,42 @@ msgstr ""
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1454
+#: lib/depends.c:1456
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1533
+#: lib/depends.c:1535
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1786
+#: lib/depends.c:1788
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1936
+#: lib/depends.c:1938
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1996
+#: lib/depends.c:1998
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2046
+#: lib/depends.c:2048
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:2099
+#: lib/depends.c:2101
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:2129
+#: lib/depends.c:2131
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -1710,15 +1710,45 @@ msgstr ""
 msgid "error creating temporary file %s\n"
 msgstr ""
 
-#: lib/package.c:161
+#: lib/package.c:167 lib/package.c:238
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:184
+#: lib/package.c:188 lib/package.c:246
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 
+#: lib/package.c:224 lib/rpmchecksig.c:158 lib/rpmchecksig.c:506
+#, c-format
+msgid "%s: readLead failed\n"
+msgstr ""
+
+#: lib/package.c:230
+#, c-format
+msgid "%s: bad magic\n"
+msgstr ""
+
+#: lib/package.c:254 lib/rpmchecksig.c:176 lib/rpmchecksig.c:522
+#, c-format
+msgid "%s: rpmReadSignature failed\n"
+msgstr ""
+
+#: lib/package.c:258 lib/rpmchecksig.c:180 lib/rpmchecksig.c:527
+#, c-format
+msgid "%s: No signature available\n"
+msgstr ""
+
+#: lib/package.c:284
+#, c-format
+msgid "%s: headerRead failed\n"
+msgstr ""
+
+#: lib/package.c:303 lib/rpmchecksig.c:109 lib/rpmchecksig.c:450
+#, c-format
+msgid "%s: Fread failed: %s\n"
+msgstr ""
+
 #: lib/poptI.c:47
 msgid "exclude paths must begin with a /"
 msgstr ""
@@ -2211,275 +2241,250 @@ msgstr ""
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1214
+#: lib/psm.c:1217
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1325
+#: lib/psm.c:1330
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1432
+#: lib/psm.c:1436
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1600
+#: lib/psm.c:1604
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1607
+#: lib/psm.c:1611
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1954
+#: lib/psm.c:1958
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2071
+#: lib/psm.c:2075
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2186
+#: lib/psm.c:2190
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2195
+#: lib/psm.c:2199
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2236
+#: lib/psm.c:2240
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2237
+#: lib/psm.c:2241
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2423
+#: lib/psm.c:2427
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2426
+#: lib/psm.c:2430
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:128
+#: lib/query.c:124
 #, c-format
 msgid "incorrect format: %s\n"
 msgstr ""
 
-#: lib/query.c:225
+#: lib/query.c:221
 msgid "(contains no files)"
 msgstr ""
 
-#: lib/query.c:286
+#: lib/query.c:282
 msgid "normal        "
 msgstr ""
 
-#: lib/query.c:289
+#: lib/query.c:285
 msgid "replaced      "
 msgstr ""
 
-#: lib/query.c:292
+#: lib/query.c:288
 msgid "not installed "
 msgstr ""
 
-#: lib/query.c:295
+#: lib/query.c:291
 msgid "net shared    "
 msgstr ""
 
-#: lib/query.c:298
+#: lib/query.c:294
 #, c-format
 msgid "(unknown %3d) "
 msgstr ""
 
-#: lib/query.c:303
+#: lib/query.c:299
 msgid "(no state)    "
 msgstr ""
 
-#: lib/query.c:322 lib/query.c:378
+#: lib/query.c:318 lib/query.c:374
 msgid "package has neither file owner or id lists\n"
 msgstr ""
 
-#: lib/query.c:467
+#: lib/query.c:463
 #, c-format
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:582 lib/rpmchecksig.c:159 lib/rpmchecksig.c:492
-#, c-format
-msgid "%s: readLead failed\n"
-msgstr ""
-
-#: lib/query.c:588 lib/rpmchecksig.c:498
-#, c-format
-msgid "%s: No signature available (v1.0 RPM)\n"
-msgstr ""
-
-#: lib/query.c:597 lib/rpmchecksig.c:177 lib/rpmchecksig.c:508
-#, c-format
-msgid "%s: rpmReadSignature failed\n"
-msgstr ""
-
-#: lib/query.c:601 lib/rpmchecksig.c:181 lib/rpmchecksig.c:513
-#, c-format
-msgid "%s: No signature available\n"
-msgstr ""
-
-#: lib/query.c:624
-#, c-format
-msgid "%s: headerRead failed\n"
-msgstr ""
-
-#: lib/query.c:641 lib/rpmchecksig.c:110 lib/rpmchecksig.c:287
-#, c-format
-msgid "%s: Fread failed: %s\n"
-msgstr ""
-
-#: lib/query.c:758 lib/query.c:796 lib/rpminstall.c:324 lib/rpminstall.c:468
-#: lib/rpminstall.c:848
+#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463
+#: lib/rpminstall.c:838
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:774
+#: lib/query.c:616
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:780
+#: lib/query.c:622
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:806 lib/rpminstall.c:481
+#: lib/query.c:648 lib/rpminstall.c:476
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr ""
 
-#: lib/query.c:850
+#: lib/query.c:692
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:874
+#: lib/query.c:716
 msgid "no packages\n"
 msgstr ""
 
-#: lib/query.c:894
+#: lib/query.c:736
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:904
+#: lib/query.c:746
 #, c-format
 msgid "no package triggers %s\n"
 msgstr ""
 
-#: lib/query.c:914
+#: lib/query.c:756
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:925
+#: lib/query.c:767
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:962
+#: lib/query.c:804
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:966
+#: lib/query.c:808
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:993
+#: lib/query.c:835
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:996
+#: lib/query.c:838
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:1001
+#: lib/query.c:843
 #, c-format
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:1012 lib/rpminstall.c:634
+#: lib/query.c:854 lib/rpminstall.c:624
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:50
+#: lib/rpmchecksig.c:49
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:62
+#: lib/rpmchecksig.c:61
 msgid "makeTempFile failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:103
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:164
+#: lib/rpmchecksig.c:163
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:168
+#: lib/rpmchecksig.c:167
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:214
+#: lib/rpmchecksig.c:213
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:220
+#: lib/rpmchecksig.c:219
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:731
+#: lib/rpmchecksig.c:512
+#, c-format
+msgid "%s: No signature available (v1.0 RPM)\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:707
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:732 lib/rpmchecksig.c:746
+#: lib/rpmchecksig.c:708 lib/rpmchecksig.c:722
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:734 lib/rpmchecksig.c:748
+#: lib/rpmchecksig.c:710 lib/rpmchecksig.c:724
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:735 lib/rpmchecksig.c:749
+#: lib/rpmchecksig.c:711 lib/rpmchecksig.c:725
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:737 lib/rpmchecksig.c:751
+#: lib/rpmchecksig.c:713 lib/rpmchecksig.c:727
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:745
+#: lib/rpmchecksig.c:721
 msgid "OK"
 msgstr ""
 
@@ -2491,86 +2496,86 @@ msgstr ""
 msgid "Preparing packages for installation..."
 msgstr ""
 
-#: lib/rpminstall.c:274
+#: lib/rpminstall.c:228
+#, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr ""
+
+#: lib/rpminstall.c:285
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:284
+#: lib/rpminstall.c:295
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:288
+#: lib/rpminstall.c:299
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:370
-#, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr ""
-
-#: lib/rpminstall.c:393
+#: lib/rpminstall.c:388
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:442
+#: lib/rpminstall.c:437
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:448
+#: lib/rpminstall.c:443
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:460 lib/rpminstall.c:705
+#: lib/rpminstall.c:455 lib/rpminstall.c:694
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:496
+#: lib/rpminstall.c:491
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:512
+#: lib/rpminstall.c:507
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:533
+#: lib/rpminstall.c:528
 msgid "installing binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:554
+#: lib/rpminstall.c:549
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:621
+#: lib/rpminstall.c:611
 #, c-format
 msgid "cannot open %s/packages.rpm\n"
 msgstr ""
 
-#: lib/rpminstall.c:637
+#: lib/rpminstall.c:627
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:661
+#: lib/rpminstall.c:651
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:691
+#: lib/rpminstall.c:680
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:697
+#: lib/rpminstall.c:686
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
@@ -2836,17 +2841,17 @@ msgstr ""
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:414
+#: lib/verify.c:417
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:511
+#: lib/verify.c:514
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
 
-#: lib/verify.c:556
+#: lib/verify.c:559
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
diff --git a/po/eu_ES.po b/po/eu_ES.po
index ce4f15bfb..285b4d05b 100644
--- a/po/eu_ES.po
+++ b/po/eu_ES.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-24 21:17-0400\n"
+"POT-Creation-Date: 2001-10-26 00:15-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"
@@ -70,15 +70,15 @@ msgstr ""
 msgid "Building for target %s\n"
 msgstr ""
 
-#: rpm2cpio.c:34
+#: rpm2cpio.c:55
 msgid "argument is not an RPM package\n"
 msgstr ""
 
-#: rpm2cpio.c:38
+#: rpm2cpio.c:61
 msgid "error reading header from package\n"
 msgstr ""
 
-#: rpm2cpio.c:60
+#: rpm2cpio.c:83
 #, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr ""
@@ -397,43 +397,43 @@ msgstr ""
 msgid "exec failed\n"
 msgstr ""
 
-#: rpmqv.c:959
+#: rpmqv.c:963
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1026
+#: rpmqv.c:1038
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1028
+#: rpmqv.c:1040
 msgid "no tar files given for build"
 msgstr ""
 
-#: rpmqv.c:1047
+#: rpmqv.c:1059
 msgid "no packages given for uninstall"
 msgstr ""
 
-#: rpmqv.c:1058
+#: rpmqv.c:1070
 msgid "no packages given for install"
 msgstr ""
 
-#: rpmqv.c:1106
+#: rpmqv.c:1118
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpmqv.c:1120
+#: rpmqv.c:1132
 msgid "no arguments given for verify"
 msgstr ""
 
-#: rpmqv.c:1128
+#: rpmqv.c:1140
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpmqv.c:1144
+#: rpmqv.c:1156
 msgid "no arguments given"
 msgstr ""
 
-#: build/build.c:125 build/pack.c:466
+#: build/build.c:125 build/pack.c:487
 msgid "Unable to open temp file.\n"
 msgstr ""
 
@@ -641,7 +641,7 @@ msgstr ""
 msgid "Could not open %%files file %s: %s\n"
 msgstr ""
 
-#: build/files.c:1777 build/pack.c:145
+#: build/files.c:1777 build/pack.c:148
 #, c-format
 msgid "line: %s\n"
 msgstr ""
@@ -716,152 +716,152 @@ msgstr ""
 msgid "Could not canonicalize hostname: %s\n"
 msgstr ""
 
-#: build/pack.c:78
+#: build/pack.c:81
 #, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr ""
 
-#: build/pack.c:81
+#: build/pack.c:84
 #, c-format
 msgid "create archive failed: %s\n"
 msgstr ""
 
-#: build/pack.c:103
+#: build/pack.c:106
 #, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr ""
 
-#: build/pack.c:110
+#: build/pack.c:113
 #, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr ""
 
-#: build/pack.c:213
+#: build/pack.c:216
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr ""
 
-#: build/pack.c:220
+#: build/pack.c:223
 #, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr ""
 
-#: build/pack.c:227
+#: build/pack.c:230
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr ""
 
-#: build/pack.c:234
+#: build/pack.c:237
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr ""
 
-#: build/pack.c:242
+#: build/pack.c:245
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr ""
 
-#: build/pack.c:257
+#: build/pack.c:260
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr ""
 
-#: build/pack.c:285
+#: build/pack.c:288
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:295
+#: build/pack.c:298
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr ""
 
-#: build/pack.c:304 build/pack.c:508
+#: build/pack.c:307 build/pack.c:529
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr ""
 
-#: build/pack.c:320
+#: build/pack.c:341
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr ""
 
-#: build/pack.c:329
+#: build/pack.c:350
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:454
+#: build/pack.c:475
 msgid "Unable to create immutable header region.\n"
 msgstr ""
 
-#: build/pack.c:472
+#: build/pack.c:493
 msgid "Unable to write temp header\n"
 msgstr ""
 
-#: build/pack.c:480
+#: build/pack.c:501
 msgid "Bad CSA data\n"
 msgstr ""
 
-#: build/pack.c:515
+#: build/pack.c:536
 msgid "Unable to write final header\n"
 msgstr ""
 
-#: build/pack.c:533
+#: build/pack.c:554
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr ""
 
-#: build/pack.c:546
+#: build/pack.c:567
 msgid "Unable to reload signature header.\n"
 msgstr ""
 
-#: build/pack.c:554
+#: build/pack.c:575
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:590 lib/psm.c:2149
+#: build/pack.c:611 lib/psm.c:2153
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
 
-#: build/pack.c:605
+#: build/pack.c:626
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr ""
 
-#: build/pack.c:615
+#: build/pack.c:636
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr ""
 
-#: build/pack.c:629
+#: build/pack.c:650
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:639
+#: build/pack.c:660
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr ""
 
-#: build/pack.c:645
+#: build/pack.c:666
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:670 lib/psm.c:2415
+#: build/pack.c:691 lib/psm.c:2419
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:737
+#: build/pack.c:758
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:754
+#: build/pack.c:775
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr ""
@@ -1428,60 +1428,60 @@ msgstr ""
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1248 lib/depends.c:1381
+#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1248 lib/depends.c:1381
+#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:1042
+#: lib/depends.c:1044
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:1153
+#: lib/depends.c:1155
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:1247
+#: lib/depends.c:1249
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1276
+#: lib/depends.c:1278
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1293
+#: lib/depends.c:1295
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:1317
+#: lib/depends.c:1319
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1330
+#: lib/depends.c:1332
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1344
+#: lib/depends.c:1346
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:1360
+#: lib/depends.c:1362
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1381
+#: lib/depends.c:1383
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
@@ -1489,42 +1489,42 @@ msgstr ""
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1454
+#: lib/depends.c:1456
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1533
+#: lib/depends.c:1535
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1786
+#: lib/depends.c:1788
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1936
+#: lib/depends.c:1938
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1996
+#: lib/depends.c:1998
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2046
+#: lib/depends.c:2048
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:2099
+#: lib/depends.c:2101
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:2129
+#: lib/depends.c:2131
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -1710,15 +1710,45 @@ msgstr ""
 msgid "error creating temporary file %s\n"
 msgstr ""
 
-#: lib/package.c:161
+#: lib/package.c:167 lib/package.c:238
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:184
+#: lib/package.c:188 lib/package.c:246
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 
+#: lib/package.c:224 lib/rpmchecksig.c:158 lib/rpmchecksig.c:506
+#, c-format
+msgid "%s: readLead failed\n"
+msgstr ""
+
+#: lib/package.c:230
+#, c-format
+msgid "%s: bad magic\n"
+msgstr ""
+
+#: lib/package.c:254 lib/rpmchecksig.c:176 lib/rpmchecksig.c:522
+#, c-format
+msgid "%s: rpmReadSignature failed\n"
+msgstr ""
+
+#: lib/package.c:258 lib/rpmchecksig.c:180 lib/rpmchecksig.c:527
+#, c-format
+msgid "%s: No signature available\n"
+msgstr ""
+
+#: lib/package.c:284
+#, c-format
+msgid "%s: headerRead failed\n"
+msgstr ""
+
+#: lib/package.c:303 lib/rpmchecksig.c:109 lib/rpmchecksig.c:450
+#, c-format
+msgid "%s: Fread failed: %s\n"
+msgstr ""
+
 #: lib/poptI.c:47
 msgid "exclude paths must begin with a /"
 msgstr ""
@@ -2211,275 +2241,250 @@ msgstr ""
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1214
+#: lib/psm.c:1217
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1325
+#: lib/psm.c:1330
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1432
+#: lib/psm.c:1436
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1600
+#: lib/psm.c:1604
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1607
+#: lib/psm.c:1611
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1954
+#: lib/psm.c:1958
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2071
+#: lib/psm.c:2075
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2186
+#: lib/psm.c:2190
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2195
+#: lib/psm.c:2199
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2236
+#: lib/psm.c:2240
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2237
+#: lib/psm.c:2241
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2423
+#: lib/psm.c:2427
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2426
+#: lib/psm.c:2430
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:128
+#: lib/query.c:124
 #, c-format
 msgid "incorrect format: %s\n"
 msgstr ""
 
-#: lib/query.c:225
+#: lib/query.c:221
 msgid "(contains no files)"
 msgstr ""
 
-#: lib/query.c:286
+#: lib/query.c:282
 msgid "normal        "
 msgstr ""
 
-#: lib/query.c:289
+#: lib/query.c:285
 msgid "replaced      "
 msgstr ""
 
-#: lib/query.c:292
+#: lib/query.c:288
 msgid "not installed "
 msgstr ""
 
-#: lib/query.c:295
+#: lib/query.c:291
 msgid "net shared    "
 msgstr ""
 
-#: lib/query.c:298
+#: lib/query.c:294
 #, c-format
 msgid "(unknown %3d) "
 msgstr ""
 
-#: lib/query.c:303
+#: lib/query.c:299
 msgid "(no state)    "
 msgstr ""
 
-#: lib/query.c:322 lib/query.c:378
+#: lib/query.c:318 lib/query.c:374
 msgid "package has neither file owner or id lists\n"
 msgstr ""
 
-#: lib/query.c:467
+#: lib/query.c:463
 #, c-format
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:582 lib/rpmchecksig.c:159 lib/rpmchecksig.c:492
-#, c-format
-msgid "%s: readLead failed\n"
-msgstr ""
-
-#: lib/query.c:588 lib/rpmchecksig.c:498
-#, c-format
-msgid "%s: No signature available (v1.0 RPM)\n"
-msgstr ""
-
-#: lib/query.c:597 lib/rpmchecksig.c:177 lib/rpmchecksig.c:508
-#, c-format
-msgid "%s: rpmReadSignature failed\n"
-msgstr ""
-
-#: lib/query.c:601 lib/rpmchecksig.c:181 lib/rpmchecksig.c:513
-#, c-format
-msgid "%s: No signature available\n"
-msgstr ""
-
-#: lib/query.c:624
-#, c-format
-msgid "%s: headerRead failed\n"
-msgstr ""
-
-#: lib/query.c:641 lib/rpmchecksig.c:110 lib/rpmchecksig.c:287
-#, c-format
-msgid "%s: Fread failed: %s\n"
-msgstr ""
-
-#: lib/query.c:758 lib/query.c:796 lib/rpminstall.c:324 lib/rpminstall.c:468
-#: lib/rpminstall.c:848
+#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463
+#: lib/rpminstall.c:838
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:774
+#: lib/query.c:616
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:780
+#: lib/query.c:622
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:806 lib/rpminstall.c:481
+#: lib/query.c:648 lib/rpminstall.c:476
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr ""
 
-#: lib/query.c:850
+#: lib/query.c:692
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:874
+#: lib/query.c:716
 msgid "no packages\n"
 msgstr ""
 
-#: lib/query.c:894
+#: lib/query.c:736
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:904
+#: lib/query.c:746
 #, c-format
 msgid "no package triggers %s\n"
 msgstr ""
 
-#: lib/query.c:914
+#: lib/query.c:756
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:925
+#: lib/query.c:767
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:962
+#: lib/query.c:804
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:966
+#: lib/query.c:808
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:993
+#: lib/query.c:835
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:996
+#: lib/query.c:838
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:1001
+#: lib/query.c:843
 #, c-format
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:1012 lib/rpminstall.c:634
+#: lib/query.c:854 lib/rpminstall.c:624
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:50
+#: lib/rpmchecksig.c:49
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:62
+#: lib/rpmchecksig.c:61
 msgid "makeTempFile failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:103
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:164
+#: lib/rpmchecksig.c:163
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:168
+#: lib/rpmchecksig.c:167
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:214
+#: lib/rpmchecksig.c:213
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:220
+#: lib/rpmchecksig.c:219
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:731
+#: lib/rpmchecksig.c:512
+#, c-format
+msgid "%s: No signature available (v1.0 RPM)\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:707
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:732 lib/rpmchecksig.c:746
+#: lib/rpmchecksig.c:708 lib/rpmchecksig.c:722
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:734 lib/rpmchecksig.c:748
+#: lib/rpmchecksig.c:710 lib/rpmchecksig.c:724
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:735 lib/rpmchecksig.c:749
+#: lib/rpmchecksig.c:711 lib/rpmchecksig.c:725
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:737 lib/rpmchecksig.c:751
+#: lib/rpmchecksig.c:713 lib/rpmchecksig.c:727
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:745
+#: lib/rpmchecksig.c:721
 msgid "OK"
 msgstr ""
 
@@ -2491,86 +2496,86 @@ msgstr ""
 msgid "Preparing packages for installation..."
 msgstr ""
 
-#: lib/rpminstall.c:274
+#: lib/rpminstall.c:228
+#, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr ""
+
+#: lib/rpminstall.c:285
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:284
+#: lib/rpminstall.c:295
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:288
+#: lib/rpminstall.c:299
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:370
-#, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr ""
-
-#: lib/rpminstall.c:393
+#: lib/rpminstall.c:388
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:442
+#: lib/rpminstall.c:437
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:448
+#: lib/rpminstall.c:443
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:460 lib/rpminstall.c:705
+#: lib/rpminstall.c:455 lib/rpminstall.c:694
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:496
+#: lib/rpminstall.c:491
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:512
+#: lib/rpminstall.c:507
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:533
+#: lib/rpminstall.c:528
 msgid "installing binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:554
+#: lib/rpminstall.c:549
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:621
+#: lib/rpminstall.c:611
 #, c-format
 msgid "cannot open %s/packages.rpm\n"
 msgstr ""
 
-#: lib/rpminstall.c:637
+#: lib/rpminstall.c:627
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:661
+#: lib/rpminstall.c:651
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:691
+#: lib/rpminstall.c:680
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:697
+#: lib/rpminstall.c:686
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
@@ -2836,17 +2841,17 @@ msgstr ""
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:414
+#: lib/verify.c:417
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:511
+#: lib/verify.c:514
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
 
-#: lib/verify.c:556
+#: lib/verify.c:559
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index a2fec5c92..38c4a3f7b 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-24 21:17-0400\n"
+"POT-Creation-Date: 2001-10-26 00:15-0400\n"
 "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
 "Language-Team: Finnish <linux@sot.com>\n"
 "Content-Type: text/plain; charset=\n"
@@ -64,16 +64,16 @@ msgstr ""
 msgid "Building for target %s\n"
 msgstr "virhe etsittäessä pakettia %s\n"
 
-#: rpm2cpio.c:34
+#: rpm2cpio.c:55
 msgid "argument is not an RPM package\n"
 msgstr ""
 
-#: rpm2cpio.c:38
+#: rpm2cpio.c:61
 #, fuzzy
 msgid "error reading header from package\n"
 msgstr "virhe etsittäessä pakettia %s\n"
 
-#: rpm2cpio.c:60
+#: rpm2cpio.c:83
 #, fuzzy, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr "en voinut avata tiedostoa %s: "
@@ -405,44 +405,44 @@ msgstr "--sign: voidaan käyttää vain paketteja käännettäessä"
 msgid "exec failed\n"
 msgstr "%s: avaus ei onnistunut\n"
 
-#: rpmqv.c:959
+#: rpmqv.c:963
 msgid "no packages files given for rebuild"
 msgstr "uudelleenkäännolle ei määritelty paketteja"
 
-#: rpmqv.c:1026
+#: rpmqv.c:1038
 msgid "no spec files given for build"
 msgstr "käännökselle ei annettu määrittelytiedostoja"
 
-#: rpmqv.c:1028
+#: rpmqv.c:1040
 msgid "no tar files given for build"
 msgstr "käännökselle ei määritelty tar-tiedostoja"
 
-#: rpmqv.c:1047
+#: rpmqv.c:1059
 msgid "no packages given for uninstall"
 msgstr "poistolle ei määritelty paketteja"
 
-#: rpmqv.c:1058
+#: rpmqv.c:1070
 msgid "no packages given for install"
 msgstr "asennukselle ei määritelty paketteja"
 
-#: rpmqv.c:1106
+#: rpmqv.c:1118
 msgid "no arguments given for query"
 msgstr "kyselylle ei annettu parametrejä"
 
-#: rpmqv.c:1120
+#: rpmqv.c:1132
 msgid "no arguments given for verify"
 msgstr "tarkistukselle ei annettu parametrejä"
 
-#: rpmqv.c:1128
+#: rpmqv.c:1140
 msgid "unexpected arguments to --querytags "
 msgstr "--querytags: odottamattomia parametrejä"
 
-#: rpmqv.c:1144
+#: rpmqv.c:1156
 #, fuzzy
 msgid "no arguments given"
 msgstr "kyselylle ei annettu parametrejä"
 
-#: build/build.c:125 build/pack.c:466
+#: build/build.c:125 build/pack.c:487
 #, fuzzy
 msgid "Unable to open temp file.\n"
 msgstr "En voi avata %s luettavaksi: %s."
@@ -656,7 +656,7 @@ msgstr "Tiedostoa ei löytynyt palvelimelta"
 msgid "Could not open %%files file %s: %s\n"
 msgstr "virhe: tiedostoa %s ei voi avata\n"
 
-#: build/files.c:1777 build/pack.c:145
+#: build/files.c:1777 build/pack.c:148
 #, fuzzy, c-format
 msgid "line: %s\n"
 msgstr "en voinut avata %s: %s"
@@ -731,156 +731,156 @@ msgstr ""
 msgid "Could not canonicalize hostname: %s\n"
 msgstr ""
 
-#: build/pack.c:78
+#: build/pack.c:81
 #, fuzzy, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr "en voinut avata %s: %s"
 
-#: build/pack.c:81
+#: build/pack.c:84
 #, fuzzy, c-format
 msgid "create archive failed: %s\n"
 msgstr "en voinut avata %s: %s"
 
-#: build/pack.c:103
+#: build/pack.c:106
 #, fuzzy, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr "luku epäonnistui: %s (%d)"
 
-#: build/pack.c:110
+#: build/pack.c:113
 #, fuzzy, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr "luku epäonnistui: %s (%d)"
 
-#: build/pack.c:213
+#: build/pack.c:216
 #, fuzzy, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr "virhe: tiedostoa %s ei voi avata\n"
 
-#: build/pack.c:220
+#: build/pack.c:223
 #, fuzzy, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr "virhe: tiedostoa %s ei voi avata\n"
 
-#: build/pack.c:227
+#: build/pack.c:230
 #, fuzzy, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr "virhe: tiedostoa %s ei voi avata\n"
 
-#: build/pack.c:234
+#: build/pack.c:237
 #, fuzzy, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr "virhe: tiedostoa %s ei voi avata\n"
 
-#: build/pack.c:242
+#: build/pack.c:245
 #, fuzzy, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr "virhe: tiedostoa %s ei voi avata\n"
 
-#: build/pack.c:257
+#: build/pack.c:260
 #, fuzzy, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr "virhe: tiedostoa %s ei voi avata\n"
 
-#: build/pack.c:285
+#: build/pack.c:288
 #, fuzzy, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "en voinut avata %s: %s"
 
-#: build/pack.c:295
+#: build/pack.c:298
 #, fuzzy, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr "En voi lukea %s: %s."
 
-#: build/pack.c:304 build/pack.c:508
+#: build/pack.c:307 build/pack.c:529
 #, fuzzy, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: readLead  epäonnistui\n"
 
-#: build/pack.c:320
+#: build/pack.c:341
 #, fuzzy, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr "virhe: %s ei vaikuta RPM paketilta\n"
 
-#: build/pack.c:329
+#: build/pack.c:350
 #, fuzzy, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "virhe luettaessa tietuetta %s %s:stä"
 
-#: build/pack.c:454
+#: build/pack.c:475
 #, fuzzy
 msgid "Unable to create immutable header region.\n"
 msgstr "%s:n kirjoitus ei onnistu"
 
-#: build/pack.c:472
+#: build/pack.c:493
 #, fuzzy
 msgid "Unable to write temp header\n"
 msgstr "%s:n kirjoitus ei onnistu"
 
-#: build/pack.c:480
+#: build/pack.c:501
 msgid "Bad CSA data\n"
 msgstr ""
 
-#: build/pack.c:515
+#: build/pack.c:536
 #, fuzzy
 msgid "Unable to write final header\n"
 msgstr "%s:n kirjoitus ei onnistu"
 
-#: build/pack.c:533
+#: build/pack.c:554
 #, fuzzy, c-format
 msgid "Generating signature: %d\n"
 msgstr "generoi PGP-allekirjoitus"
 
-#: build/pack.c:546
+#: build/pack.c:567
 #, fuzzy
 msgid "Unable to reload signature header.\n"
 msgstr "%s:n kirjoitus ei onnistu"
 
-#: build/pack.c:554
+#: build/pack.c:575
 #, fuzzy, c-format
 msgid "Could not open %s: %s\n"
 msgstr "%s:n avaus epäonnistui\n"
 
-#: build/pack.c:590 lib/psm.c:2149
+#: build/pack.c:611 lib/psm.c:2153
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "%s:n kirjoitus ei onnistu"
 
-#: build/pack.c:605
+#: build/pack.c:626
 #, fuzzy, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "%s:n kirjoitus ei onnistu"
 
-#: build/pack.c:615
+#: build/pack.c:636
 #, fuzzy, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "%s:n kirjoitus ei onnistu"
 
-#: build/pack.c:629
+#: build/pack.c:650
 #, fuzzy, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "%s:n kirjoitus ei onnistu"
 
-#: build/pack.c:639
+#: build/pack.c:660
 #, fuzzy, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "%s:n kirjoitus ei onnistu"
 
-#: build/pack.c:645
+#: build/pack.c:666
 #, fuzzy, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "%s:n kirjoitus ei onnistu"
 
-#: build/pack.c:670 lib/psm.c:2415
+#: build/pack.c:691 lib/psm.c:2419
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:737
+#: build/pack.c:758
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:754
+#: build/pack.c:775
 #, fuzzy, c-format
 msgid "cannot create %s: %s\n"
 msgstr "en voinut avata tiedostoa %s: "
@@ -1469,60 +1469,60 @@ msgstr ""
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1248 lib/depends.c:1381
+#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1248 lib/depends.c:1381
+#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:1042
+#: lib/depends.c:1044
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:1153
+#: lib/depends.c:1155
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:1247
+#: lib/depends.c:1249
 #, fuzzy, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr "tiedostoa %s ei omista mikään paketti\n"
 
-#: lib/depends.c:1276
+#: lib/depends.c:1278
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1293
+#: lib/depends.c:1295
 #, fuzzy, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "tiedostoa %s ei omista mikään paketti\n"
 
-#: lib/depends.c:1317
+#: lib/depends.c:1319
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1330
+#: lib/depends.c:1332
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1344
+#: lib/depends.c:1346
 #, fuzzy, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr "tiedostoa %s ei omista mikään paketti\n"
 
-#: lib/depends.c:1360
+#: lib/depends.c:1362
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1381
+#: lib/depends.c:1383
 #, fuzzy, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "tiedostoa %s ei omista mikään paketti\n"
@@ -1530,42 +1530,42 @@ msgstr "tiedostoa %s ei omista mikään paketti\n"
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1454
+#: lib/depends.c:1456
 #, 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:1533
+#: lib/depends.c:1535
 #, fuzzy, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "paketti %s ei ole %s:ssä"
 
-#: lib/depends.c:1786
+#: lib/depends.c:1788
 #, 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:1936
+#: lib/depends.c:1938
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1996
+#: lib/depends.c:1998
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2046
+#: lib/depends.c:2048
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:2099
+#: lib/depends.c:2101
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:2129
+#: lib/depends.c:2131
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -1755,17 +1755,47 @@ msgstr "(tuntematon tyyppi)"
 msgid "error creating temporary file %s\n"
 msgstr "virhe luotaessa hakemistoa %s: %s"
 
-#: lib/package.c:161
+#: lib/package.c:167 lib/package.c:238
 #, fuzzy
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr "tämä versio RPM:stä tukee vain suuremmman kuin 3 versionumeron paketteja"
 
-#: lib/package.c:184
+#: lib/package.c:188 lib/package.c:246
 #, fuzzy
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr "tämä versio RPM:stä tukee vain suuremmman kuin 3 versionumeron paketteja"
 
+#: lib/package.c:224 lib/rpmchecksig.c:158 lib/rpmchecksig.c:506
+#, c-format
+msgid "%s: readLead failed\n"
+msgstr "%s: readLead  epäonnistui\n"
+
+#: lib/package.c:230
+#, c-format
+msgid "%s: bad magic\n"
+msgstr ""
+
+#: lib/package.c:254 lib/rpmchecksig.c:176 lib/rpmchecksig.c:522
+#, c-format
+msgid "%s: rpmReadSignature failed\n"
+msgstr "%s: rpmReadSignature epäonnistui\n"
+
+#: lib/package.c:258 lib/rpmchecksig.c:180 lib/rpmchecksig.c:527
+#, c-format
+msgid "%s: No signature available\n"
+msgstr "%s: Ei allekirjoitusta saatavilla\n"
+
+#: lib/package.c:284
+#, fuzzy, c-format
+msgid "%s: headerRead failed\n"
+msgstr "%s: readLead  epäonnistui\n"
+
+#: lib/package.c:303 lib/rpmchecksig.c:109 lib/rpmchecksig.c:450
+#, fuzzy, c-format
+msgid "%s: Fread failed: %s\n"
+msgstr "%s: readLead  epäonnistui\n"
+
 #: lib/poptI.c:47
 #, fuzzy
 msgid "exclude paths must begin with a /"
@@ -2304,281 +2334,256 @@ msgstr "en voinut avata tiedostoa %s: "
 msgid "cannot write to %%%s %s\n"
 msgstr "en voinut avata tiedostoa %s: "
 
-#: lib/psm.c:1214
+#: lib/psm.c:1217
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1325
+#: lib/psm.c:1330
 #, fuzzy
 msgid "source package contains no .spec file\n"
 msgstr "kysy pakettia, jonka omistuksessa <tiedosto> on"
 
-#: lib/psm.c:1432
+#: lib/psm.c:1436
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "älä suorita mitään vaiheita"
 
-#: lib/psm.c:1600
+#: lib/psm.c:1604
 #, fuzzy, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr "skriptin ajo epäonnistui"
 
-#: lib/psm.c:1607
+#: lib/psm.c:1611
 #, fuzzy, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr "skriptin ajo epäonnistui"
 
-#: lib/psm.c:1954
+#: lib/psm.c:1958
 #, fuzzy, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr "paketti %s-%s-%s  sisältää jaettuja tiedostoja\n"
 
-#: lib/psm.c:2071
+#: lib/psm.c:2075
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2186
+#: lib/psm.c:2190
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2195
+#: lib/psm.c:2199
 #, fuzzy, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "ryhmässä %s ei ole paketteja\n"
 
-#: lib/psm.c:2236
+#: lib/psm.c:2240
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "%s:n avaus ei onnistunut: %s\n"
 
-#: lib/psm.c:2237
+#: lib/psm.c:2241
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2423
+#: lib/psm.c:2427
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "en voinut avata %s: %s"
 
-#: lib/psm.c:2426
+#: lib/psm.c:2430
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "pgp epäonnistui"
 
-#: lib/query.c:128
+#: lib/query.c:124
 #, fuzzy, c-format
 msgid "incorrect format: %s\n"
 msgstr "virhe formaatissa: %s\n"
 
-#: lib/query.c:225
+#: lib/query.c:221
 msgid "(contains no files)"
 msgstr "(ei tiedostoja)"
 
-#: lib/query.c:286
+#: lib/query.c:282
 msgid "normal        "
 msgstr ""
 
-#: lib/query.c:289
+#: lib/query.c:285
 msgid "replaced      "
 msgstr ""
 
-#: lib/query.c:292
+#: lib/query.c:288
 #, fuzzy
 msgid "not installed "
 msgstr "paketti %s ei ole asennettu\n"
 
-#: lib/query.c:295
+#: lib/query.c:291
 msgid "net shared    "
 msgstr ""
 
-#: lib/query.c:298
+#: lib/query.c:294
 #, fuzzy, c-format
 msgid "(unknown %3d) "
 msgstr "(tuntematon tyyppi)"
 
-#: lib/query.c:303
+#: lib/query.c:299
 msgid "(no state)    "
 msgstr ""
 
-#: lib/query.c:322 lib/query.c:378
+#: lib/query.c:318 lib/query.c:374
 #, fuzzy
 msgid "package has neither file owner or id lists\n"
 msgstr "paketilla ei ole nimeä"
 
-#: lib/query.c:467
+#: lib/query.c:463
 #, fuzzy, c-format
 msgid "can't query %s: %s\n"
 msgstr "virhe: en voi avata %s\n"
 
-#: lib/query.c:582 lib/rpmchecksig.c:159 lib/rpmchecksig.c:492
-#, c-format
-msgid "%s: readLead failed\n"
-msgstr "%s: readLead  epäonnistui\n"
-
-#: lib/query.c:588 lib/rpmchecksig.c:498
-#, c-format
-msgid "%s: No signature available (v1.0 RPM)\n"
-msgstr "%s: Ei allekirjoitusta saatavilla (v1.0 RPM)\n"
-
-#: lib/query.c:597 lib/rpmchecksig.c:177 lib/rpmchecksig.c:508
-#, c-format
-msgid "%s: rpmReadSignature failed\n"
-msgstr "%s: rpmReadSignature epäonnistui\n"
-
-#: lib/query.c:601 lib/rpmchecksig.c:181 lib/rpmchecksig.c:513
-#, c-format
-msgid "%s: No signature available\n"
-msgstr "%s: Ei allekirjoitusta saatavilla\n"
-
-#: lib/query.c:624
-#, fuzzy, c-format
-msgid "%s: headerRead failed\n"
-msgstr "%s: readLead  epäonnistui\n"
-
-#: lib/query.c:641 lib/rpmchecksig.c:110 lib/rpmchecksig.c:287
-#, fuzzy, c-format
-msgid "%s: Fread failed: %s\n"
-msgstr "%s: readLead  epäonnistui\n"
-
-#: lib/query.c:758 lib/query.c:796 lib/rpminstall.c:324 lib/rpminstall.c:468
-#: lib/rpminstall.c:848
+#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463
+#: lib/rpminstall.c:838
 #, fuzzy, c-format
 msgid "open of %s failed: %s\n"
 msgstr "%s:n avaus ei onnistunut: %s\n"
 
-#: lib/query.c:774
+#: lib/query.c:616
 #, c-format
 msgid "query of %s failed\n"
 msgstr "%s:n kysely ei onnistunut\n"
 
-#: lib/query.c:780
+#: lib/query.c:622
 msgid "old format source packages cannot be queried\n"
 msgstr "vanhan formaatin lähdekoodipaketteja ei voi kysellä\n"
 
-#: lib/query.c:806 lib/rpminstall.c:481
+#: lib/query.c:648 lib/rpminstall.c:476
 #, fuzzy, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: readLead  epäonnistui\n"
 
-#: lib/query.c:850
+#: lib/query.c:692
 #, fuzzy, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "%s:n kysely ei onnistunut\n"
 
-#: lib/query.c:874
+#: lib/query.c:716
 #, fuzzy
 msgid "no packages\n"
 msgstr "kysele kaikki paketit"
 
-#: lib/query.c:894
+#: lib/query.c:736
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "ryhmässä %s ei ole paketteja\n"
 
-#: lib/query.c:904
+#: lib/query.c:746
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "mikään paketti ei laukaise %s:a\n"
 
-#: lib/query.c:914
+#: lib/query.c:756
 #, c-format
 msgid "no package requires %s\n"
 msgstr "mikään pakettie ei tarvitse %s:a\n"
 
-#: lib/query.c:925
+#: lib/query.c:767
 #, c-format
 msgid "no package provides %s\n"
 msgstr "mikään paketti ei tarjoa %s:a\n"
 
-#: lib/query.c:962
+#: lib/query.c:804
 #, fuzzy, c-format
 msgid "file %s: %s\n"
 msgstr "en voinut avata %s: %s"
 
-#: lib/query.c:966
+#: lib/query.c:808
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "tiedostoa %s ei omista mikään paketti\n"
 
-#: lib/query.c:993
+#: lib/query.c:835
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "virheellinen paketin numero: %s\n"
 
-#: lib/query.c:996
+#: lib/query.c:838
 #, fuzzy, c-format
 msgid "package record number: %u\n"
 msgstr "virheellinen paketin numero: %s\n"
 
-#: lib/query.c:1001
+#: lib/query.c:843
 #, fuzzy, c-format
 msgid "record %u could not be read\n"
 msgstr "tietuetta %d ei voitu lukea\n"
 
-#: lib/query.c:1012 lib/rpminstall.c:634
+#: lib/query.c:854 lib/rpminstall.c:624
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "paketti %s ei ole asennettu\n"
 
-#: lib/rpmchecksig.c:50
+#: lib/rpmchecksig.c:49
 #, fuzzy, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s: avaus ei onnistunut\n"
 
-#: lib/rpmchecksig.c:62
+#: lib/rpmchecksig.c:61
 #, fuzzy
 msgid "makeTempFile failed\n"
 msgstr "%s: avaus ei onnistunut\n"
 
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:103
 #, fuzzy, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: readLead  epäonnistui\n"
 
-#: lib/rpmchecksig.c:164
+#: lib/rpmchecksig.c:163
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr "%s: En voi allekirjoittaa v1.0 RPM:ää\n"
 
-#: lib/rpmchecksig.c:168
+#: lib/rpmchecksig.c:167
 #, 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:214
+#: lib/rpmchecksig.c:213
 #, fuzzy, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: readLead  epäonnistui\n"
 
-#: lib/rpmchecksig.c:220
+#: lib/rpmchecksig.c:219
 #, fuzzy, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmReadSignature epäonnistui\n"
 
-#: lib/rpmchecksig.c:731
+#: lib/rpmchecksig.c:512
+#, c-format
+msgid "%s: No signature available (v1.0 RPM)\n"
+msgstr "%s: Ei allekirjoitusta saatavilla (v1.0 RPM)\n"
+
+#: lib/rpmchecksig.c:707
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:732 lib/rpmchecksig.c:746
+#: lib/rpmchecksig.c:708 lib/rpmchecksig.c:722
 #, fuzzy
 msgid " (MISSING KEYS:"
 msgstr "(PUUTTUVAT AVAIMET)"
 
-#: lib/rpmchecksig.c:734 lib/rpmchecksig.c:748
+#: lib/rpmchecksig.c:710 lib/rpmchecksig.c:724
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:735 lib/rpmchecksig.c:749
+#: lib/rpmchecksig.c:711 lib/rpmchecksig.c:725
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:737 lib/rpmchecksig.c:751
+#: lib/rpmchecksig.c:713 lib/rpmchecksig.c:727
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:745
+#: lib/rpmchecksig.c:721
 msgid "OK"
 msgstr ""
 
@@ -2591,87 +2596,87 @@ msgstr ""
 msgid "Preparing packages for installation..."
 msgstr "asennukselle ei määritelty paketteja"
 
-#: lib/rpminstall.c:274
+#: lib/rpminstall.c:228
+#, fuzzy, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr "virhe: en voi avata %s%s/packages.rpm\n"
+
+#: lib/rpminstall.c:285
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "Haen: %s\n"
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:284
+#: lib/rpminstall.c:295
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:288
+#: lib/rpminstall.c:299
 #, fuzzy, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "virhe: ohitan %s:n, siirto epäonnistui - %s\n"
 
-#: lib/rpminstall.c:370
-#, fuzzy, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr "virhe: en voi avata %s%s/packages.rpm\n"
-
-#: lib/rpminstall.c:393
+#: lib/rpminstall.c:388
 #, fuzzy, c-format
 msgid "package %s is not relocateable\n"
 msgstr "paketti %s ei ole asennettu\n"
 
-#: lib/rpminstall.c:442
+#: lib/rpminstall.c:437
 #, fuzzy, c-format
 msgid "error reading from file %s\n"
 msgstr "virhe luotaessa hakemistoa %s: %s"
 
-#: lib/rpminstall.c:448
+#: lib/rpminstall.c:443
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:460 lib/rpminstall.c:705
+#: lib/rpminstall.c:455 lib/rpminstall.c:694
 #, fuzzy, c-format
 msgid "%s cannot be installed\n"
 msgstr "virhe: %s ei voida asentaa\n"
 
-#: lib/rpminstall.c:496
+#: lib/rpminstall.c:491
 #, fuzzy, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "ryhmässä %s ei ole paketteja\n"
 
-#: lib/rpminstall.c:512
+#: lib/rpminstall.c:507
 msgid "failed dependencies:\n"
 msgstr "puuttuvat riippuvuudet:\n"
 
-#: lib/rpminstall.c:533
+#: lib/rpminstall.c:528
 #, fuzzy
 msgid "installing binary packages\n"
 msgstr "asenna paketti"
 
-#: lib/rpminstall.c:554
+#: lib/rpminstall.c:549
 #, fuzzy, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "en voinut avata tiedostoa %s: "
 
-#: lib/rpminstall.c:621
+#: lib/rpminstall.c:611
 #, fuzzy, c-format
 msgid "cannot open %s/packages.rpm\n"
 msgstr "virhe: en voi avata %s%s/packages.rpm\n"
 
-#: lib/rpminstall.c:637
+#: lib/rpminstall.c:627
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" määrittää useita paketteja\n"
 
-#: lib/rpminstall.c:661
+#: lib/rpminstall.c:651
 msgid "removing these packages would break dependencies:\n"
 msgstr "näiden pakettien poisto rikkoisi riippuvuuksia:\n"
 
-#: lib/rpminstall.c:691
+#: lib/rpminstall.c:680
 #, fuzzy, c-format
 msgid "cannot open %s: %s\n"
 msgstr "virhe: en voi avata %s\n"
 
-#: lib/rpminstall.c:697
+#: lib/rpminstall.c:686
 #, c-format
 msgid "Installing %s\n"
 msgstr "Asennan: %s\n"
@@ -2951,17 +2956,17 @@ msgstr ""
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:414
+#: lib/verify.c:417
 #, fuzzy, c-format
 msgid "missing    %s"
 msgstr "puuttuva '{' '%':n jälkeen"
 
-#: lib/verify.c:511
+#: lib/verify.c:514
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr "%s-%s-%s:n tyydyttämättömät riippuvuudet:"
 
-#: lib/verify.c:556
+#: lib/verify.c:559
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 57989131b..58c06c4e3 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-24 21:17-0400\n"
+"POT-Creation-Date: 2001-10-26 00:15-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"
@@ -71,15 +71,15 @@ msgstr ""
 msgid "Building for target %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: rpm2cpio.c:34
+#: rpm2cpio.c:55
 msgid "argument is not an RPM package\n"
 msgstr ""
 
-#: rpm2cpio.c:38
+#: rpm2cpio.c:61
 msgid "error reading header from package\n"
 msgstr ""
 
-#: rpm2cpio.c:60
+#: rpm2cpio.c:83
 #, fuzzy, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
@@ -444,45 +444,45 @@ msgstr "--sign ne peut tre spcifi que lors de la construction d'un package"
 msgid "exec failed\n"
 msgstr "La construction a chou.\n"
 
-#: rpmqv.c:959
+#: rpmqv.c:963
 msgid "no packages files given for rebuild"
 msgstr "aucun package n'a t spcifi pour la reconstruction"
 
-#: rpmqv.c:1026
+#: rpmqv.c:1038
 msgid "no spec files given for build"
 msgstr "aucun package n'a t spcifi pour la construction"
 
-#: rpmqv.c:1028
+#: rpmqv.c:1040
 #, fuzzy
 msgid "no tar files given for build"
 msgstr "aucun package n'a t spcifi pour la construction"
 
-#: rpmqv.c:1047
+#: rpmqv.c:1059
 msgid "no packages given for uninstall"
 msgstr "aucun package n'a t spcifi pour la dsinstallation"
 
-#: rpmqv.c:1058
+#: rpmqv.c:1070
 msgid "no packages given for install"
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: rpmqv.c:1106
+#: rpmqv.c:1118
 msgid "no arguments given for query"
 msgstr "aucun argument n'a t fourni pour la requte"
 
-#: rpmqv.c:1120
+#: rpmqv.c:1132
 msgid "no arguments given for verify"
 msgstr "aucun argument n'a t fourni pour la vrification"
 
-#: rpmqv.c:1128
+#: rpmqv.c:1140
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpmqv.c:1144
+#: rpmqv.c:1156
 #, fuzzy
 msgid "no arguments given"
 msgstr "aucun argument n'a t fourni pour la requte"
 
-#: build/build.c:125 build/pack.c:466
+#: build/build.c:125 build/pack.c:487
 #, fuzzy
 msgid "Unable to open temp file.\n"
 msgstr "impossible d'ouvrir: %s\n"
@@ -691,7 +691,7 @@ msgstr "aucun package n'a t spcifi pour la dsinstallation"
 msgid "Could not open %%files file %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/files.c:1777 build/pack.c:145
+#: build/files.c:1777 build/pack.c:148
 #, fuzzy, c-format
 msgid "line: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
@@ -766,156 +766,156 @@ msgstr ""
 msgid "Could not canonicalize hostname: %s\n"
 msgstr ""
 
-#: build/pack.c:78
+#: build/pack.c:81
 #, fuzzy, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:81
+#: build/pack.c:84
 #, fuzzy, c-format
 msgid "create archive failed: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:103
+#: build/pack.c:106
 #, fuzzy, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:110
+#: build/pack.c:113
 #, fuzzy, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:213
+#: build/pack.c:216
 #, fuzzy, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:220
+#: build/pack.c:223
 #, fuzzy, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:227
+#: build/pack.c:230
 #, fuzzy, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:234
+#: build/pack.c:237
 #, fuzzy, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:242
+#: build/pack.c:245
 #, fuzzy, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:257
+#: build/pack.c:260
 #, fuzzy, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:285
+#: build/pack.c:288
 #, fuzzy, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:295
+#: build/pack.c:298
 #, fuzzy, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:304 build/pack.c:508
+#: build/pack.c:307 build/pack.c:529
 #, fuzzy, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:320
+#: build/pack.c:341
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr ""
 
-#: build/pack.c:329
+#: build/pack.c:350
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:454
+#: build/pack.c:475
 #, fuzzy
 msgid "Unable to create immutable header region.\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:472
+#: build/pack.c:493
 #, fuzzy
 msgid "Unable to write temp header\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:480
+#: build/pack.c:501
 msgid "Bad CSA data\n"
 msgstr ""
 
-#: build/pack.c:515
+#: build/pack.c:536
 #, fuzzy
 msgid "Unable to write final header\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:533
+#: build/pack.c:554
 #, fuzzy, c-format
 msgid "Generating signature: %d\n"
 msgstr "      --sign            - genre une signature PGP"
 
-#: build/pack.c:546
+#: build/pack.c:567
 #, fuzzy
 msgid "Unable to reload signature header.\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:554
+#: build/pack.c:575
 #, fuzzy, c-format
 msgid "Could not open %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:590 lib/psm.c:2149
+#: build/pack.c:611 lib/psm.c:2153
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:605
+#: build/pack.c:626
 #, fuzzy, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:615
+#: build/pack.c:636
 #, fuzzy, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:629
+#: build/pack.c:650
 #, fuzzy, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:639
+#: build/pack.c:660
 #, fuzzy, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:645
+#: build/pack.c:666
 #, fuzzy, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:670 lib/psm.c:2415
+#: build/pack.c:691 lib/psm.c:2419
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:737
+#: build/pack.c:758
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:754
+#: build/pack.c:775
 #, fuzzy, c-format
 msgid "cannot create %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
@@ -1509,60 +1509,60 @@ msgstr ""
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1248 lib/depends.c:1381
+#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1248 lib/depends.c:1381
+#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:1042
+#: lib/depends.c:1044
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:1153
+#: lib/depends.c:1155
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:1247
+#: lib/depends.c:1249
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1276
+#: lib/depends.c:1278
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1293
+#: lib/depends.c:1295
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:1317
+#: lib/depends.c:1319
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1330
+#: lib/depends.c:1332
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1344
+#: lib/depends.c:1346
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:1360
+#: lib/depends.c:1362
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1381
+#: lib/depends.c:1383
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
@@ -1570,42 +1570,42 @@ msgstr ""
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1454
+#: lib/depends.c:1456
 #, fuzzy, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "aucun package n'a t spcifi pour l'installation"
 
 #. conflicts exist.
-#: lib/depends.c:1533
+#: lib/depends.c:1535
 #, fuzzy, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "aucun package n'a t spcifi pour la dsinstallation"
 
-#: lib/depends.c:1786
+#: lib/depends.c:1788
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1936
+#: lib/depends.c:1938
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1996
+#: lib/depends.c:1998
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2046
+#: lib/depends.c:2048
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:2099
+#: lib/depends.c:2101
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:2129
+#: lib/depends.c:2131
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -1793,15 +1793,45 @@ msgstr ""
 msgid "error creating temporary file %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/package.c:161
+#: lib/package.c:167 lib/package.c:238
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:184
+#: lib/package.c:188 lib/package.c:246
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 
+#: lib/package.c:224 lib/rpmchecksig.c:158 lib/rpmchecksig.c:506
+#, c-format
+msgid "%s: readLead failed\n"
+msgstr ""
+
+#: lib/package.c:230
+#, c-format
+msgid "%s: bad magic\n"
+msgstr ""
+
+#: lib/package.c:254 lib/rpmchecksig.c:176 lib/rpmchecksig.c:522
+#, c-format
+msgid "%s: rpmReadSignature failed\n"
+msgstr ""
+
+#: lib/package.c:258 lib/rpmchecksig.c:180 lib/rpmchecksig.c:527
+#, c-format
+msgid "%s: No signature available\n"
+msgstr ""
+
+#: lib/package.c:284
+#, fuzzy, c-format
+msgid "%s: headerRead failed\n"
+msgstr "impossible d'ouvrir: %s\n"
+
+#: lib/package.c:303 lib/rpmchecksig.c:109 lib/rpmchecksig.c:450
+#, fuzzy, c-format
+msgid "%s: Fread failed: %s\n"
+msgstr "impossible d'ouvrir: %s\n"
+
 #: lib/poptI.c:47
 #, fuzzy
 msgid "exclude paths must begin with a /"
@@ -2357,281 +2387,256 @@ msgstr "impossible d'ouvrir: %s\n"
 msgid "cannot write to %%%s %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/psm.c:1214
+#: lib/psm.c:1217
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1325
+#: lib/psm.c:1330
 #, fuzzy
 msgid "source package contains no .spec file\n"
 msgstr ""
 "        -f <file>+        - interroge le package  qui appartient <file>"
 
-#: lib/psm.c:1432
+#: lib/psm.c:1436
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1600
+#: lib/psm.c:1604
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1607
+#: lib/psm.c:1611
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1954
+#: lib/psm.c:1958
 #, fuzzy, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: lib/psm.c:2071
+#: lib/psm.c:2075
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2186
+#: lib/psm.c:2190
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2195
+#: lib/psm.c:2199
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2236
+#: lib/psm.c:2240
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "La construction a chou.\n"
 
-#: lib/psm.c:2237
+#: lib/psm.c:2241
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2423
+#: lib/psm.c:2427
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/psm.c:2426
+#: lib/psm.c:2430
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "La construction a chou.\n"
 
-#: lib/query.c:128
+#: lib/query.c:124
 #, c-format
 msgid "incorrect format: %s\n"
 msgstr ""
 
-#: lib/query.c:225
+#: lib/query.c:221
 msgid "(contains no files)"
 msgstr ""
 
-#: lib/query.c:286
+#: lib/query.c:282
 msgid "normal        "
 msgstr ""
 
-#: lib/query.c:289
+#: lib/query.c:285
 msgid "replaced      "
 msgstr ""
 
-#: lib/query.c:292
+#: lib/query.c:288
 #, fuzzy
 msgid "not installed "
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: lib/query.c:295
+#: lib/query.c:291
 msgid "net shared    "
 msgstr ""
 
-#: lib/query.c:298
+#: lib/query.c:294
 #, c-format
 msgid "(unknown %3d) "
 msgstr ""
 
-#: lib/query.c:303
+#: lib/query.c:299
 msgid "(no state)    "
 msgstr ""
 
-#: lib/query.c:322 lib/query.c:378
+#: lib/query.c:318 lib/query.c:374
 #, fuzzy
 msgid "package has neither file owner or id lists\n"
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: lib/query.c:467
+#: lib/query.c:463
 #, fuzzy, c-format
 msgid "can't query %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/query.c:582 lib/rpmchecksig.c:159 lib/rpmchecksig.c:492
-#, c-format
-msgid "%s: readLead failed\n"
-msgstr ""
-
-#: lib/query.c:588 lib/rpmchecksig.c:498
-#, c-format
-msgid "%s: No signature available (v1.0 RPM)\n"
-msgstr ""
-
-#: lib/query.c:597 lib/rpmchecksig.c:177 lib/rpmchecksig.c:508
-#, c-format
-msgid "%s: rpmReadSignature failed\n"
-msgstr ""
-
-#: lib/query.c:601 lib/rpmchecksig.c:181 lib/rpmchecksig.c:513
-#, c-format
-msgid "%s: No signature available\n"
-msgstr ""
-
-#: lib/query.c:624
-#, fuzzy, c-format
-msgid "%s: headerRead failed\n"
-msgstr "impossible d'ouvrir: %s\n"
-
-#: lib/query.c:641 lib/rpmchecksig.c:110 lib/rpmchecksig.c:287
-#, fuzzy, c-format
-msgid "%s: Fread failed: %s\n"
-msgstr "impossible d'ouvrir: %s\n"
-
-#: lib/query.c:758 lib/query.c:796 lib/rpminstall.c:324 lib/rpminstall.c:468
-#: lib/rpminstall.c:848
+#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463
+#: lib/rpminstall.c:838
 #, fuzzy, c-format
 msgid "open of %s failed: %s\n"
 msgstr "La construction a chou.\n"
 
-#: lib/query.c:774
+#: lib/query.c:616
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:780
+#: lib/query.c:622
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:806 lib/rpminstall.c:481
+#: lib/query.c:648 lib/rpminstall.c:476
 #, fuzzy, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/query.c:850
+#: lib/query.c:692
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:874
+#: lib/query.c:716
 #, fuzzy
 msgid "no packages\n"
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: lib/query.c:894
+#: lib/query.c:736
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:904
+#: lib/query.c:746
 #, fuzzy, c-format
 msgid "no package triggers %s\n"
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: lib/query.c:914
+#: lib/query.c:756
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:925
+#: lib/query.c:767
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:962
+#: lib/query.c:804
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:966
+#: lib/query.c:808
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:993
+#: lib/query.c:835
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:996
+#: lib/query.c:838
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:1001
+#: lib/query.c:843
 #, c-format
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:1012 lib/rpminstall.c:634
+#: lib/query.c:854 lib/rpminstall.c:624
 #, fuzzy, c-format
 msgid "package %s is not installed\n"
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: lib/rpmchecksig.c:50
+#: lib/rpmchecksig.c:49
 #, fuzzy, c-format
 msgid "%s: open failed: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmchecksig.c:62
+#: lib/rpmchecksig.c:61
 #, fuzzy
 msgid "makeTempFile failed\n"
 msgstr "La construction a chou.\n"
 
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:103
 #, fuzzy, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmchecksig.c:164
+#: lib/rpmchecksig.c:163
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:168
+#: lib/rpmchecksig.c:167
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:214
+#: lib/rpmchecksig.c:213
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:220
+#: lib/rpmchecksig.c:219
 #, fuzzy, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmchecksig.c:731
+#: lib/rpmchecksig.c:512
+#, c-format
+msgid "%s: No signature available (v1.0 RPM)\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:707
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:732 lib/rpmchecksig.c:746
+#: lib/rpmchecksig.c:708 lib/rpmchecksig.c:722
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:734 lib/rpmchecksig.c:748
+#: lib/rpmchecksig.c:710 lib/rpmchecksig.c:724
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:735 lib/rpmchecksig.c:749
+#: lib/rpmchecksig.c:711 lib/rpmchecksig.c:725
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:737 lib/rpmchecksig.c:751
+#: lib/rpmchecksig.c:713 lib/rpmchecksig.c:727
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:745
+#: lib/rpmchecksig.c:721
 msgid "OK"
 msgstr ""
 
@@ -2644,86 +2649,86 @@ msgstr ""
 msgid "Preparing packages for installation..."
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: lib/rpminstall.c:274
+#: lib/rpminstall.c:228
+#, fuzzy, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr "impossible d'ouvrir: %s\n"
+
+#: lib/rpminstall.c:285
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:284
+#: lib/rpminstall.c:295
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:288
+#: lib/rpminstall.c:299
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:370
-#, fuzzy, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr "impossible d'ouvrir: %s\n"
-
-#: lib/rpminstall.c:393
+#: lib/rpminstall.c:388
 #, fuzzy, c-format
 msgid "package %s is not relocateable\n"
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: lib/rpminstall.c:442
+#: lib/rpminstall.c:437
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:448
+#: lib/rpminstall.c:443
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:460 lib/rpminstall.c:705
+#: lib/rpminstall.c:455 lib/rpminstall.c:694
 #, fuzzy, c-format
 msgid "%s cannot be installed\n"
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: lib/rpminstall.c:496
+#: lib/rpminstall.c:491
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:512
+#: lib/rpminstall.c:507
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:533
+#: lib/rpminstall.c:528
 msgid "installing binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:554
+#: lib/rpminstall.c:549
 #, fuzzy, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpminstall.c:621
+#: lib/rpminstall.c:611
 #, c-format
 msgid "cannot open %s/packages.rpm\n"
 msgstr ""
 
-#: lib/rpminstall.c:637
+#: lib/rpminstall.c:627
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:661
+#: lib/rpminstall.c:651
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:691
+#: lib/rpminstall.c:680
 #, fuzzy, c-format
 msgid "cannot open %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpminstall.c:697
+#: lib/rpminstall.c:686
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
@@ -3000,17 +3005,17 @@ msgstr ""
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:414
+#: lib/verify.c:417
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:511
+#: lib/verify.c:514
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
 
-#: lib/verify.c:556
+#: lib/verify.c:559
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
diff --git a/po/gl.po b/po/gl.po
index 279bd2d59..ac55b704b 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-10-24 21:17-0400\n"
+"POT-Creation-Date: 2001-10-26 00:15-0400\n"
 "PO-Revision-Date: 2001-01-13 22:31+0100\n"
 "Last-Translator: Jesús Bravo Álvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -65,15 +65,15 @@ msgstr ""
 msgid "Building for target %s\n"
 msgstr ""
 
-#: rpm2cpio.c:34
+#: rpm2cpio.c:55
 msgid "argument is not an RPM package\n"
 msgstr ""
 
-#: rpm2cpio.c:38
+#: rpm2cpio.c:61
 msgid "error reading header from package\n"
 msgstr ""
 
-#: rpm2cpio.c:60
+#: rpm2cpio.c:83
 #, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr ""
@@ -392,43 +392,43 @@ msgstr ""
 msgid "exec failed\n"
 msgstr ""
 
-#: rpmqv.c:959
+#: rpmqv.c:963
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1026
+#: rpmqv.c:1038
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1028
+#: rpmqv.c:1040
 msgid "no tar files given for build"
 msgstr ""
 
-#: rpmqv.c:1047
+#: rpmqv.c:1059
 msgid "no packages given for uninstall"
 msgstr ""
 
-#: rpmqv.c:1058
+#: rpmqv.c:1070
 msgid "no packages given for install"
 msgstr ""
 
-#: rpmqv.c:1106
+#: rpmqv.c:1118
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpmqv.c:1120
+#: rpmqv.c:1132
 msgid "no arguments given for verify"
 msgstr ""
 
-#: rpmqv.c:1128
+#: rpmqv.c:1140
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpmqv.c:1144
+#: rpmqv.c:1156
 msgid "no arguments given"
 msgstr ""
 
-#: build/build.c:125 build/pack.c:466
+#: build/build.c:125 build/pack.c:487
 msgid "Unable to open temp file.\n"
 msgstr ""
 
@@ -636,7 +636,7 @@ msgstr ""
 msgid "Could not open %%files file %s: %s\n"
 msgstr ""
 
-#: build/files.c:1777 build/pack.c:145
+#: build/files.c:1777 build/pack.c:148
 #, c-format
 msgid "line: %s\n"
 msgstr ""
@@ -711,152 +711,152 @@ msgstr ""
 msgid "Could not canonicalize hostname: %s\n"
 msgstr ""
 
-#: build/pack.c:78
+#: build/pack.c:81
 #, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr ""
 
-#: build/pack.c:81
+#: build/pack.c:84
 #, c-format
 msgid "create archive failed: %s\n"
 msgstr ""
 
-#: build/pack.c:103
+#: build/pack.c:106
 #, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr ""
 
-#: build/pack.c:110
+#: build/pack.c:113
 #, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr ""
 
-#: build/pack.c:213
+#: build/pack.c:216
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr ""
 
-#: build/pack.c:220
+#: build/pack.c:223
 #, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr ""
 
-#: build/pack.c:227
+#: build/pack.c:230
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr ""
 
-#: build/pack.c:234
+#: build/pack.c:237
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr ""
 
-#: build/pack.c:242
+#: build/pack.c:245
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr ""
 
-#: build/pack.c:257
+#: build/pack.c:260
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr ""
 
-#: build/pack.c:285
+#: build/pack.c:288
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:295
+#: build/pack.c:298
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr ""
 
-#: build/pack.c:304 build/pack.c:508
+#: build/pack.c:307 build/pack.c:529
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr ""
 
-#: build/pack.c:320
+#: build/pack.c:341
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr ""
 
-#: build/pack.c:329
+#: build/pack.c:350
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:454
+#: build/pack.c:475
 msgid "Unable to create immutable header region.\n"
 msgstr ""
 
-#: build/pack.c:472
+#: build/pack.c:493
 msgid "Unable to write temp header\n"
 msgstr ""
 
-#: build/pack.c:480
+#: build/pack.c:501
 msgid "Bad CSA data\n"
 msgstr ""
 
-#: build/pack.c:515
+#: build/pack.c:536
 msgid "Unable to write final header\n"
 msgstr ""
 
-#: build/pack.c:533
+#: build/pack.c:554
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr ""
 
-#: build/pack.c:546
+#: build/pack.c:567
 msgid "Unable to reload signature header.\n"
 msgstr ""
 
-#: build/pack.c:554
+#: build/pack.c:575
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:590 lib/psm.c:2149
+#: build/pack.c:611 lib/psm.c:2153
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
 
-#: build/pack.c:605
+#: build/pack.c:626
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr ""
 
-#: build/pack.c:615
+#: build/pack.c:636
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr ""
 
-#: build/pack.c:629
+#: build/pack.c:650
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:639
+#: build/pack.c:660
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr ""
 
-#: build/pack.c:645
+#: build/pack.c:666
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:670 lib/psm.c:2415
+#: build/pack.c:691 lib/psm.c:2419
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:737
+#: build/pack.c:758
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:754
+#: build/pack.c:775
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr ""
@@ -1423,60 +1423,60 @@ msgstr ""
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1248 lib/depends.c:1381
+#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1248 lib/depends.c:1381
+#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:1042
+#: lib/depends.c:1044
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:1153
+#: lib/depends.c:1155
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:1247
+#: lib/depends.c:1249
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1276
+#: lib/depends.c:1278
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1293
+#: lib/depends.c:1295
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:1317
+#: lib/depends.c:1319
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1330
+#: lib/depends.c:1332
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1344
+#: lib/depends.c:1346
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:1360
+#: lib/depends.c:1362
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1381
+#: lib/depends.c:1383
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
@@ -1484,42 +1484,42 @@ msgstr ""
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1454
+#: lib/depends.c:1456
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1533
+#: lib/depends.c:1535
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1786
+#: lib/depends.c:1788
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1936
+#: lib/depends.c:1938
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1996
+#: lib/depends.c:1998
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2046
+#: lib/depends.c:2048
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:2099
+#: lib/depends.c:2101
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:2129
+#: lib/depends.c:2131
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -1705,15 +1705,45 @@ msgstr ""
 msgid "error creating temporary file %s\n"
 msgstr ""
 
-#: lib/package.c:161
+#: lib/package.c:167 lib/package.c:238
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:184
+#: lib/package.c:188 lib/package.c:246
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 
+#: lib/package.c:224 lib/rpmchecksig.c:158 lib/rpmchecksig.c:506
+#, c-format
+msgid "%s: readLead failed\n"
+msgstr ""
+
+#: lib/package.c:230
+#, c-format
+msgid "%s: bad magic\n"
+msgstr ""
+
+#: lib/package.c:254 lib/rpmchecksig.c:176 lib/rpmchecksig.c:522
+#, c-format
+msgid "%s: rpmReadSignature failed\n"
+msgstr ""
+
+#: lib/package.c:258 lib/rpmchecksig.c:180 lib/rpmchecksig.c:527
+#, c-format
+msgid "%s: No signature available\n"
+msgstr ""
+
+#: lib/package.c:284
+#, c-format
+msgid "%s: headerRead failed\n"
+msgstr ""
+
+#: lib/package.c:303 lib/rpmchecksig.c:109 lib/rpmchecksig.c:450
+#, c-format
+msgid "%s: Fread failed: %s\n"
+msgstr ""
+
 #: lib/poptI.c:47
 msgid "exclude paths must begin with a /"
 msgstr ""
@@ -2206,275 +2236,250 @@ msgstr ""
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1214
+#: lib/psm.c:1217
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1325
+#: lib/psm.c:1330
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1432
+#: lib/psm.c:1436
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1600
+#: lib/psm.c:1604
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1607
+#: lib/psm.c:1611
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1954
+#: lib/psm.c:1958
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2071
+#: lib/psm.c:2075
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2186
+#: lib/psm.c:2190
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2195
+#: lib/psm.c:2199
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2236
+#: lib/psm.c:2240
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2237
+#: lib/psm.c:2241
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2423
+#: lib/psm.c:2427
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2426
+#: lib/psm.c:2430
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:128
+#: lib/query.c:124
 #, c-format
 msgid "incorrect format: %s\n"
 msgstr ""
 
-#: lib/query.c:225
+#: lib/query.c:221
 msgid "(contains no files)"
 msgstr ""
 
-#: lib/query.c:286
+#: lib/query.c:282
 msgid "normal        "
 msgstr ""
 
-#: lib/query.c:289
+#: lib/query.c:285
 msgid "replaced      "
 msgstr ""
 
-#: lib/query.c:292
+#: lib/query.c:288
 msgid "not installed "
 msgstr ""
 
-#: lib/query.c:295
+#: lib/query.c:291
 msgid "net shared    "
 msgstr ""
 
-#: lib/query.c:298
+#: lib/query.c:294
 #, c-format
 msgid "(unknown %3d) "
 msgstr ""
 
-#: lib/query.c:303
+#: lib/query.c:299
 msgid "(no state)    "
 msgstr ""
 
-#: lib/query.c:322 lib/query.c:378
+#: lib/query.c:318 lib/query.c:374
 msgid "package has neither file owner or id lists\n"
 msgstr ""
 
-#: lib/query.c:467
+#: lib/query.c:463
 #, c-format
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:582 lib/rpmchecksig.c:159 lib/rpmchecksig.c:492
-#, c-format
-msgid "%s: readLead failed\n"
-msgstr ""
-
-#: lib/query.c:588 lib/rpmchecksig.c:498
-#, c-format
-msgid "%s: No signature available (v1.0 RPM)\n"
-msgstr ""
-
-#: lib/query.c:597 lib/rpmchecksig.c:177 lib/rpmchecksig.c:508
-#, c-format
-msgid "%s: rpmReadSignature failed\n"
-msgstr ""
-
-#: lib/query.c:601 lib/rpmchecksig.c:181 lib/rpmchecksig.c:513
-#, c-format
-msgid "%s: No signature available\n"
-msgstr ""
-
-#: lib/query.c:624
-#, c-format
-msgid "%s: headerRead failed\n"
-msgstr ""
-
-#: lib/query.c:641 lib/rpmchecksig.c:110 lib/rpmchecksig.c:287
-#, c-format
-msgid "%s: Fread failed: %s\n"
-msgstr ""
-
-#: lib/query.c:758 lib/query.c:796 lib/rpminstall.c:324 lib/rpminstall.c:468
-#: lib/rpminstall.c:848
+#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463
+#: lib/rpminstall.c:838
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:774
+#: lib/query.c:616
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:780
+#: lib/query.c:622
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:806 lib/rpminstall.c:481
+#: lib/query.c:648 lib/rpminstall.c:476
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr ""
 
-#: lib/query.c:850
+#: lib/query.c:692
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:874
+#: lib/query.c:716
 msgid "no packages\n"
 msgstr ""
 
-#: lib/query.c:894
+#: lib/query.c:736
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:904
+#: lib/query.c:746
 #, c-format
 msgid "no package triggers %s\n"
 msgstr ""
 
-#: lib/query.c:914
+#: lib/query.c:756
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:925
+#: lib/query.c:767
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:962
+#: lib/query.c:804
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:966
+#: lib/query.c:808
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:993
+#: lib/query.c:835
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:996
+#: lib/query.c:838
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:1001
+#: lib/query.c:843
 #, c-format
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:1012 lib/rpminstall.c:634
+#: lib/query.c:854 lib/rpminstall.c:624
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:50
+#: lib/rpmchecksig.c:49
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:62
+#: lib/rpmchecksig.c:61
 msgid "makeTempFile failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:103
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:164
+#: lib/rpmchecksig.c:163
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:168
+#: lib/rpmchecksig.c:167
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:214
+#: lib/rpmchecksig.c:213
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:220
+#: lib/rpmchecksig.c:219
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:731
+#: lib/rpmchecksig.c:512
+#, c-format
+msgid "%s: No signature available (v1.0 RPM)\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:707
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:732 lib/rpmchecksig.c:746
+#: lib/rpmchecksig.c:708 lib/rpmchecksig.c:722
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:734 lib/rpmchecksig.c:748
+#: lib/rpmchecksig.c:710 lib/rpmchecksig.c:724
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:735 lib/rpmchecksig.c:749
+#: lib/rpmchecksig.c:711 lib/rpmchecksig.c:725
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:737 lib/rpmchecksig.c:751
+#: lib/rpmchecksig.c:713 lib/rpmchecksig.c:727
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:745
+#: lib/rpmchecksig.c:721
 msgid "OK"
 msgstr ""
 
@@ -2486,86 +2491,86 @@ msgstr ""
 msgid "Preparing packages for installation..."
 msgstr ""
 
-#: lib/rpminstall.c:274
+#: lib/rpminstall.c:228
+#, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr ""
+
+#: lib/rpminstall.c:285
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:284
+#: lib/rpminstall.c:295
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:288
+#: lib/rpminstall.c:299
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:370
-#, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr ""
-
-#: lib/rpminstall.c:393
+#: lib/rpminstall.c:388
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:442
+#: lib/rpminstall.c:437
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:448
+#: lib/rpminstall.c:443
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:460 lib/rpminstall.c:705
+#: lib/rpminstall.c:455 lib/rpminstall.c:694
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:496
+#: lib/rpminstall.c:491
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:512
+#: lib/rpminstall.c:507
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:533
+#: lib/rpminstall.c:528
 msgid "installing binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:554
+#: lib/rpminstall.c:549
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:621
+#: lib/rpminstall.c:611
 #, c-format
 msgid "cannot open %s/packages.rpm\n"
 msgstr ""
 
-#: lib/rpminstall.c:637
+#: lib/rpminstall.c:627
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:661
+#: lib/rpminstall.c:651
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:691
+#: lib/rpminstall.c:680
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:697
+#: lib/rpminstall.c:686
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
@@ -2831,17 +2836,17 @@ msgstr ""
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:414
+#: lib/verify.c:417
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:511
+#: lib/verify.c:514
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
 
-#: lib/verify.c:556
+#: lib/verify.c:559
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
diff --git a/po/hu.po b/po/hu.po
index ce4f15bfb..285b4d05b 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-24 21:17-0400\n"
+"POT-Creation-Date: 2001-10-26 00:15-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"
@@ -70,15 +70,15 @@ msgstr ""
 msgid "Building for target %s\n"
 msgstr ""
 
-#: rpm2cpio.c:34
+#: rpm2cpio.c:55
 msgid "argument is not an RPM package\n"
 msgstr ""
 
-#: rpm2cpio.c:38
+#: rpm2cpio.c:61
 msgid "error reading header from package\n"
 msgstr ""
 
-#: rpm2cpio.c:60
+#: rpm2cpio.c:83
 #, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr ""
@@ -397,43 +397,43 @@ msgstr ""
 msgid "exec failed\n"
 msgstr ""
 
-#: rpmqv.c:959
+#: rpmqv.c:963
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1026
+#: rpmqv.c:1038
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1028
+#: rpmqv.c:1040
 msgid "no tar files given for build"
 msgstr ""
 
-#: rpmqv.c:1047
+#: rpmqv.c:1059
 msgid "no packages given for uninstall"
 msgstr ""
 
-#: rpmqv.c:1058
+#: rpmqv.c:1070
 msgid "no packages given for install"
 msgstr ""
 
-#: rpmqv.c:1106
+#: rpmqv.c:1118
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpmqv.c:1120
+#: rpmqv.c:1132
 msgid "no arguments given for verify"
 msgstr ""
 
-#: rpmqv.c:1128
+#: rpmqv.c:1140
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpmqv.c:1144
+#: rpmqv.c:1156
 msgid "no arguments given"
 msgstr ""
 
-#: build/build.c:125 build/pack.c:466
+#: build/build.c:125 build/pack.c:487
 msgid "Unable to open temp file.\n"
 msgstr ""
 
@@ -641,7 +641,7 @@ msgstr ""
 msgid "Could not open %%files file %s: %s\n"
 msgstr ""
 
-#: build/files.c:1777 build/pack.c:145
+#: build/files.c:1777 build/pack.c:148
 #, c-format
 msgid "line: %s\n"
 msgstr ""
@@ -716,152 +716,152 @@ msgstr ""
 msgid "Could not canonicalize hostname: %s\n"
 msgstr ""
 
-#: build/pack.c:78
+#: build/pack.c:81
 #, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr ""
 
-#: build/pack.c:81
+#: build/pack.c:84
 #, c-format
 msgid "create archive failed: %s\n"
 msgstr ""
 
-#: build/pack.c:103
+#: build/pack.c:106
 #, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr ""
 
-#: build/pack.c:110
+#: build/pack.c:113
 #, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr ""
 
-#: build/pack.c:213
+#: build/pack.c:216
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr ""
 
-#: build/pack.c:220
+#: build/pack.c:223
 #, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr ""
 
-#: build/pack.c:227
+#: build/pack.c:230
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr ""
 
-#: build/pack.c:234
+#: build/pack.c:237
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr ""
 
-#: build/pack.c:242
+#: build/pack.c:245
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr ""
 
-#: build/pack.c:257
+#: build/pack.c:260
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr ""
 
-#: build/pack.c:285
+#: build/pack.c:288
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:295
+#: build/pack.c:298
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr ""
 
-#: build/pack.c:304 build/pack.c:508
+#: build/pack.c:307 build/pack.c:529
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr ""
 
-#: build/pack.c:320
+#: build/pack.c:341
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr ""
 
-#: build/pack.c:329
+#: build/pack.c:350
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:454
+#: build/pack.c:475
 msgid "Unable to create immutable header region.\n"
 msgstr ""
 
-#: build/pack.c:472
+#: build/pack.c:493
 msgid "Unable to write temp header\n"
 msgstr ""
 
-#: build/pack.c:480
+#: build/pack.c:501
 msgid "Bad CSA data\n"
 msgstr ""
 
-#: build/pack.c:515
+#: build/pack.c:536
 msgid "Unable to write final header\n"
 msgstr ""
 
-#: build/pack.c:533
+#: build/pack.c:554
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr ""
 
-#: build/pack.c:546
+#: build/pack.c:567
 msgid "Unable to reload signature header.\n"
 msgstr ""
 
-#: build/pack.c:554
+#: build/pack.c:575
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:590 lib/psm.c:2149
+#: build/pack.c:611 lib/psm.c:2153
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
 
-#: build/pack.c:605
+#: build/pack.c:626
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr ""
 
-#: build/pack.c:615
+#: build/pack.c:636
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr ""
 
-#: build/pack.c:629
+#: build/pack.c:650
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:639
+#: build/pack.c:660
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr ""
 
-#: build/pack.c:645
+#: build/pack.c:666
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:670 lib/psm.c:2415
+#: build/pack.c:691 lib/psm.c:2419
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:737
+#: build/pack.c:758
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:754
+#: build/pack.c:775
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr ""
@@ -1428,60 +1428,60 @@ msgstr ""
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1248 lib/depends.c:1381
+#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1248 lib/depends.c:1381
+#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:1042
+#: lib/depends.c:1044
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:1153
+#: lib/depends.c:1155
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:1247
+#: lib/depends.c:1249
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1276
+#: lib/depends.c:1278
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1293
+#: lib/depends.c:1295
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:1317
+#: lib/depends.c:1319
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1330
+#: lib/depends.c:1332
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1344
+#: lib/depends.c:1346
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:1360
+#: lib/depends.c:1362
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1381
+#: lib/depends.c:1383
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
@@ -1489,42 +1489,42 @@ msgstr ""
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1454
+#: lib/depends.c:1456
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1533
+#: lib/depends.c:1535
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1786
+#: lib/depends.c:1788
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1936
+#: lib/depends.c:1938
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1996
+#: lib/depends.c:1998
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2046
+#: lib/depends.c:2048
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:2099
+#: lib/depends.c:2101
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:2129
+#: lib/depends.c:2131
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -1710,15 +1710,45 @@ msgstr ""
 msgid "error creating temporary file %s\n"
 msgstr ""
 
-#: lib/package.c:161
+#: lib/package.c:167 lib/package.c:238
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:184
+#: lib/package.c:188 lib/package.c:246
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 
+#: lib/package.c:224 lib/rpmchecksig.c:158 lib/rpmchecksig.c:506
+#, c-format
+msgid "%s: readLead failed\n"
+msgstr ""
+
+#: lib/package.c:230
+#, c-format
+msgid "%s: bad magic\n"
+msgstr ""
+
+#: lib/package.c:254 lib/rpmchecksig.c:176 lib/rpmchecksig.c:522
+#, c-format
+msgid "%s: rpmReadSignature failed\n"
+msgstr ""
+
+#: lib/package.c:258 lib/rpmchecksig.c:180 lib/rpmchecksig.c:527
+#, c-format
+msgid "%s: No signature available\n"
+msgstr ""
+
+#: lib/package.c:284
+#, c-format
+msgid "%s: headerRead failed\n"
+msgstr ""
+
+#: lib/package.c:303 lib/rpmchecksig.c:109 lib/rpmchecksig.c:450
+#, c-format
+msgid "%s: Fread failed: %s\n"
+msgstr ""
+
 #: lib/poptI.c:47
 msgid "exclude paths must begin with a /"
 msgstr ""
@@ -2211,275 +2241,250 @@ msgstr ""
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1214
+#: lib/psm.c:1217
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1325
+#: lib/psm.c:1330
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1432
+#: lib/psm.c:1436
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1600
+#: lib/psm.c:1604
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1607
+#: lib/psm.c:1611
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1954
+#: lib/psm.c:1958
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2071
+#: lib/psm.c:2075
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2186
+#: lib/psm.c:2190
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2195
+#: lib/psm.c:2199
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2236
+#: lib/psm.c:2240
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2237
+#: lib/psm.c:2241
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2423
+#: lib/psm.c:2427
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2426
+#: lib/psm.c:2430
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:128
+#: lib/query.c:124
 #, c-format
 msgid "incorrect format: %s\n"
 msgstr ""
 
-#: lib/query.c:225
+#: lib/query.c:221
 msgid "(contains no files)"
 msgstr ""
 
-#: lib/query.c:286
+#: lib/query.c:282
 msgid "normal        "
 msgstr ""
 
-#: lib/query.c:289
+#: lib/query.c:285
 msgid "replaced      "
 msgstr ""
 
-#: lib/query.c:292
+#: lib/query.c:288
 msgid "not installed "
 msgstr ""
 
-#: lib/query.c:295
+#: lib/query.c:291
 msgid "net shared    "
 msgstr ""
 
-#: lib/query.c:298
+#: lib/query.c:294
 #, c-format
 msgid "(unknown %3d) "
 msgstr ""
 
-#: lib/query.c:303
+#: lib/query.c:299
 msgid "(no state)    "
 msgstr ""
 
-#: lib/query.c:322 lib/query.c:378
+#: lib/query.c:318 lib/query.c:374
 msgid "package has neither file owner or id lists\n"
 msgstr ""
 
-#: lib/query.c:467
+#: lib/query.c:463
 #, c-format
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:582 lib/rpmchecksig.c:159 lib/rpmchecksig.c:492
-#, c-format
-msgid "%s: readLead failed\n"
-msgstr ""
-
-#: lib/query.c:588 lib/rpmchecksig.c:498
-#, c-format
-msgid "%s: No signature available (v1.0 RPM)\n"
-msgstr ""
-
-#: lib/query.c:597 lib/rpmchecksig.c:177 lib/rpmchecksig.c:508
-#, c-format
-msgid "%s: rpmReadSignature failed\n"
-msgstr ""
-
-#: lib/query.c:601 lib/rpmchecksig.c:181 lib/rpmchecksig.c:513
-#, c-format
-msgid "%s: No signature available\n"
-msgstr ""
-
-#: lib/query.c:624
-#, c-format
-msgid "%s: headerRead failed\n"
-msgstr ""
-
-#: lib/query.c:641 lib/rpmchecksig.c:110 lib/rpmchecksig.c:287
-#, c-format
-msgid "%s: Fread failed: %s\n"
-msgstr ""
-
-#: lib/query.c:758 lib/query.c:796 lib/rpminstall.c:324 lib/rpminstall.c:468
-#: lib/rpminstall.c:848
+#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463
+#: lib/rpminstall.c:838
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:774
+#: lib/query.c:616
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:780
+#: lib/query.c:622
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:806 lib/rpminstall.c:481
+#: lib/query.c:648 lib/rpminstall.c:476
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr ""
 
-#: lib/query.c:850
+#: lib/query.c:692
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:874
+#: lib/query.c:716
 msgid "no packages\n"
 msgstr ""
 
-#: lib/query.c:894
+#: lib/query.c:736
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:904
+#: lib/query.c:746
 #, c-format
 msgid "no package triggers %s\n"
 msgstr ""
 
-#: lib/query.c:914
+#: lib/query.c:756
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:925
+#: lib/query.c:767
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:962
+#: lib/query.c:804
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:966
+#: lib/query.c:808
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:993
+#: lib/query.c:835
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:996
+#: lib/query.c:838
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:1001
+#: lib/query.c:843
 #, c-format
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:1012 lib/rpminstall.c:634
+#: lib/query.c:854 lib/rpminstall.c:624
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:50
+#: lib/rpmchecksig.c:49
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:62
+#: lib/rpmchecksig.c:61
 msgid "makeTempFile failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:103
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:164
+#: lib/rpmchecksig.c:163
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:168
+#: lib/rpmchecksig.c:167
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:214
+#: lib/rpmchecksig.c:213
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:220
+#: lib/rpmchecksig.c:219
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:731
+#: lib/rpmchecksig.c:512
+#, c-format
+msgid "%s: No signature available (v1.0 RPM)\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:707
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:732 lib/rpmchecksig.c:746
+#: lib/rpmchecksig.c:708 lib/rpmchecksig.c:722
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:734 lib/rpmchecksig.c:748
+#: lib/rpmchecksig.c:710 lib/rpmchecksig.c:724
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:735 lib/rpmchecksig.c:749
+#: lib/rpmchecksig.c:711 lib/rpmchecksig.c:725
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:737 lib/rpmchecksig.c:751
+#: lib/rpmchecksig.c:713 lib/rpmchecksig.c:727
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:745
+#: lib/rpmchecksig.c:721
 msgid "OK"
 msgstr ""
 
@@ -2491,86 +2496,86 @@ msgstr ""
 msgid "Preparing packages for installation..."
 msgstr ""
 
-#: lib/rpminstall.c:274
+#: lib/rpminstall.c:228
+#, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr ""
+
+#: lib/rpminstall.c:285
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:284
+#: lib/rpminstall.c:295
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:288
+#: lib/rpminstall.c:299
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:370
-#, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr ""
-
-#: lib/rpminstall.c:393
+#: lib/rpminstall.c:388
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:442
+#: lib/rpminstall.c:437
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:448
+#: lib/rpminstall.c:443
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:460 lib/rpminstall.c:705
+#: lib/rpminstall.c:455 lib/rpminstall.c:694
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:496
+#: lib/rpminstall.c:491
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:512
+#: lib/rpminstall.c:507
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:533
+#: lib/rpminstall.c:528
 msgid "installing binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:554
+#: lib/rpminstall.c:549
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:621
+#: lib/rpminstall.c:611
 #, c-format
 msgid "cannot open %s/packages.rpm\n"
 msgstr ""
 
-#: lib/rpminstall.c:637
+#: lib/rpminstall.c:627
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:661
+#: lib/rpminstall.c:651
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:691
+#: lib/rpminstall.c:680
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:697
+#: lib/rpminstall.c:686
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
@@ -2836,17 +2841,17 @@ msgstr ""
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:414
+#: lib/verify.c:417
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:511
+#: lib/verify.c:514
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
 
-#: lib/verify.c:556
+#: lib/verify.c:559
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
diff --git a/po/id.po b/po/id.po
index ce4f15bfb..285b4d05b 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-24 21:17-0400\n"
+"POT-Creation-Date: 2001-10-26 00:15-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"
@@ -70,15 +70,15 @@ msgstr ""
 msgid "Building for target %s\n"
 msgstr ""
 
-#: rpm2cpio.c:34
+#: rpm2cpio.c:55
 msgid "argument is not an RPM package\n"
 msgstr ""
 
-#: rpm2cpio.c:38
+#: rpm2cpio.c:61
 msgid "error reading header from package\n"
 msgstr ""
 
-#: rpm2cpio.c:60
+#: rpm2cpio.c:83
 #, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr ""
@@ -397,43 +397,43 @@ msgstr ""
 msgid "exec failed\n"
 msgstr ""
 
-#: rpmqv.c:959
+#: rpmqv.c:963
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1026
+#: rpmqv.c:1038
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1028
+#: rpmqv.c:1040
 msgid "no tar files given for build"
 msgstr ""
 
-#: rpmqv.c:1047
+#: rpmqv.c:1059
 msgid "no packages given for uninstall"
 msgstr ""
 
-#: rpmqv.c:1058
+#: rpmqv.c:1070
 msgid "no packages given for install"
 msgstr ""
 
-#: rpmqv.c:1106
+#: rpmqv.c:1118
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpmqv.c:1120
+#: rpmqv.c:1132
 msgid "no arguments given for verify"
 msgstr ""
 
-#: rpmqv.c:1128
+#: rpmqv.c:1140
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpmqv.c:1144
+#: rpmqv.c:1156
 msgid "no arguments given"
 msgstr ""
 
-#: build/build.c:125 build/pack.c:466
+#: build/build.c:125 build/pack.c:487
 msgid "Unable to open temp file.\n"
 msgstr ""
 
@@ -641,7 +641,7 @@ msgstr ""
 msgid "Could not open %%files file %s: %s\n"
 msgstr ""
 
-#: build/files.c:1777 build/pack.c:145
+#: build/files.c:1777 build/pack.c:148
 #, c-format
 msgid "line: %s\n"
 msgstr ""
@@ -716,152 +716,152 @@ msgstr ""
 msgid "Could not canonicalize hostname: %s\n"
 msgstr ""
 
-#: build/pack.c:78
+#: build/pack.c:81
 #, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr ""
 
-#: build/pack.c:81
+#: build/pack.c:84
 #, c-format
 msgid "create archive failed: %s\n"
 msgstr ""
 
-#: build/pack.c:103
+#: build/pack.c:106
 #, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr ""
 
-#: build/pack.c:110
+#: build/pack.c:113
 #, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr ""
 
-#: build/pack.c:213
+#: build/pack.c:216
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr ""
 
-#: build/pack.c:220
+#: build/pack.c:223
 #, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr ""
 
-#: build/pack.c:227
+#: build/pack.c:230
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr ""
 
-#: build/pack.c:234
+#: build/pack.c:237
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr ""
 
-#: build/pack.c:242
+#: build/pack.c:245
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr ""
 
-#: build/pack.c:257
+#: build/pack.c:260
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr ""
 
-#: build/pack.c:285
+#: build/pack.c:288
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:295
+#: build/pack.c:298
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr ""
 
-#: build/pack.c:304 build/pack.c:508
+#: build/pack.c:307 build/pack.c:529
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr ""
 
-#: build/pack.c:320
+#: build/pack.c:341
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr ""
 
-#: build/pack.c:329
+#: build/pack.c:350
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:454
+#: build/pack.c:475
 msgid "Unable to create immutable header region.\n"
 msgstr ""
 
-#: build/pack.c:472
+#: build/pack.c:493
 msgid "Unable to write temp header\n"
 msgstr ""
 
-#: build/pack.c:480
+#: build/pack.c:501
 msgid "Bad CSA data\n"
 msgstr ""
 
-#: build/pack.c:515
+#: build/pack.c:536
 msgid "Unable to write final header\n"
 msgstr ""
 
-#: build/pack.c:533
+#: build/pack.c:554
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr ""
 
-#: build/pack.c:546
+#: build/pack.c:567
 msgid "Unable to reload signature header.\n"
 msgstr ""
 
-#: build/pack.c:554
+#: build/pack.c:575
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:590 lib/psm.c:2149
+#: build/pack.c:611 lib/psm.c:2153
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
 
-#: build/pack.c:605
+#: build/pack.c:626
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr ""
 
-#: build/pack.c:615
+#: build/pack.c:636
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr ""
 
-#: build/pack.c:629
+#: build/pack.c:650
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:639
+#: build/pack.c:660
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr ""
 
-#: build/pack.c:645
+#: build/pack.c:666
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:670 lib/psm.c:2415
+#: build/pack.c:691 lib/psm.c:2419
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:737
+#: build/pack.c:758
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:754
+#: build/pack.c:775
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr ""
@@ -1428,60 +1428,60 @@ msgstr ""
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1248 lib/depends.c:1381
+#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1248 lib/depends.c:1381
+#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:1042
+#: lib/depends.c:1044
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:1153
+#: lib/depends.c:1155
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:1247
+#: lib/depends.c:1249
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1276
+#: lib/depends.c:1278
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1293
+#: lib/depends.c:1295
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:1317
+#: lib/depends.c:1319
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1330
+#: lib/depends.c:1332
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1344
+#: lib/depends.c:1346
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:1360
+#: lib/depends.c:1362
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1381
+#: lib/depends.c:1383
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
@@ -1489,42 +1489,42 @@ msgstr ""
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1454
+#: lib/depends.c:1456
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1533
+#: lib/depends.c:1535
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1786
+#: lib/depends.c:1788
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1936
+#: lib/depends.c:1938
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1996
+#: lib/depends.c:1998
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2046
+#: lib/depends.c:2048
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:2099
+#: lib/depends.c:2101
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:2129
+#: lib/depends.c:2131
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -1710,15 +1710,45 @@ msgstr ""
 msgid "error creating temporary file %s\n"
 msgstr ""
 
-#: lib/package.c:161
+#: lib/package.c:167 lib/package.c:238
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:184
+#: lib/package.c:188 lib/package.c:246
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 
+#: lib/package.c:224 lib/rpmchecksig.c:158 lib/rpmchecksig.c:506
+#, c-format
+msgid "%s: readLead failed\n"
+msgstr ""
+
+#: lib/package.c:230
+#, c-format
+msgid "%s: bad magic\n"
+msgstr ""
+
+#: lib/package.c:254 lib/rpmchecksig.c:176 lib/rpmchecksig.c:522
+#, c-format
+msgid "%s: rpmReadSignature failed\n"
+msgstr ""
+
+#: lib/package.c:258 lib/rpmchecksig.c:180 lib/rpmchecksig.c:527
+#, c-format
+msgid "%s: No signature available\n"
+msgstr ""
+
+#: lib/package.c:284
+#, c-format
+msgid "%s: headerRead failed\n"
+msgstr ""
+
+#: lib/package.c:303 lib/rpmchecksig.c:109 lib/rpmchecksig.c:450
+#, c-format
+msgid "%s: Fread failed: %s\n"
+msgstr ""
+
 #: lib/poptI.c:47
 msgid "exclude paths must begin with a /"
 msgstr ""
@@ -2211,275 +2241,250 @@ msgstr ""
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1214
+#: lib/psm.c:1217
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1325
+#: lib/psm.c:1330
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1432
+#: lib/psm.c:1436
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1600
+#: lib/psm.c:1604
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1607
+#: lib/psm.c:1611
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1954
+#: lib/psm.c:1958
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2071
+#: lib/psm.c:2075
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2186
+#: lib/psm.c:2190
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2195
+#: lib/psm.c:2199
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2236
+#: lib/psm.c:2240
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2237
+#: lib/psm.c:2241
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2423
+#: lib/psm.c:2427
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2426
+#: lib/psm.c:2430
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:128
+#: lib/query.c:124
 #, c-format
 msgid "incorrect format: %s\n"
 msgstr ""
 
-#: lib/query.c:225
+#: lib/query.c:221
 msgid "(contains no files)"
 msgstr ""
 
-#: lib/query.c:286
+#: lib/query.c:282
 msgid "normal        "
 msgstr ""
 
-#: lib/query.c:289
+#: lib/query.c:285
 msgid "replaced      "
 msgstr ""
 
-#: lib/query.c:292
+#: lib/query.c:288
 msgid "not installed "
 msgstr ""
 
-#: lib/query.c:295
+#: lib/query.c:291
 msgid "net shared    "
 msgstr ""
 
-#: lib/query.c:298
+#: lib/query.c:294
 #, c-format
 msgid "(unknown %3d) "
 msgstr ""
 
-#: lib/query.c:303
+#: lib/query.c:299
 msgid "(no state)    "
 msgstr ""
 
-#: lib/query.c:322 lib/query.c:378
+#: lib/query.c:318 lib/query.c:374
 msgid "package has neither file owner or id lists\n"
 msgstr ""
 
-#: lib/query.c:467
+#: lib/query.c:463
 #, c-format
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:582 lib/rpmchecksig.c:159 lib/rpmchecksig.c:492
-#, c-format
-msgid "%s: readLead failed\n"
-msgstr ""
-
-#: lib/query.c:588 lib/rpmchecksig.c:498
-#, c-format
-msgid "%s: No signature available (v1.0 RPM)\n"
-msgstr ""
-
-#: lib/query.c:597 lib/rpmchecksig.c:177 lib/rpmchecksig.c:508
-#, c-format
-msgid "%s: rpmReadSignature failed\n"
-msgstr ""
-
-#: lib/query.c:601 lib/rpmchecksig.c:181 lib/rpmchecksig.c:513
-#, c-format
-msgid "%s: No signature available\n"
-msgstr ""
-
-#: lib/query.c:624
-#, c-format
-msgid "%s: headerRead failed\n"
-msgstr ""
-
-#: lib/query.c:641 lib/rpmchecksig.c:110 lib/rpmchecksig.c:287
-#, c-format
-msgid "%s: Fread failed: %s\n"
-msgstr ""
-
-#: lib/query.c:758 lib/query.c:796 lib/rpminstall.c:324 lib/rpminstall.c:468
-#: lib/rpminstall.c:848
+#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463
+#: lib/rpminstall.c:838
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:774
+#: lib/query.c:616
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:780
+#: lib/query.c:622
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:806 lib/rpminstall.c:481
+#: lib/query.c:648 lib/rpminstall.c:476
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr ""
 
-#: lib/query.c:850
+#: lib/query.c:692
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:874
+#: lib/query.c:716
 msgid "no packages\n"
 msgstr ""
 
-#: lib/query.c:894
+#: lib/query.c:736
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:904
+#: lib/query.c:746
 #, c-format
 msgid "no package triggers %s\n"
 msgstr ""
 
-#: lib/query.c:914
+#: lib/query.c:756
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:925
+#: lib/query.c:767
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:962
+#: lib/query.c:804
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:966
+#: lib/query.c:808
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:993
+#: lib/query.c:835
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:996
+#: lib/query.c:838
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:1001
+#: lib/query.c:843
 #, c-format
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:1012 lib/rpminstall.c:634
+#: lib/query.c:854 lib/rpminstall.c:624
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:50
+#: lib/rpmchecksig.c:49
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:62
+#: lib/rpmchecksig.c:61
 msgid "makeTempFile failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:103
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:164
+#: lib/rpmchecksig.c:163
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:168
+#: lib/rpmchecksig.c:167
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:214
+#: lib/rpmchecksig.c:213
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:220
+#: lib/rpmchecksig.c:219
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:731
+#: lib/rpmchecksig.c:512
+#, c-format
+msgid "%s: No signature available (v1.0 RPM)\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:707
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:732 lib/rpmchecksig.c:746
+#: lib/rpmchecksig.c:708 lib/rpmchecksig.c:722
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:734 lib/rpmchecksig.c:748
+#: lib/rpmchecksig.c:710 lib/rpmchecksig.c:724
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:735 lib/rpmchecksig.c:749
+#: lib/rpmchecksig.c:711 lib/rpmchecksig.c:725
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:737 lib/rpmchecksig.c:751
+#: lib/rpmchecksig.c:713 lib/rpmchecksig.c:727
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:745
+#: lib/rpmchecksig.c:721
 msgid "OK"
 msgstr ""
 
@@ -2491,86 +2496,86 @@ msgstr ""
 msgid "Preparing packages for installation..."
 msgstr ""
 
-#: lib/rpminstall.c:274
+#: lib/rpminstall.c:228
+#, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr ""
+
+#: lib/rpminstall.c:285
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:284
+#: lib/rpminstall.c:295
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:288
+#: lib/rpminstall.c:299
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:370
-#, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr ""
-
-#: lib/rpminstall.c:393
+#: lib/rpminstall.c:388
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:442
+#: lib/rpminstall.c:437
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:448
+#: lib/rpminstall.c:443
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:460 lib/rpminstall.c:705
+#: lib/rpminstall.c:455 lib/rpminstall.c:694
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:496
+#: lib/rpminstall.c:491
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:512
+#: lib/rpminstall.c:507
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:533
+#: lib/rpminstall.c:528
 msgid "installing binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:554
+#: lib/rpminstall.c:549
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:621
+#: lib/rpminstall.c:611
 #, c-format
 msgid "cannot open %s/packages.rpm\n"
 msgstr ""
 
-#: lib/rpminstall.c:637
+#: lib/rpminstall.c:627
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:661
+#: lib/rpminstall.c:651
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:691
+#: lib/rpminstall.c:680
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:697
+#: lib/rpminstall.c:686
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
@@ -2836,17 +2841,17 @@ msgstr ""
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:414
+#: lib/verify.c:417
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:511
+#: lib/verify.c:514
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
 
-#: lib/verify.c:556
+#: lib/verify.c:559
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
diff --git a/po/is.po b/po/is.po
index f2d478f14..80a9a58d2 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-24 21:17-0400\n"
+"POT-Creation-Date: 2001-10-26 00:15-0400\n"
 "PO-Revision-Date: 2001-07-12 13:25+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
@@ -65,15 +65,15 @@ msgstr "Þýði fyrir markkerfi: %s\n"
 msgid "Building for target %s\n"
 msgstr "Þýði fyrir markkerfi %s\n"
 
-#: rpm2cpio.c:34
+#: rpm2cpio.c:55
 msgid "argument is not an RPM package\n"
 msgstr ""
 
-#: rpm2cpio.c:38
+#: rpm2cpio.c:61
 msgid "error reading header from package\n"
 msgstr ""
 
-#: rpm2cpio.c:60
+#: rpm2cpio.c:83
 #, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr ""
@@ -392,43 +392,43 @@ msgstr ""
 msgid "exec failed\n"
 msgstr ""
 
-#: rpmqv.c:959
+#: rpmqv.c:963
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1026
+#: rpmqv.c:1038
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1028
+#: rpmqv.c:1040
 msgid "no tar files given for build"
 msgstr ""
 
-#: rpmqv.c:1047
+#: rpmqv.c:1059
 msgid "no packages given for uninstall"
 msgstr ""
 
-#: rpmqv.c:1058
+#: rpmqv.c:1070
 msgid "no packages given for install"
 msgstr ""
 
-#: rpmqv.c:1106
+#: rpmqv.c:1118
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpmqv.c:1120
+#: rpmqv.c:1132
 msgid "no arguments given for verify"
 msgstr ""
 
-#: rpmqv.c:1128
+#: rpmqv.c:1140
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpmqv.c:1144
+#: rpmqv.c:1156
 msgid "no arguments given"
 msgstr ""
 
-#: build/build.c:125 build/pack.c:466
+#: build/build.c:125 build/pack.c:487
 msgid "Unable to open temp file.\n"
 msgstr "Get ekki opnað tempi skrá.\n"
 
@@ -636,7 +636,7 @@ msgstr "Skráin fannst ekki með 'glob': %s\n"
 msgid "Could not open %%files file %s: %s\n"
 msgstr "Gat ekki opnað %%files skrána %s: %s\n"
 
-#: build/files.c:1777 build/pack.c:145
+#: build/files.c:1777 build/pack.c:148
 #, c-format
 msgid "line: %s\n"
 msgstr "lína: %s\n"
@@ -711,156 +711,156 @@ msgstr ""
 msgid "Could not canonicalize hostname: %s\n"
 msgstr ""
 
-#: build/pack.c:78
+#: build/pack.c:81
 #, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr "safnskráarsmíð brást á skrá %s: %s\n"
 
-#: build/pack.c:81
+#: build/pack.c:84
 #, c-format
 msgid "create archive failed: %s\n"
 msgstr "safnskráarsmíð brást: %s\n"
 
-#: build/pack.c:103
+#: build/pack.c:106
 #, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr ""
 
-#: build/pack.c:110
+#: build/pack.c:113
 #, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr ""
 
-#: build/pack.c:213
+#: build/pack.c:216
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr "Gat ekki opnað PreIn skrá: %s\n"
 
-#: build/pack.c:220
+#: build/pack.c:223
 #, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr "Gat ekki opnað PreUn skrá: %s\n"
 
-#: build/pack.c:227
+#: build/pack.c:230
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr "Gat ekki opnað PostIn skrá: %s\n"
 
-#: build/pack.c:234
+#: build/pack.c:237
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr "Gat ekki opnað PostUn skrá: %s\n"
 
-#: build/pack.c:242
+#: build/pack.c:245
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr "Get ekki opnað VerifyScript skrá: %s\n"
 
-#: build/pack.c:257
+#: build/pack.c:260
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr ""
 
-#: build/pack.c:285
+#: build/pack.c:288
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:295
+#: build/pack.c:298
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr ""
 
-#: build/pack.c:304 build/pack.c:508
+#: build/pack.c:307 build/pack.c:529
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: Fseek brást: %s\n"
 
-#: build/pack.c:320
+#: build/pack.c:341
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr ""
 
-#: build/pack.c:329
+#: build/pack.c:350
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:454
+#: build/pack.c:475
 #, fuzzy
 msgid "Unable to create immutable header region.\n"
 msgstr "Get ekki lesið haus úr %s: %s\n"
 
-#: build/pack.c:472
+#: build/pack.c:493
 #, fuzzy
 msgid "Unable to write temp header\n"
 msgstr "Gat ekki ritað haus í %s: %s\n"
 
-#: build/pack.c:480
+#: build/pack.c:501
 msgid "Bad CSA data\n"
 msgstr ""
 
-#: build/pack.c:515
+#: build/pack.c:536
 #, fuzzy
 msgid "Unable to write final header\n"
 msgstr "Gat ekki ritað haus í %s: %s\n"
 
-#: build/pack.c:533
+#: build/pack.c:554
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr ""
 
-#: build/pack.c:546
+#: build/pack.c:567
 #, fuzzy
 msgid "Unable to reload signature header.\n"
 msgstr "Get ekki lesið haus úr %s: %s\n"
 
-#: build/pack.c:554
+#: build/pack.c:575
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:590 lib/psm.c:2149
+#: build/pack.c:611 lib/psm.c:2153
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Get ekki ritað í pakka: %s\n"
 
-#: build/pack.c:605
+#: build/pack.c:626
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "Get ekki opnað sigtarget %s: %s\n"
 
-#: build/pack.c:615
+#: build/pack.c:636
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "Get ekki lesið haus úr %s: %s\n"
 
-#: build/pack.c:629
+#: build/pack.c:650
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "Gat ekki ritað haus í %s: %s\n"
 
-#: build/pack.c:639
+#: build/pack.c:660
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "Get ekki lesið innihald %s: %s\n"
 
-#: build/pack.c:645
+#: build/pack.c:666
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Get ekki ritað innihald í %s: %s\n"
 
-#: build/pack.c:670 lib/psm.c:2415
+#: build/pack.c:691 lib/psm.c:2419
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Skrifaði: %s\n"
 
-#: build/pack.c:737
+#: build/pack.c:758
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:754
+#: build/pack.c:775
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr ""
@@ -1428,60 +1428,60 @@ msgstr ""
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1248 lib/depends.c:1381
+#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1248 lib/depends.c:1381
+#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:1042
+#: lib/depends.c:1044
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:1153
+#: lib/depends.c:1155
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:1247
+#: lib/depends.c:1249
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1276
+#: lib/depends.c:1278
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1293
+#: lib/depends.c:1295
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:1317
+#: lib/depends.c:1319
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1330
+#: lib/depends.c:1332
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1344
+#: lib/depends.c:1346
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:1360
+#: lib/depends.c:1362
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1381
+#: lib/depends.c:1383
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
@@ -1489,42 +1489,42 @@ msgstr ""
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1454
+#: lib/depends.c:1456
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1533
+#: lib/depends.c:1535
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1786
+#: lib/depends.c:1788
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1936
+#: lib/depends.c:1938
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1996
+#: lib/depends.c:1998
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2046
+#: lib/depends.c:2048
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:2099
+#: lib/depends.c:2101
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:2129
+#: lib/depends.c:2131
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -1710,15 +1710,45 @@ msgstr ""
 msgid "error creating temporary file %s\n"
 msgstr ""
 
-#: lib/package.c:161
+#: lib/package.c:167 lib/package.c:238
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:184
+#: lib/package.c:188 lib/package.c:246
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 
+#: lib/package.c:224 lib/rpmchecksig.c:158 lib/rpmchecksig.c:506
+#, c-format
+msgid "%s: readLead failed\n"
+msgstr ""
+
+#: lib/package.c:230
+#, c-format
+msgid "%s: bad magic\n"
+msgstr ""
+
+#: lib/package.c:254 lib/rpmchecksig.c:176 lib/rpmchecksig.c:522
+#, c-format
+msgid "%s: rpmReadSignature failed\n"
+msgstr ""
+
+#: lib/package.c:258 lib/rpmchecksig.c:180 lib/rpmchecksig.c:527
+#, c-format
+msgid "%s: No signature available\n"
+msgstr ""
+
+#: lib/package.c:284
+#, fuzzy, c-format
+msgid "%s: headerRead failed\n"
+msgstr "%s: Fseek brást: %s\n"
+
+#: lib/package.c:303 lib/rpmchecksig.c:109 lib/rpmchecksig.c:450
+#, c-format
+msgid "%s: Fread failed: %s\n"
+msgstr ""
+
 #: lib/poptI.c:47
 msgid "exclude paths must begin with a /"
 msgstr ""
@@ -2216,275 +2246,250 @@ msgstr "gat ekki búið til %%%s %s\n"
 msgid "cannot write to %%%s %s\n"
 msgstr "get ekki ritað í %%%s %s\n"
 
-#: lib/psm.c:1214
+#: lib/psm.c:1217
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1325
+#: lib/psm.c:1330
 msgid "source package contains no .spec file\n"
 msgstr "pakkinn inniheldur enga .spec skrá\n"
 
-#: lib/psm.c:1432
+#: lib/psm.c:1436
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1600
+#: lib/psm.c:1604
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1607
+#: lib/psm.c:1611
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1954
+#: lib/psm.c:1958
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2071
+#: lib/psm.c:2075
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2186
+#: lib/psm.c:2190
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2195
+#: lib/psm.c:2199
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2236
+#: lib/psm.c:2240
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2237
+#: lib/psm.c:2241
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2423
+#: lib/psm.c:2427
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "gat ekki opnað %s: %s\n"
 
-#: lib/psm.c:2426
+#: lib/psm.c:2430
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s brást\n"
 
-#: lib/query.c:128
+#: lib/query.c:124
 #, c-format
 msgid "incorrect format: %s\n"
 msgstr ""
 
-#: lib/query.c:225
+#: lib/query.c:221
 msgid "(contains no files)"
 msgstr ""
 
-#: lib/query.c:286
+#: lib/query.c:282
 msgid "normal        "
 msgstr ""
 
-#: lib/query.c:289
+#: lib/query.c:285
 msgid "replaced      "
 msgstr ""
 
-#: lib/query.c:292
+#: lib/query.c:288
 msgid "not installed "
 msgstr ""
 
-#: lib/query.c:295
+#: lib/query.c:291
 msgid "net shared    "
 msgstr ""
 
-#: lib/query.c:298
+#: lib/query.c:294
 #, c-format
 msgid "(unknown %3d) "
 msgstr ""
 
-#: lib/query.c:303
+#: lib/query.c:299
 msgid "(no state)    "
 msgstr ""
 
-#: lib/query.c:322 lib/query.c:378
+#: lib/query.c:318 lib/query.c:374
 msgid "package has neither file owner or id lists\n"
 msgstr ""
 
-#: lib/query.c:467
+#: lib/query.c:463
 #, c-format
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:582 lib/rpmchecksig.c:159 lib/rpmchecksig.c:492
-#, c-format
-msgid "%s: readLead failed\n"
-msgstr ""
-
-#: lib/query.c:588 lib/rpmchecksig.c:498
-#, c-format
-msgid "%s: No signature available (v1.0 RPM)\n"
-msgstr ""
-
-#: lib/query.c:597 lib/rpmchecksig.c:177 lib/rpmchecksig.c:508
-#, c-format
-msgid "%s: rpmReadSignature failed\n"
-msgstr ""
-
-#: lib/query.c:601 lib/rpmchecksig.c:181 lib/rpmchecksig.c:513
-#, c-format
-msgid "%s: No signature available\n"
-msgstr ""
-
-#: lib/query.c:624
-#, fuzzy, c-format
-msgid "%s: headerRead failed\n"
-msgstr "%s: Fseek brást: %s\n"
-
-#: lib/query.c:641 lib/rpmchecksig.c:110 lib/rpmchecksig.c:287
-#, c-format
-msgid "%s: Fread failed: %s\n"
-msgstr ""
-
-#: lib/query.c:758 lib/query.c:796 lib/rpminstall.c:324 lib/rpminstall.c:468
-#: lib/rpminstall.c:848
+#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463
+#: lib/rpminstall.c:838
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:774
+#: lib/query.c:616
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:780
+#: lib/query.c:622
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:806 lib/rpminstall.c:481
+#: lib/query.c:648 lib/rpminstall.c:476
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: gat ekki lesið manifest: %s\n"
 
-#: lib/query.c:850
+#: lib/query.c:692
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:874
+#: lib/query.c:716
 msgid "no packages\n"
 msgstr ""
 
-#: lib/query.c:894
+#: lib/query.c:736
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:904
+#: lib/query.c:746
 #, c-format
 msgid "no package triggers %s\n"
 msgstr ""
 
-#: lib/query.c:914
+#: lib/query.c:756
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:925
+#: lib/query.c:767
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:962
+#: lib/query.c:804
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:966
+#: lib/query.c:808
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:993
+#: lib/query.c:835
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:996
+#: lib/query.c:838
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:1001
+#: lib/query.c:843
 #, c-format
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:1012 lib/rpminstall.c:634
+#: lib/query.c:854 lib/rpminstall.c:624
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:50
+#: lib/rpmchecksig.c:49
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:62
+#: lib/rpmchecksig.c:61
 msgid "makeTempFile failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:103
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:164
+#: lib/rpmchecksig.c:163
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:168
+#: lib/rpmchecksig.c:167
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:214
+#: lib/rpmchecksig.c:213
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:220
+#: lib/rpmchecksig.c:219
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:731
+#: lib/rpmchecksig.c:512
+#, c-format
+msgid "%s: No signature available (v1.0 RPM)\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:707
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:732 lib/rpmchecksig.c:746
+#: lib/rpmchecksig.c:708 lib/rpmchecksig.c:722
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:734 lib/rpmchecksig.c:748
+#: lib/rpmchecksig.c:710 lib/rpmchecksig.c:724
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:735 lib/rpmchecksig.c:749
+#: lib/rpmchecksig.c:711 lib/rpmchecksig.c:725
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:737 lib/rpmchecksig.c:751
+#: lib/rpmchecksig.c:713 lib/rpmchecksig.c:727
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:745
+#: lib/rpmchecksig.c:721
 msgid "OK"
 msgstr ""
 
@@ -2496,86 +2501,86 @@ msgstr ""
 msgid "Preparing packages for installation..."
 msgstr ""
 
-#: lib/rpminstall.c:274
+#: lib/rpminstall.c:228
+#, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr "get ekki opnað pakka gagnagrunn í\n"
+
+#: lib/rpminstall.c:285
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:284
+#: lib/rpminstall.c:295
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:288
+#: lib/rpminstall.c:299
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:370
-#, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr "get ekki opnað pakka gagnagrunn í\n"
-
-#: lib/rpminstall.c:393
+#: lib/rpminstall.c:388
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:442
+#: lib/rpminstall.c:437
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:448
+#: lib/rpminstall.c:443
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:460 lib/rpminstall.c:705
+#: lib/rpminstall.c:455 lib/rpminstall.c:694
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:496
+#: lib/rpminstall.c:491
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:512
+#: lib/rpminstall.c:507
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:533
+#: lib/rpminstall.c:528
 msgid "installing binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:554
+#: lib/rpminstall.c:549
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:621
+#: lib/rpminstall.c:611
 #, c-format
 msgid "cannot open %s/packages.rpm\n"
 msgstr "get ekki opnað %s/packages.rpm\n"
 
-#: lib/rpminstall.c:637
+#: lib/rpminstall.c:627
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:661
+#: lib/rpminstall.c:651
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:691
+#: lib/rpminstall.c:680
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:697
+#: lib/rpminstall.c:686
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
@@ -2841,17 +2846,17 @@ msgstr "í pakkanum eru engir notandalistar (þetta ætti aldrei að koma fyrir)\n"
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr "í pakkanum eru engir hópalistar (þetta ætti aldrei að koma fyrir)\n"
 
-#: lib/verify.c:414
+#: lib/verify.c:417
 #, c-format
 msgid "missing    %s"
 msgstr "vantar     %s"
 
-#: lib/verify.c:511
+#: lib/verify.c:514
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr "Óuppfyllt pakkaskilyrði fyrir %s-%s-%s: "
 
-#: lib/verify.c:556
+#: lib/verify.c:559
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
diff --git a/po/it.po b/po/it.po
index ce4f15bfb..285b4d05b 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-24 21:17-0400\n"
+"POT-Creation-Date: 2001-10-26 00:15-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"
@@ -70,15 +70,15 @@ msgstr ""
 msgid "Building for target %s\n"
 msgstr ""
 
-#: rpm2cpio.c:34
+#: rpm2cpio.c:55
 msgid "argument is not an RPM package\n"
 msgstr ""
 
-#: rpm2cpio.c:38
+#: rpm2cpio.c:61
 msgid "error reading header from package\n"
 msgstr ""
 
-#: rpm2cpio.c:60
+#: rpm2cpio.c:83
 #, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr ""
@@ -397,43 +397,43 @@ msgstr ""
 msgid "exec failed\n"
 msgstr ""
 
-#: rpmqv.c:959
+#: rpmqv.c:963
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1026
+#: rpmqv.c:1038
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1028
+#: rpmqv.c:1040
 msgid "no tar files given for build"
 msgstr ""
 
-#: rpmqv.c:1047
+#: rpmqv.c:1059
 msgid "no packages given for uninstall"
 msgstr ""
 
-#: rpmqv.c:1058
+#: rpmqv.c:1070
 msgid "no packages given for install"
 msgstr ""
 
-#: rpmqv.c:1106
+#: rpmqv.c:1118
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpmqv.c:1120
+#: rpmqv.c:1132
 msgid "no arguments given for verify"
 msgstr ""
 
-#: rpmqv.c:1128
+#: rpmqv.c:1140
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpmqv.c:1144
+#: rpmqv.c:1156
 msgid "no arguments given"
 msgstr ""
 
-#: build/build.c:125 build/pack.c:466
+#: build/build.c:125 build/pack.c:487
 msgid "Unable to open temp file.\n"
 msgstr ""
 
@@ -641,7 +641,7 @@ msgstr ""
 msgid "Could not open %%files file %s: %s\n"
 msgstr ""
 
-#: build/files.c:1777 build/pack.c:145
+#: build/files.c:1777 build/pack.c:148
 #, c-format
 msgid "line: %s\n"
 msgstr ""
@@ -716,152 +716,152 @@ msgstr ""
 msgid "Could not canonicalize hostname: %s\n"
 msgstr ""
 
-#: build/pack.c:78
+#: build/pack.c:81
 #, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr ""
 
-#: build/pack.c:81
+#: build/pack.c:84
 #, c-format
 msgid "create archive failed: %s\n"
 msgstr ""
 
-#: build/pack.c:103
+#: build/pack.c:106
 #, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr ""
 
-#: build/pack.c:110
+#: build/pack.c:113
 #, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr ""
 
-#: build/pack.c:213
+#: build/pack.c:216
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr ""
 
-#: build/pack.c:220
+#: build/pack.c:223
 #, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr ""
 
-#: build/pack.c:227
+#: build/pack.c:230
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr ""
 
-#: build/pack.c:234
+#: build/pack.c:237
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr ""
 
-#: build/pack.c:242
+#: build/pack.c:245
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr ""
 
-#: build/pack.c:257
+#: build/pack.c:260
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr ""
 
-#: build/pack.c:285
+#: build/pack.c:288
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:295
+#: build/pack.c:298
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr ""
 
-#: build/pack.c:304 build/pack.c:508
+#: build/pack.c:307 build/pack.c:529
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr ""
 
-#: build/pack.c:320
+#: build/pack.c:341
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr ""
 
-#: build/pack.c:329
+#: build/pack.c:350
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:454
+#: build/pack.c:475
 msgid "Unable to create immutable header region.\n"
 msgstr ""
 
-#: build/pack.c:472
+#: build/pack.c:493
 msgid "Unable to write temp header\n"
 msgstr ""
 
-#: build/pack.c:480
+#: build/pack.c:501
 msgid "Bad CSA data\n"
 msgstr ""
 
-#: build/pack.c:515
+#: build/pack.c:536
 msgid "Unable to write final header\n"
 msgstr ""
 
-#: build/pack.c:533
+#: build/pack.c:554
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr ""
 
-#: build/pack.c:546
+#: build/pack.c:567
 msgid "Unable to reload signature header.\n"
 msgstr ""
 
-#: build/pack.c:554
+#: build/pack.c:575
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:590 lib/psm.c:2149
+#: build/pack.c:611 lib/psm.c:2153
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
 
-#: build/pack.c:605
+#: build/pack.c:626
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr ""
 
-#: build/pack.c:615
+#: build/pack.c:636
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr ""
 
-#: build/pack.c:629
+#: build/pack.c:650
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:639
+#: build/pack.c:660
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr ""
 
-#: build/pack.c:645
+#: build/pack.c:666
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:670 lib/psm.c:2415
+#: build/pack.c:691 lib/psm.c:2419
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:737
+#: build/pack.c:758
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:754
+#: build/pack.c:775
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr ""
@@ -1428,60 +1428,60 @@ msgstr ""
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1248 lib/depends.c:1381
+#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1248 lib/depends.c:1381
+#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:1042
+#: lib/depends.c:1044
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:1153
+#: lib/depends.c:1155
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:1247
+#: lib/depends.c:1249
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1276
+#: lib/depends.c:1278
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1293
+#: lib/depends.c:1295
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:1317
+#: lib/depends.c:1319
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1330
+#: lib/depends.c:1332
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1344
+#: lib/depends.c:1346
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:1360
+#: lib/depends.c:1362
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1381
+#: lib/depends.c:1383
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
@@ -1489,42 +1489,42 @@ msgstr ""
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1454
+#: lib/depends.c:1456
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1533
+#: lib/depends.c:1535
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1786
+#: lib/depends.c:1788
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1936
+#: lib/depends.c:1938
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1996
+#: lib/depends.c:1998
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2046
+#: lib/depends.c:2048
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:2099
+#: lib/depends.c:2101
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:2129
+#: lib/depends.c:2131
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -1710,15 +1710,45 @@ msgstr ""
 msgid "error creating temporary file %s\n"
 msgstr ""
 
-#: lib/package.c:161
+#: lib/package.c:167 lib/package.c:238
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:184
+#: lib/package.c:188 lib/package.c:246
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 
+#: lib/package.c:224 lib/rpmchecksig.c:158 lib/rpmchecksig.c:506
+#, c-format
+msgid "%s: readLead failed\n"
+msgstr ""
+
+#: lib/package.c:230
+#, c-format
+msgid "%s: bad magic\n"
+msgstr ""
+
+#: lib/package.c:254 lib/rpmchecksig.c:176 lib/rpmchecksig.c:522
+#, c-format
+msgid "%s: rpmReadSignature failed\n"
+msgstr ""
+
+#: lib/package.c:258 lib/rpmchecksig.c:180 lib/rpmchecksig.c:527
+#, c-format
+msgid "%s: No signature available\n"
+msgstr ""
+
+#: lib/package.c:284
+#, c-format
+msgid "%s: headerRead failed\n"
+msgstr ""
+
+#: lib/package.c:303 lib/rpmchecksig.c:109 lib/rpmchecksig.c:450
+#, c-format
+msgid "%s: Fread failed: %s\n"
+msgstr ""
+
 #: lib/poptI.c:47
 msgid "exclude paths must begin with a /"
 msgstr ""
@@ -2211,275 +2241,250 @@ msgstr ""
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1214
+#: lib/psm.c:1217
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1325
+#: lib/psm.c:1330
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1432
+#: lib/psm.c:1436
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1600
+#: lib/psm.c:1604
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1607
+#: lib/psm.c:1611
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1954
+#: lib/psm.c:1958
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2071
+#: lib/psm.c:2075
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2186
+#: lib/psm.c:2190
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2195
+#: lib/psm.c:2199
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2236
+#: lib/psm.c:2240
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2237
+#: lib/psm.c:2241
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2423
+#: lib/psm.c:2427
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2426
+#: lib/psm.c:2430
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:128
+#: lib/query.c:124
 #, c-format
 msgid "incorrect format: %s\n"
 msgstr ""
 
-#: lib/query.c:225
+#: lib/query.c:221
 msgid "(contains no files)"
 msgstr ""
 
-#: lib/query.c:286
+#: lib/query.c:282
 msgid "normal        "
 msgstr ""
 
-#: lib/query.c:289
+#: lib/query.c:285
 msgid "replaced      "
 msgstr ""
 
-#: lib/query.c:292
+#: lib/query.c:288
 msgid "not installed "
 msgstr ""
 
-#: lib/query.c:295
+#: lib/query.c:291
 msgid "net shared    "
 msgstr ""
 
-#: lib/query.c:298
+#: lib/query.c:294
 #, c-format
 msgid "(unknown %3d) "
 msgstr ""
 
-#: lib/query.c:303
+#: lib/query.c:299
 msgid "(no state)    "
 msgstr ""
 
-#: lib/query.c:322 lib/query.c:378
+#: lib/query.c:318 lib/query.c:374
 msgid "package has neither file owner or id lists\n"
 msgstr ""
 
-#: lib/query.c:467
+#: lib/query.c:463
 #, c-format
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:582 lib/rpmchecksig.c:159 lib/rpmchecksig.c:492
-#, c-format
-msgid "%s: readLead failed\n"
-msgstr ""
-
-#: lib/query.c:588 lib/rpmchecksig.c:498
-#, c-format
-msgid "%s: No signature available (v1.0 RPM)\n"
-msgstr ""
-
-#: lib/query.c:597 lib/rpmchecksig.c:177 lib/rpmchecksig.c:508
-#, c-format
-msgid "%s: rpmReadSignature failed\n"
-msgstr ""
-
-#: lib/query.c:601 lib/rpmchecksig.c:181 lib/rpmchecksig.c:513
-#, c-format
-msgid "%s: No signature available\n"
-msgstr ""
-
-#: lib/query.c:624
-#, c-format
-msgid "%s: headerRead failed\n"
-msgstr ""
-
-#: lib/query.c:641 lib/rpmchecksig.c:110 lib/rpmchecksig.c:287
-#, c-format
-msgid "%s: Fread failed: %s\n"
-msgstr ""
-
-#: lib/query.c:758 lib/query.c:796 lib/rpminstall.c:324 lib/rpminstall.c:468
-#: lib/rpminstall.c:848
+#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463
+#: lib/rpminstall.c:838
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:774
+#: lib/query.c:616
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:780
+#: lib/query.c:622
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:806 lib/rpminstall.c:481
+#: lib/query.c:648 lib/rpminstall.c:476
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr ""
 
-#: lib/query.c:850
+#: lib/query.c:692
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:874
+#: lib/query.c:716
 msgid "no packages\n"
 msgstr ""
 
-#: lib/query.c:894
+#: lib/query.c:736
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:904
+#: lib/query.c:746
 #, c-format
 msgid "no package triggers %s\n"
 msgstr ""
 
-#: lib/query.c:914
+#: lib/query.c:756
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:925
+#: lib/query.c:767
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:962
+#: lib/query.c:804
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:966
+#: lib/query.c:808
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:993
+#: lib/query.c:835
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:996
+#: lib/query.c:838
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:1001
+#: lib/query.c:843
 #, c-format
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:1012 lib/rpminstall.c:634
+#: lib/query.c:854 lib/rpminstall.c:624
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:50
+#: lib/rpmchecksig.c:49
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:62
+#: lib/rpmchecksig.c:61
 msgid "makeTempFile failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:103
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:164
+#: lib/rpmchecksig.c:163
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:168
+#: lib/rpmchecksig.c:167
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:214
+#: lib/rpmchecksig.c:213
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:220
+#: lib/rpmchecksig.c:219
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:731
+#: lib/rpmchecksig.c:512
+#, c-format
+msgid "%s: No signature available (v1.0 RPM)\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:707
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:732 lib/rpmchecksig.c:746
+#: lib/rpmchecksig.c:708 lib/rpmchecksig.c:722
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:734 lib/rpmchecksig.c:748
+#: lib/rpmchecksig.c:710 lib/rpmchecksig.c:724
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:735 lib/rpmchecksig.c:749
+#: lib/rpmchecksig.c:711 lib/rpmchecksig.c:725
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:737 lib/rpmchecksig.c:751
+#: lib/rpmchecksig.c:713 lib/rpmchecksig.c:727
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:745
+#: lib/rpmchecksig.c:721
 msgid "OK"
 msgstr ""
 
@@ -2491,86 +2496,86 @@ msgstr ""
 msgid "Preparing packages for installation..."
 msgstr ""
 
-#: lib/rpminstall.c:274
+#: lib/rpminstall.c:228
+#, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr ""
+
+#: lib/rpminstall.c:285
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:284
+#: lib/rpminstall.c:295
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:288
+#: lib/rpminstall.c:299
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:370
-#, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr ""
-
-#: lib/rpminstall.c:393
+#: lib/rpminstall.c:388
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:442
+#: lib/rpminstall.c:437
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:448
+#: lib/rpminstall.c:443
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:460 lib/rpminstall.c:705
+#: lib/rpminstall.c:455 lib/rpminstall.c:694
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:496
+#: lib/rpminstall.c:491
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:512
+#: lib/rpminstall.c:507
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:533
+#: lib/rpminstall.c:528
 msgid "installing binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:554
+#: lib/rpminstall.c:549
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:621
+#: lib/rpminstall.c:611
 #, c-format
 msgid "cannot open %s/packages.rpm\n"
 msgstr ""
 
-#: lib/rpminstall.c:637
+#: lib/rpminstall.c:627
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:661
+#: lib/rpminstall.c:651
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:691
+#: lib/rpminstall.c:680
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:697
+#: lib/rpminstall.c:686
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
@@ -2836,17 +2841,17 @@ msgstr ""
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:414
+#: lib/verify.c:417
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:511
+#: lib/verify.c:514
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
 
-#: lib/verify.c:556
+#: lib/verify.c:559
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
diff --git a/po/ja.po b/po/ja.po
index e3bc6c3fa..f93ca964a 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-24 21:17-0400\n"
+"POT-Creation-Date: 2001-10-26 00:15-0400\n"
 "PO-Revision-Date: 1999-12-01 22:49 +JST\n"
 "Last-Translator: Kanda Mitsuru <kanda@nn.iij4u.or.jp>\n"
 "Language-Team: JRPM <jrpm@linux.or.jp>\n"
@@ -71,17 +71,17 @@ msgstr "ºîÀ®Ã楿¡¼¥²¥Ã¥È¥×¥é¥Ã¥È¥Õ¥©¡¼¥à: %s\n"
 msgid "Building for target %s\n"
 msgstr "¥¿¡¼¥²¥Ã¥È %s ÍѤ˺îÀ®Ãæ\n"
 
-#: rpm2cpio.c:34
+#: rpm2cpio.c:55
 #, fuzzy
 msgid "argument is not an RPM package\n"
 msgstr "°ú¿ô¤Ï RPM ¥Ñ¥Ã¥±¡¼¥¸¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n"
 
-#: rpm2cpio.c:38
+#: rpm2cpio.c:61
 #, fuzzy
 msgid "error reading header from package\n"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¤«¤é¥Ø¥Ã¥À¤ÎÆɤ߹þ¤ß¤Î¥¨¥é¡¼\n"
 
-#: rpm2cpio.c:60
+#: rpm2cpio.c:83
 #, fuzzy, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr "¥Õ¥¡¥¤¥ë %s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó"
@@ -424,44 +424,44 @@ msgstr "--sign ¤Ï¥Ñ¥Ã¥±¡¼¥¸ºîÀ®»þ¤Î¤ß»ÈÍѤǤ­¤Þ¤¹"
 msgid "exec failed\n"
 msgstr "¼Â¹Ô¼ºÇÔ\n"
 
-#: rpmqv.c:959
+#: rpmqv.c:963
 msgid "no packages files given for rebuild"
 msgstr "ºÆºîÀ®¤¹¤ë¤¿¤á¤Î¥Ñ¥Ã¥±¡¼¥¸¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: rpmqv.c:1026
+#: rpmqv.c:1038
 msgid "no spec files given for build"
 msgstr "ºîÀ®¤Î¤¿¤á¤Î spec ¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: rpmqv.c:1028
+#: rpmqv.c:1040
 msgid "no tar files given for build"
 msgstr "ºîÀ®(build)¤Î¤¿¤á¤Î tar ¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: rpmqv.c:1047
+#: rpmqv.c:1059
 msgid "no packages given for uninstall"
 msgstr "¥¢¥ó¥¤¥ó¥¹¥È¡¼¥ë¤Î¤¿¤á¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: rpmqv.c:1058
+#: rpmqv.c:1070
 msgid "no packages given for install"
 msgstr "¥¤¥ó¥¹¥È¡¼¥ë¤Î¤¿¤á¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: rpmqv.c:1106
+#: rpmqv.c:1118
 msgid "no arguments given for query"
 msgstr "Ì䤤¹ç¤ï¤»¤Î¤¿¤á¤Î°ú¿ô¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: rpmqv.c:1120
+#: rpmqv.c:1132
 msgid "no arguments given for verify"
 msgstr "¸¡¾Ú¤Î¤¿¤á¤Î°ú¿ô¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: rpmqv.c:1128
+#: rpmqv.c:1140
 msgid "unexpected arguments to --querytags "
 msgstr "--querytags ¤Î°ú¿ô¤¬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹"
 
-#: rpmqv.c:1144
+#: rpmqv.c:1156
 #, fuzzy
 msgid "no arguments given"
 msgstr "Ì䤤¹ç¤ï¤»¤Î¤¿¤á¤Î°ú¿ô¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: build/build.c:125 build/pack.c:466
+#: build/build.c:125 build/pack.c:487
 #, fuzzy
 msgid "Unable to open temp file.\n"
 msgstr "°ì»þ¥Õ¥¡¥¤¥ë¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó"
@@ -682,7 +682,7 @@ msgstr "¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó(by glob): %s"
 msgid "Could not open %%files file %s: %s\n"
 msgstr "%%files ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó: %s"
 
-#: build/files.c:1777 build/pack.c:145
+#: build/files.c:1777 build/pack.c:148
 #, fuzzy, c-format
 msgid "line: %s\n"
 msgstr "¹ÔÌÜ: %s"
@@ -757,157 +757,157 @@ msgstr ""
 msgid "Could not canonicalize hostname: %s\n"
 msgstr "¥Û¥¹¥È̾¤òÀµ¼°¤Ê¤â¤Î¤Ë¤Ç¤­¤Þ¤»¤ó: %s\n"
 
-#: build/pack.c:78
+#: build/pack.c:81
 #, fuzzy, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr "¥Õ¥¡¥¤¥ë %s ¤Ç¥¢¡¼¥«¥¤¥Ö¤ÎºîÀ®¤Ë¼ºÇÔ: %s"
 
-#: build/pack.c:81
+#: build/pack.c:84
 #, fuzzy, c-format
 msgid "create archive failed: %s\n"
 msgstr "¥Õ¥¡¥¤¥ë %s ¤Ç¥¢¡¼¥«¥¤¥Ö¤ÎºîÀ®¤Ë¼ºÇÔ: %s"
 
-#: build/pack.c:103
+#: build/pack.c:106
 #, fuzzy, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr "cpio_copy ¤Ç½ñ¤­¹þ¤ß¼ºÇÔ: %s"
 
-#: build/pack.c:110
+#: build/pack.c:113
 #, fuzzy, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr "cpio_copy ¤ÇÆɤ߹þ¤ß¼ºÇÔ: %s"
 
-#: build/pack.c:213
+#: build/pack.c:216
 #, fuzzy, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr "PreIn ¥Õ¥¡¥¤¥ë¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿: %s"
 
-#: build/pack.c:220
+#: build/pack.c:223
 #, fuzzy, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr "PreUn ¥Õ¥¡¥¤¥ë¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿: %s"
 
-#: build/pack.c:227
+#: build/pack.c:230
 #, fuzzy, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr "PostIn ¥Õ¥¡¥¤¥ë¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿: %s"
 
-#: build/pack.c:234
+#: build/pack.c:237
 #, fuzzy, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr "PostUn ¥Õ¥¡¥¤¥ë¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿: %s"
 
-#: build/pack.c:242
+#: build/pack.c:245
 #, fuzzy, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr "VerifyScript ¥Õ¥¡¥¤¥ë¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿: %s"
 
-#: build/pack.c:257
+#: build/pack.c:260
 #, fuzzy, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr "¥È¥ê¥¬¡¼¥¹¥¯¥ê¥×¥È¥Õ¥¡¥¤¥ë¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿: %s"
 
-#: build/pack.c:285
+#: build/pack.c:288
 #, fuzzy, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "readRPM: %s ¤Î¥ª¡¼¥×¥ó: %s\n"
 
-#: build/pack.c:295
+#: build/pack.c:298
 #, fuzzy, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr "readRPM: %s ¤ÎÆɤ߹þ¤ß: %s\n"
 
-#: build/pack.c:304 build/pack.c:508
+#: build/pack.c:307 build/pack.c:529
 #, fuzzy, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: Fread ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
-#: build/pack.c:320
+#: build/pack.c:341
 #, fuzzy, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr "readRPM: %s ¤Ï RPM ¥Ñ¥Ã¥±¡¼¥¸¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó\n"
 
-#: build/pack.c:329
+#: build/pack.c:350
 #, fuzzy, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: %s ¤«¤é¤Î¥Ø¥Ã¥À¤ÎÆɤ߹þ¤ß\n"
 
-#: build/pack.c:454
+#: build/pack.c:475
 #, fuzzy
 msgid "Unable to create immutable header region.\n"
 msgstr "¥¢¥¤¥³¥ó¤òÆɤळ¤È¤¬¤Ç¤­¤Þ¤»¤ó: %s"
 
-#: build/pack.c:472
+#: build/pack.c:493
 #, fuzzy
 msgid "Unable to write temp header\n"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Î½ñ¤­¹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s"
 
-#: build/pack.c:480
+#: build/pack.c:501
 #, fuzzy
 msgid "Bad CSA data\n"
 msgstr "ÉÔÀµ¤Ê CSA ¥Ç¡¼¥¿"
 
-#: build/pack.c:515
+#: build/pack.c:536
 #, fuzzy
 msgid "Unable to write final header\n"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Î½ñ¤­¹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s"
 
-#: build/pack.c:533
+#: build/pack.c:554
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "½ð̾¤ÎÀ¸À®Ãæ: %d\n"
 
-#: build/pack.c:546
+#: build/pack.c:567
 #, fuzzy
 msgid "Unable to reload signature header.\n"
 msgstr "¥¢¥¤¥³¥ó¤òÆɤळ¤È¤¬¤Ç¤­¤Þ¤»¤ó: %s"
 
-#: build/pack.c:554
+#: build/pack.c:575
 #, fuzzy, c-format
 msgid "Could not open %s: %s\n"
 msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n"
 
-#: build/pack.c:590 lib/psm.c:2149
+#: build/pack.c:611 lib/psm.c:2153
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Î½ñ¤­¹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s"
 
-#: build/pack.c:605
+#: build/pack.c:626
 #, fuzzy, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "sigtarget ¤ÎÆɤ߹þ¤ß¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿: %s"
 
-#: build/pack.c:615
+#: build/pack.c:636
 #, fuzzy, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "¥¢¥¤¥³¥ó¤òÆɤळ¤È¤¬¤Ç¤­¤Þ¤»¤ó: %s"
 
-#: build/pack.c:629
+#: build/pack.c:650
 #, fuzzy, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Î½ñ¤­¹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s"
 
-#: build/pack.c:639
+#: build/pack.c:660
 #, fuzzy, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "¥¢¥¤¥³¥ó¤òÆɤळ¤È¤¬¤Ç¤­¤Þ¤»¤ó: %s"
 
-#: build/pack.c:645
+#: build/pack.c:666
 #, fuzzy, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Î½ñ¤­¹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s"
 
-#: build/pack.c:670 lib/psm.c:2415
+#: build/pack.c:691 lib/psm.c:2419
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "½ñ¤­¹þ¤ßÃæ: %s\n"
 
-#: build/pack.c:737
+#: build/pack.c:758
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Î ½ÐÎÏ¥Õ¥¡¥¤¥ë̾¤òÀ¸À®¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿: %s\n"
 
-#: build/pack.c:754
+#: build/pack.c:775
 #, fuzzy, c-format
 msgid "cannot create %s: %s\n"
 msgstr "%s ¤òºîÀ®¤Ç¤­¤Þ¤»¤ó: %s\n"
@@ -1503,60 +1503,60 @@ msgstr ""
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1248 lib/depends.c:1381
+#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1248 lib/depends.c:1381
+#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:1042
+#: lib/depends.c:1044
 #, fuzzy, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr "%s: %s ¤Ï¥Õ¥¡¥¤¥ë¥ê¥¹¥È¤Ë²Ã¤¨¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n"
 
-#: lib/depends.c:1153
+#: lib/depends.c:1155
 #, fuzzy, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr "%s: %s ¤Ï provide ¤Ë²Ã¤¨¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n"
 
-#: lib/depends.c:1247
+#: lib/depends.c:1249
 #, fuzzy, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr "%s: %s ¤Ï db ¥Ñ¥Ã¥±¡¼¥¸¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£\n"
 
-#: lib/depends.c:1276
+#: lib/depends.c:1278
 #, fuzzy, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr "%s: %s ¤Ï rpmrc ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n"
 
-#: lib/depends.c:1293
+#: lib/depends.c:1295
 #, fuzzy, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "%s: %s ¤Ï rpmrc ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n"
 
-#: lib/depends.c:1317
+#: lib/depends.c:1319
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1330
+#: lib/depends.c:1332
 #, fuzzy, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr "%s: %s ¤Ï db ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n"
 
-#: lib/depends.c:1344
+#: lib/depends.c:1346
 #, fuzzy, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr "%s: %s ¤Ï db ¥Ñ¥Ã¥±¡¼¥¸¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£\n"
 
-#: lib/depends.c:1360
+#: lib/depends.c:1362
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1381
+#: lib/depends.c:1383
 #, fuzzy, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: %s ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Ë²Ã¤¨¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n"
@@ -1564,42 +1564,42 @@ msgstr "%s: %s ¤Ï¥Ñ¥Ã¥±¡¼¥¸¤Ë²Ã¤¨¤ë¤³¤È¤Ë¤è¤Ã¤ÆËþ¤µ¤ì¤Þ¤¹¡£\n"
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1454
+#: lib/depends.c:1456
 #, fuzzy, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï require ¤¬Ëþ¤¿¤µ¤ì¤Æ¤¤¤Þ¤»¤ó: %s\n"
 
 #. conflicts exist.
-#: lib/depends.c:1533
+#: lib/depends.c:1535
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "%s ¤È¶¥¹ç¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Þ¤¹: %s\n"
 
-#: lib/depends.c:1786
+#: lib/depends.c:1788
 #, fuzzy, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr "group ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Þ¤¹\n"
 
 #. Record all relations.
-#: lib/depends.c:1936
+#: lib/depends.c:1938
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1996
+#: lib/depends.c:1998
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2046
+#: lib/depends.c:2048
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:2099
+#: lib/depends.c:2101
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:2129
+#: lib/depends.c:2131
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -1788,19 +1788,49 @@ msgstr "(ÉÔÌÀ¤Ê¥¿¥¤¥×)"
 msgid "error creating temporary file %s\n"
 msgstr "°ì»þ¥Õ¥¡¥¤¥ë %s ¤ÎºîÀ®¥¨¥é¡¼"
 
-#: lib/package.c:161
+#: lib/package.c:167 lib/package.c:238
 #, fuzzy
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr ""
 "¥á¥¸¥ã¡¼ÈÖ¹æ <=3 ¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î¤ß¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤Î RPM ¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤¹"
 
-#: lib/package.c:184
+#: lib/package.c:188 lib/package.c:246
 #, fuzzy
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 "¥á¥¸¥ã¡¼ÈÖ¹æ <=3 ¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î¤ß¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤Î RPM ¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤¹"
 
+#: lib/package.c:224 lib/rpmchecksig.c:158 lib/rpmchecksig.c:506
+#, c-format
+msgid "%s: readLead failed\n"
+msgstr "%s: readLead ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n"
+
+#: lib/package.c:230
+#, fuzzy, c-format
+msgid "%s: bad magic\n"
+msgstr "ÉÔÀµ¤Ê¥Þ¥¸¥Ã¥¯"
+
+#: lib/package.c:254 lib/rpmchecksig.c:176 lib/rpmchecksig.c:522
+#, c-format
+msgid "%s: rpmReadSignature failed\n"
+msgstr "%s: rpmReadSignature ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n"
+
+#: lib/package.c:258 lib/rpmchecksig.c:180 lib/rpmchecksig.c:527
+#, c-format
+msgid "%s: No signature available\n"
+msgstr "%s: Í­¸ú¤Ê½ð̾¤Ï¤¢¤ê¤Þ¤»¤ó\n"
+
+#: lib/package.c:284
+#, fuzzy, c-format
+msgid "%s: headerRead failed\n"
+msgstr "%s: readLead ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n"
+
+#: lib/package.c:303 lib/rpmchecksig.c:109 lib/rpmchecksig.c:450
+#, fuzzy, c-format
+msgid "%s: Fread failed: %s\n"
+msgstr "%s: Fread ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
+
 #: lib/poptI.c:47
 #, fuzzy
 msgid "exclude paths must begin with a /"
@@ -2364,282 +2394,257 @@ msgstr "%s ¤òºîÀ®¤Ç¤­¤Þ¤»¤ó: %s\n"
 msgid "cannot write to %%%s %s\n"
 msgstr "%s ¤Ø½ñ¤­¹þ¤á¤Þ¤»¤ó"
 
-#: lib/psm.c:1214
+#: lib/psm.c:1217
 #, fuzzy
 msgid "source package expected, binary found\n"
 msgstr "¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤¬´üÂÔ¤µ¤ì¤Þ¤¹¡¢¥Ð¥¤¥Ê¥ê¤Ï¸«¤Ä¤«¤ê¤Þ¤·¤¿"
 
-#: lib/psm.c:1325
+#: lib/psm.c:1330
 #, fuzzy
 msgid "source package contains no .spec file\n"
 msgstr "¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤Ï .spec ¥Õ¥¡¥¤¥ë¤ò´Þ¤ó¤Ç¤¤¤Þ¤»¤ó"
 
-#: lib/psm.c:1432
+#: lib/psm.c:1436
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "¥Ý¥¹¥È¥¤¥ó¥¹¥È¡¼¥ë¥¹¥¯¥ê¥×¥È(¤¬Í­¤ì¤Ð)¤ò¼Â¹Ô¤·¤Þ¤¹\n"
 
-#: lib/psm.c:1600
+#: lib/psm.c:1604
 #, fuzzy, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr "¥¹¥¯¥ê¥×¥È¤Î¼Â¹Ô¤Ë¼ºÇÔ"
 
-#: lib/psm.c:1607
+#: lib/psm.c:1611
 #, fuzzy, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr "¥¹¥¯¥ê¥×¥È¤Î¼Â¹Ô¤Ë¼ºÇÔ"
 
-#: lib/psm.c:1954
+#: lib/psm.c:1958
 #, fuzzy, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸: %s-%s-%s ¥Õ¥¡¥¤¥ë¥Æ¥¹¥È = %d\n"
 
-#: lib/psm.c:2071
+#: lib/psm.c:2075
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2186
+#: lib/psm.c:2190
 #, fuzzy, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "¥æ¡¼¥¶ %s ¤Ï¸ºß¤·¤Þ¤»¤ó - root ¤ò»ÈÍѤ·¤Þ¤¹"
 
-#: lib/psm.c:2195
+#: lib/psm.c:2199
 #, fuzzy, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "¥°¥ë¡¼¥× %s ¤Ï¸ºß¤·¤Þ¤»¤ó - root ¤ò»ÈÍѤ·¤Þ¤¹"
 
-#: lib/psm.c:2236
+#: lib/psm.c:2240
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "¥Õ¥¡¥¤¥ë %s ¤Î¥¢¡¼¥«¥¤¥Ö¤Î¿­Ä¹¤Ë¼ºÇÔ %s%s: %s"
 
-#: lib/psm.c:2237
+#: lib/psm.c:2241
 #, fuzzy
 msgid " on file "
 msgstr "¥Õ¥¡¥¤¥ë¾å"
 
-#: lib/psm.c:2423
+#: lib/psm.c:2427
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s"
 
-#: lib/psm.c:2426
+#: lib/psm.c:2430
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s ¼ºÇÔ"
 
-#: lib/query.c:128
+#: lib/query.c:124
 #, fuzzy, c-format
 msgid "incorrect format: %s\n"
 msgstr "¥Õ¥©¡¼¥Þ¥Ã¥ÈÃæ¤Î¥¨¥é¡¼: %s\n"
 
-#: lib/query.c:225
+#: lib/query.c:221
 msgid "(contains no files)"
 msgstr "¥Õ¥¡¥¤¥ë¤ò´Þ¤ó¤Ç¤¤¤Þ¤»¤ó"
 
-#: lib/query.c:286
+#: lib/query.c:282
 msgid "normal        "
 msgstr "Ä̾ï"
 
-#: lib/query.c:289
+#: lib/query.c:285
 msgid "replaced      "
 msgstr "ÃÖ¤­´¹¤¨¤é¤ì¤Æ¤¤¤Þ¤¹"
 
-#: lib/query.c:292
+#: lib/query.c:288
 msgid "not installed "
 msgstr "¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
 
-#: lib/query.c:295
+#: lib/query.c:291
 msgid "net shared    "
 msgstr "¥Í¥Ã¥È¶¦Í­"
 
-#: lib/query.c:298
+#: lib/query.c:294
 #, c-format
 msgid "(unknown %3d) "
 msgstr "(̤ÃΤΠ%3d)"
 
-#: lib/query.c:303
+#: lib/query.c:299
 msgid "(no state)    "
 msgstr "(²¿¤Î¾õÂ֤⤢¤ê¤Þ¤»¤ó)"
 
-#: lib/query.c:322 lib/query.c:378
+#: lib/query.c:318 lib/query.c:374
 #, fuzzy
 msgid "package has neither file owner or id lists\n"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Ï¥Õ¥¡¥¤¥ë½êÍ­¼Ô¤ä id ¥ê¥¹¥È¤ò¤É¤Á¤é¤â»ý¤Ã¤Æ¤¤¤Þ¤»¤ó"
 
-#: lib/query.c:467
+#: lib/query.c:463
 #, fuzzy, c-format
 msgid "can't query %s: %s\n"
 msgstr "%s ¤òºï½ü(unlink)¤Ç¤­¤Þ¤»¤ó: %s\n"
 
-#: lib/query.c:582 lib/rpmchecksig.c:159 lib/rpmchecksig.c:492
-#, c-format
-msgid "%s: readLead failed\n"
-msgstr "%s: readLead ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n"
-
-#: lib/query.c:588 lib/rpmchecksig.c:498
-#, c-format
-msgid "%s: No signature available (v1.0 RPM)\n"
-msgstr "%s: Í­¸ú¤Ê½ð̾¤Ï¤¢¤ê¤Þ¤»¤ó(v1.0 RPM)\n"
-
-#: lib/query.c:597 lib/rpmchecksig.c:177 lib/rpmchecksig.c:508
-#, c-format
-msgid "%s: rpmReadSignature failed\n"
-msgstr "%s: rpmReadSignature ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n"
-
-#: lib/query.c:601 lib/rpmchecksig.c:181 lib/rpmchecksig.c:513
-#, c-format
-msgid "%s: No signature available\n"
-msgstr "%s: Í­¸ú¤Ê½ð̾¤Ï¤¢¤ê¤Þ¤»¤ó\n"
-
-#: lib/query.c:624
-#, fuzzy, c-format
-msgid "%s: headerRead failed\n"
-msgstr "%s: readLead ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n"
-
-#: lib/query.c:641 lib/rpmchecksig.c:110 lib/rpmchecksig.c:287
-#, fuzzy, c-format
-msgid "%s: Fread failed: %s\n"
-msgstr "%s: Fread ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
-
-#: lib/query.c:758 lib/query.c:796 lib/rpminstall.c:324 lib/rpminstall.c:468
-#: lib/rpminstall.c:848
+#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463
+#: lib/rpminstall.c:838
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s\n"
 
-#: lib/query.c:774
+#: lib/query.c:616
 #, c-format
 msgid "query of %s failed\n"
 msgstr "%s ¤Ø¤ÎÌ䤤¹ç¤ï¤»¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n"
 
-#: lib/query.c:780
+#: lib/query.c:622
 msgid "old format source packages cannot be queried\n"
 msgstr "µì·Á¼°¤Î¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤òÌ䤤¹ç¤ï¤»¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó\n"
 
-#: lib/query.c:806 lib/rpminstall.c:481
+#: lib/query.c:648 lib/rpminstall.c:476
 #, fuzzy, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: Fread ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
-#: lib/query.c:850
+#: lib/query.c:692
 #, fuzzy, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "¥¹¥Ú¥Ã¥¯¥Õ¥¡¥¤¥ë %s ¤Ø¤ÎÌ䤤¹ç¤ï¤»¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡¢¥Ñ¡¼¥¹¤Ç¤­¤Þ¤»¤ó\n"
 
-#: lib/query.c:874
+#: lib/query.c:716
 #, fuzzy
 msgid "no packages\n"
 msgstr "%d ¸Ä¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¸«¤Ä¤±¤Þ¤·¤¿\n"
 
-#: lib/query.c:894
+#: lib/query.c:736
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "¥°¥ë¡¼¥× %s ¤Ë°¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ï¸ºß¤·¤Þ¤»¤ó\n"
 
-#: lib/query.c:904
+#: lib/query.c:746
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "%s ¤ò¥È¥ê¥¬¡¼¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ï¸ºß¤·¤Þ¤»¤ó\n"
 
-#: lib/query.c:914
+#: lib/query.c:756
 #, c-format
 msgid "no package requires %s\n"
 msgstr "%s ¤òɬÍפȤ¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ï¸ºß¤·¤Þ¤»¤ó\n"
 
-#: lib/query.c:925
+#: lib/query.c:767
 #, c-format
 msgid "no package provides %s\n"
 msgstr "%s ¤òÄ󶡤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ï¸ºß¤·¤Þ¤»¤ó\n"
 
-#: lib/query.c:962
+#: lib/query.c:804
 #, c-format
 msgid "file %s: %s\n"
 msgstr "¥Õ¥¡¥¤¥ë %s: %s\n"
 
-#: lib/query.c:966
+#: lib/query.c:808
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "¥Õ¥¡¥¤¥ë %s ¤Ï¤É¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ë¤â°¤·¤Æ¤¤¤Þ¤»¤ó\n"
 
-#: lib/query.c:993
+#: lib/query.c:835
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "̵¸ú¤Ê¥Ñ¥Ã¥±¡¼¥¸ÈÖ¹æ: %s\n"
 
-#: lib/query.c:996
+#: lib/query.c:838
 #, fuzzy, c-format
 msgid "package record number: %u\n"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¥ì¥³¡¼¥ÉÈÖ¹æ %d\n"
 
-#: lib/query.c:1001
+#: lib/query.c:843
 #, fuzzy, c-format
 msgid "record %u could not be read\n"
 msgstr "¥ì¥³¡¼¥É %d ¤òÆɤळ¤È¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿\n"
 
-#: lib/query.c:1012 lib/rpminstall.c:634
+#: lib/query.c:854 lib/rpminstall.c:624
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n"
 
-#: lib/rpmchecksig.c:50
+#: lib/rpmchecksig.c:49
 #, fuzzy, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s: fdOpen ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
-#: lib/rpmchecksig.c:62
+#: lib/rpmchecksig.c:61
 #, fuzzy
 msgid "makeTempFile failed\n"
 msgstr "makeTempFile ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n"
 
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:103
 #, fuzzy, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: Fwrite ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
-#: lib/rpmchecksig.c:164
+#: lib/rpmchecksig.c:163
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr "%s: v1.0 ¤Î RPM ¤Ë¤Ï½ð̾¤Ç¤­¤Þ¤»¤ó\n"
 
-#: lib/rpmchecksig.c:168
+#: lib/rpmchecksig.c:167
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr "%s: v2.0 ¤Î RPM ¤Ë¤ÏºÆ½ð̾¤Ç¤­¤Þ¤»¤ó\n"
 
-#: lib/rpmchecksig.c:214
+#: lib/rpmchecksig.c:213
 #, fuzzy, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: writedLead ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
-#: lib/rpmchecksig.c:220
+#: lib/rpmchecksig.c:219
 #, fuzzy, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmWriteSignature ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n"
 
-#: lib/rpmchecksig.c:731
+#: lib/rpmchecksig.c:512
+#, c-format
+msgid "%s: No signature available (v1.0 RPM)\n"
+msgstr "%s: Í­¸ú¤Ê½ð̾¤Ï¤¢¤ê¤Þ¤»¤ó(v1.0 RPM)\n"
+
+#: lib/rpmchecksig.c:707
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:732 lib/rpmchecksig.c:746
+#: lib/rpmchecksig.c:708 lib/rpmchecksig.c:722
 #, fuzzy
 msgid " (MISSING KEYS:"
 msgstr " (¥­¡¼¤Îʶ¼º) "
 
-#: lib/rpmchecksig.c:734 lib/rpmchecksig.c:748
+#: lib/rpmchecksig.c:710 lib/rpmchecksig.c:724
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:735 lib/rpmchecksig.c:749
+#: lib/rpmchecksig.c:711 lib/rpmchecksig.c:725
 msgid " (UNTRUSTED KEYS:"
 msgstr " (¿®Íê¤Ç¤­¤Ê¤¤¸°:"
 
-#: lib/rpmchecksig.c:737 lib/rpmchecksig.c:751
+#: lib/rpmchecksig.c:713 lib/rpmchecksig.c:727
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:745
+#: lib/rpmchecksig.c:721
 msgid "OK"
 msgstr ""
 
@@ -2652,86 +2657,86 @@ msgstr ""
 msgid "Preparing packages for installation..."
 msgstr "¥¤¥ó¥¹¥È¡¼¥ë¤Î¤¿¤á¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: lib/rpminstall.c:274
+#: lib/rpminstall.c:228
+#, fuzzy, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr "%s/packages.rpm ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó\n"
+
+#: lib/rpminstall.c:285
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "%s ¤ò¼èÆÀ¤·¤Æ¤¤¤Þ¤¹\n"
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:284
+#: lib/rpminstall.c:295
 #, c-format
 msgid " ... as %s\n"
 msgstr "%s ¤È¤·¤Æ...\n"
 
-#: lib/rpminstall.c:288
+#: lib/rpminstall.c:299
 #, fuzzy, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "%s ¤ò¥¹¥­¥Ã¥×¤·¤Þ¤¹ - žÁ÷¼ºÇÔ - %s\n"
 
-#: lib/rpminstall.c:370
-#, fuzzy, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr "%s/packages.rpm ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó\n"
-
-#: lib/rpminstall.c:393
+#: lib/rpminstall.c:388
 #, fuzzy, c-format
 msgid "package %s is not relocateable\n"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤ÏºÆÇÛÃ֤Ǥ­¤Þ¤»¤ó"
 
-#: lib/rpminstall.c:442
+#: lib/rpminstall.c:437
 #, fuzzy, c-format
 msgid "error reading from file %s\n"
 msgstr "¥Õ¥¡¥¤¥ë %s ¤«¤é¤ÎÆɤ߹þ¤ß¥¨¥é¡¼ "
 
-#: lib/rpminstall.c:448
+#: lib/rpminstall.c:443
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr "¥Õ¥¡¥¤¥ë %s ¤Ë¤Ï¤è¤ê¿·¤·¤¤ RPM ¤Î¥Ð¡¼¥¸¥ç¥ó¤¬É¬ÍפǤ¹\n"
 
-#: lib/rpminstall.c:460 lib/rpminstall.c:705
+#: lib/rpminstall.c:455 lib/rpminstall.c:694
 #, fuzzy, c-format
 msgid "%s cannot be installed\n"
 msgstr "%s ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Þ¤»¤ó\n"
 
-#: lib/rpminstall.c:496
+#: lib/rpminstall.c:491
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "%d ¸Ä¤Î¥½¡¼¥¹¤È %d ¸Ä¤Î¥Ð¥¤¥Ê¥ê¥Ñ¥Ã¥±¡¼¥¸¤¬¸«¤Ä¤«¤ê¤Þ¤·¤¿\n"
 
-#: lib/rpminstall.c:512
+#: lib/rpminstall.c:507
 msgid "failed dependencies:\n"
 msgstr "°Í¸À­¤Î·çÇ¡:\n"
 
-#: lib/rpminstall.c:533
+#: lib/rpminstall.c:528
 msgid "installing binary packages\n"
 msgstr "¥Ð¥¤¥Ê¥ê¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¹¥È¡¼¥ëÃæ\n"
 
-#: lib/rpminstall.c:554
+#: lib/rpminstall.c:549
 #, fuzzy, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "¥Õ¥¡¥¤¥ë %s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó: %s"
 
-#: lib/rpminstall.c:621
+#: lib/rpminstall.c:611
 #, fuzzy, c-format
 msgid "cannot open %s/packages.rpm\n"
 msgstr "%s/packages.rpm ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó\n"
 
-#: lib/rpminstall.c:637
+#: lib/rpminstall.c:627
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" ¤ÏÊ£¿ô¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò»ØÄꤷ¤Æ¤¤¤Þ¤¹\n"
 
-#: lib/rpminstall.c:661
+#: lib/rpminstall.c:651
 msgid "removing these packages would break dependencies:\n"
 msgstr "¤³¤ì¤é¤Î¥Ñ¥Ã¥±¡¼¥¸¤òºï½ü¤¹¤ë¤È°Í¸À­¤òÇ˲õ¤·¤Þ¤¹:\n"
 
-#: lib/rpminstall.c:691
+#: lib/rpminstall.c:680
 #, fuzzy, c-format
 msgid "cannot open %s: %s\n"
 msgstr "%s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó\n"
 
-#: lib/rpminstall.c:697
+#: lib/rpminstall.c:686
 #, c-format
 msgid "Installing %s\n"
 msgstr "%s ¤ò¥¤¥ó¥¹¥È¡¼¥ëÃæ\n"
@@ -3017,17 +3022,17 @@ msgstr ""
 "¥Ñ¥Ã¥±¡¼¥¸¤Ï¥°¥ë¡¼¥×̾¤È id ¥ê¥¹¥È¤ÎξÊý¤¬·ç¤±¤Æ¤¤¤Þ¤¹(¤³¤ì¤Ï·è¤·¤Æµ¯¤­¤Æ¤Ï¤Ê"
 "¤é¤Ê¤¤)"
 
-#: lib/verify.c:414
+#: lib/verify.c:417
 #, fuzzy, c-format
 msgid "missing    %s"
 msgstr "%s ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó\n"
 
-#: lib/verify.c:511
+#: lib/verify.c:514
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr "%s-%s-%s ¤Î¤¿¤á¤Î°Í¸À­¤òËþ¤¿¤·¤Æ¤¤¤Þ¤»¤ó:"
 
-#: lib/verify.c:556
+#: lib/verify.c:559
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
diff --git a/po/ko.po b/po/ko.po
index c9c498832..9bafa2462 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-24 21:17-0400\n"
+"POT-Creation-Date: 2001-10-26 00:15-0400\n"
 "PO-Revision-Date: 2001-09-07 22:03+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
@@ -65,15 +65,15 @@ msgstr "¸ñÇ¥´ë»ó(target) Ç÷§ÆûÀ¸·Î Á¦ÀÛ Áß: %s\n"
 msgid "Building for target %s\n"
 msgstr "%s (À»)¸¦ Á¦ÀÛÇÏ°í ÀÖ½À´Ï´Ù\n"
 
-#: rpm2cpio.c:34
+#: rpm2cpio.c:55
 msgid "argument is not an RPM package\n"
 msgstr "Àμö·Î RPM ÆÐÅ°Áö°¡ ÁöÁ¤µÇ¾î¾ß ÇÕ´Ï´Ù\n"
 
-#: rpm2cpio.c:38
+#: rpm2cpio.c:61
 msgid "error reading header from package\n"
 msgstr "ÆÐÅ°ÁöÀÇ Çì´õ¸¦ Àд µµÁß ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù\n"
 
-#: rpm2cpio.c:60
+#: rpm2cpio.c:83
 #, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr "payload¸¦ ´Ù½Ã ¿­ ¼ö ¾øÀ½: %s\n"
@@ -399,44 +399,44 @@ msgstr "--sign ¿É¼ÇÀº ÆÐÅ°Áö Á¦À۽ÿ¡¸¸ »ç¿ëÇÏ½Ç ¼ö ÀÖ½À´Ï´Ù"
 msgid "exec failed\n"
 msgstr "½ÇÇà¿¡ ½ÇÆÐÇß½À´Ï´Ù\n"
 
-#: rpmqv.c:959
+#: rpmqv.c:963
 msgid "no packages files given for rebuild"
 msgstr "ÀçÁ¦ÀÛ(rebuild)ÇÒ ÆÐÅ°Áö ÆÄÀÏÀ» ÁöÁ¤ÇÏÁö ¾ÊÀ¸¼Ì½À´Ï´Ù"
 
-#: rpmqv.c:1026
+#: rpmqv.c:1038
 msgid "no spec files given for build"
 msgstr "ÆÐÅ°Áö Á¦ÀÛ¿¡ ÇÊ¿äÇÑ spec ÆÄÀÏÀ» ÁöÁ¤ÇÏÁö ¾ÊÀ¸¼Ì½À´Ï´Ù"
 
-#: rpmqv.c:1028
+#: rpmqv.c:1040
 msgid "no tar files given for build"
 msgstr "ÆÐÅ°Áö Á¦ÀÛ¿¡ ÇÊ¿äÇÑ tar ÆÄÀÏÀ» ÁöÁ¤ÇÏÁö ¾ÊÀ¸¼Ì½À´Ï´Ù"
 
-#: rpmqv.c:1047
+#: rpmqv.c:1059
 msgid "no packages given for uninstall"
 msgstr "Á¦°Å(uninstall)ÇÒ ÆÐÅ°Áö¸¦ ÁöÁ¤ÇÏÁö ¾ÊÀ¸¼Ì½À´Ï´Ù"
 
-#: rpmqv.c:1058
+#: rpmqv.c:1070
 msgid "no packages given for install"
 msgstr "¼³Ä¡ÇÒ ÆÐÅ°Áö¸¦ ÁöÁ¤ÇÏÁö ¾ÊÀ¸¼Ì½À´Ï´Ù"
 
-#: rpmqv.c:1106
+#: rpmqv.c:1118
 msgid "no arguments given for query"
 msgstr "ÁúÀÇ¿¡ ÇÊ¿äÇÑ Àμö°¡ ÁöÁ¤µÇÁö ¾Ê¾Ò½À´Ï´Ù"
 
-#: rpmqv.c:1120
+#: rpmqv.c:1132
 msgid "no arguments given for verify"
 msgstr "°ËÁõ¿¡ ÇÊ¿äÇÑ Àμö°¡ ÁöÁ¤µÇÁö ¾Ê¾Ò½À´Ï´Ù"
 
-#: rpmqv.c:1128
+#: rpmqv.c:1140
 msgid "unexpected arguments to --querytags "
 msgstr "--querytags ¿É¼Ç¿¡ ºÎÀûÀýÇÑ Àμö°¡ ÁöÁ¤µÇ¾ú½À´Ï´Ù "
 
-#: rpmqv.c:1144
+#: rpmqv.c:1156
 #, fuzzy
 msgid "no arguments given"
 msgstr "ÁúÀÇ¿¡ ÇÊ¿äÇÑ Àμö°¡ ÁöÁ¤µÇÁö ¾Ê¾Ò½À´Ï´Ù"
 
-#: build/build.c:125 build/pack.c:466
+#: build/build.c:125 build/pack.c:487
 msgid "Unable to open temp file.\n"
 msgstr "Àӽà ÆÄÀÏÀ» ¿­ ¼ö ¾ø½À´Ï´Ù.\n"
 
@@ -647,7 +647,7 @@ msgstr "globÀ¸·Î ÆÄÀÏÀ» ãÀ» ¼ö ¾øÀ½: %s\n"
 msgid "Could not open %%files file %s: %s\n"
 msgstr "%s ÆÄÀÏÀÇ %%files¸¦ ¿­ ¼ö ¾øÀ½: %s\n"
 
-#: build/files.c:1777 build/pack.c:145
+#: build/files.c:1777 build/pack.c:148
 #, c-format
 msgid "line: %s\n"
 msgstr "ÁÙ(line): %s\n"
@@ -722,152 +722,152 @@ msgstr "±×·ì id ¼³Á¤[getGidS]: gid°¡ ³Ê¹« ¸¹½À´Ï´Ù\n"
 msgid "Could not canonicalize hostname: %s\n"
 msgstr "È£½ºÆ® ¸íÀ» Á¤±ÔÈ­(canonicalize) ÇÒ ¼ö ¾øÀ½: %s\n"
 
-#: build/pack.c:78
+#: build/pack.c:81
 #, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr "%s ÆÄÀÏ¿¡ ¾ÆÄ«À̺긦 »ý¼ºÇϴµ¥ ½ÇÆÐÇÔ: %s\n"
 
-#: build/pack.c:81
+#: build/pack.c:84
 #, c-format
 msgid "create archive failed: %s\n"
 msgstr "¾ÆÄ«ÀÌºê »ý¼º¿¡ ½ÇÆÐÇÔ: %s\n"
 
-#: build/pack.c:103
+#: build/pack.c:106
 #, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr "cpio_copy ÀÛ¼º¿¡ ½ÇÆÐÇÔ: %s\n"
 
-#: build/pack.c:110
+#: build/pack.c:113
 #, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr "cpio_copy Àб⿡ ½ÇÆÐÇÔ: %s\n"
 
-#: build/pack.c:213
+#: build/pack.c:216
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr "PreIn ÆÄÀÏÀ» ¿­ ¼ö ¾øÀ½: %s\n"
 
-#: build/pack.c:220
+#: build/pack.c:223
 #, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr "PreUn ÆÄÀÏÀ» ¿­ ¼ö ¾øÀ½: %s\n"
 
-#: build/pack.c:227
+#: build/pack.c:230
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr "PostIn ÆÄÀÏÀ» ¿­ ¼ö ¾øÀ½: %s\n"
 
-#: build/pack.c:234
+#: build/pack.c:237
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr "PostUn ÆÄÀÏÀ» ¿­ ¼ö ¾øÀ½: %s\n"
 
-#: build/pack.c:242
+#: build/pack.c:245
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr "VerifyScript ÆÄÀÏÀ» ¿­ ¼ö ¾øÀ½: %s\n"
 
-#: build/pack.c:257
+#: build/pack.c:260
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr "Æ®¸®°Å ½ºÅ©¸³Æ® ÆÄÀÏÀ» ¿­ ¼ö ¾øÀ½: %s\n"
 
-#: build/pack.c:285
+#: build/pack.c:288
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "RPM Àбâ(readRPM): %s (À»)¸¦ ¿±´Ï´Ù: %s\n"
 
-#: build/pack.c:295
+#: build/pack.c:298
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr "RPM Àбâ(readRPM): %s (À»)¸¦ ÀнÀ´Ï´Ù: %s\n"
 
-#: build/pack.c:304 build/pack.c:508
+#: build/pack.c:307 build/pack.c:529
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: Fseek¿¡ ½ÇÆÐÇß½À´Ï´Ù: %s\n"
 
-#: build/pack.c:320
+#: build/pack.c:341
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr "RPM Àбâ(readRPM): %s (Àº)´Â RPM ÆÐÅ°Áö°¡ ¾Æ´Õ´Ï´Ù\n"
 
-#: build/pack.c:329
+#: build/pack.c:350
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "RPM Àбâ(readRPM): %s ¿¡¼­ Çì´õ¸¦ Àаí ÀÖ½À´Ï´Ù\n"
 
-#: build/pack.c:454
+#: build/pack.c:475
 msgid "Unable to create immutable header region.\n"
 msgstr "°íÁ¤ Çì´õ ¿µ¿ª(immutable header region)À» »ý¼ºÇÒ ¼ö ¾ø½À´Ï´Ù.\n"
 
-#: build/pack.c:472
+#: build/pack.c:493
 msgid "Unable to write temp header\n"
 msgstr "ÀÓ½Ã(temp) Çì´õ¸¦ ÀÛ¼ºÇÒ ¼ö ¾ø½À´Ï´Ù\n"
 
-#: build/pack.c:480
+#: build/pack.c:501
 msgid "Bad CSA data\n"
 msgstr "À߸øµÈ CSA µ¥ÀÌÅÍ\n"
 
-#: build/pack.c:515
+#: build/pack.c:536
 msgid "Unable to write final header\n"
 msgstr "¸¶Áö¸·(final) Çì´õ¸¦ ÀÛ¼ºÇÒ ¼ö ¾ø½À´Ï´Ù\n"
 
-#: build/pack.c:533
+#: build/pack.c:554
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "¼­¸í »ý¼º Áß: %d\n"
 
-#: build/pack.c:546
+#: build/pack.c:567
 msgid "Unable to reload signature header.\n"
 msgstr "¼­¸í(signature) Çì´õ¸¦ ´Ù½Ã Àоî¿Ã ¼ö ¾ø½À´Ï´Ù.\n"
 
-#: build/pack.c:554
+#: build/pack.c:575
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr "%s (À»)¸¦ ¿­ ¼ö ¾øÀ½: %s\n"
 
-#: build/pack.c:590 lib/psm.c:2149
+#: build/pack.c:611 lib/psm.c:2153
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "ÆÐÅ°Áö¸¦ ÀÛ¼ºÇÒ ¼ö ¾øÀ½: %s\n"
 
-#: build/pack.c:605
+#: build/pack.c:626
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "¼­¸íÇÒ ´ë»ó %s (À»)¸¦ ¿­ ¼ö ¾øÀ½: %s\n"
 
-#: build/pack.c:615
+#: build/pack.c:636
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "%s ÀÇ Çì´õ¸¦ ÀÐÀ» ¼ö ¾øÀ½: %s\n"
 
-#: build/pack.c:629
+#: build/pack.c:650
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "%s ¿¡ Çì´õ¸¦ ÀÛ¼ºÇÒ ¼ö ¾øÀ½: %s\n"
 
-#: build/pack.c:639
+#: build/pack.c:660
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "%s ÀÇ payload¸¦ ÀÐÀ» ¼ö ¾øÀ½: %s\n"
 
-#: build/pack.c:645
+#: build/pack.c:666
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "%s ¿¡ payload¸¦ ÀÛ¼ºÇÒ ¼ö ¾øÀ½: %s\n"
 
-#: build/pack.c:670 lib/psm.c:2415
+#: build/pack.c:691 lib/psm.c:2419
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "ÀÛ¼º: %s\n"
 
-#: build/pack.c:737
+#: build/pack.c:758
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr "%s ÆÐÅ°ÁöÀÇ Ãâ·Â ÆÄÀϸíÀ» »ý¼ºÇÒ ¼ö ¾øÀ½: %s\n"
 
-#: build/pack.c:754
+#: build/pack.c:775
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr "%s (À»)¸¦ »ý¼ºÇÒ ¼ö ¾øÀ½: %s\n"
@@ -1443,60 +1443,60 @@ msgstr ""
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
-#: lib/depends.c:585 lib/depends.c:1248 lib/depends.c:1381
+#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
 msgid "YES"
 msgstr "¿¹"
 
-#: lib/depends.c:585 lib/depends.c:1248 lib/depends.c:1381
+#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
 msgid "NO "
 msgstr "¾Æ´Ï¿À"
 
-#: lib/depends.c:1042
+#: lib/depends.c:1044
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr "%s: %-45s ¿¹ (ÆÄÀÏÀÌ Ãß°¡µÊ)\n"
 
-#: lib/depends.c:1153
+#: lib/depends.c:1155
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr "%s: %-45s ¿¹ (Á¦°øÀÌ Ãß°¡µÊ)\n"
 
-#: lib/depends.c:1247
+#: lib/depends.c:1249
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr "%s: %-45s %-s (ij½ÃµÊ)\n"
 
-#: lib/depends.c:1276
+#: lib/depends.c:1278
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr "%s: %-45s ¿¹ (rpmrcÀÌ Á¦°øÇÔ)\n"
 
-#: lib/depends.c:1293
+#: lib/depends.c:1295
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "%s: %-45s ¿¹ (rpmlibÀÌ Á¦°øÇÔ)\n"
 
-#: lib/depends.c:1317
+#: lib/depends.c:1319
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr "%s: %-45s ¿¹ (db ÆÄÀÏ)\n"
 
-#: lib/depends.c:1330
+#: lib/depends.c:1332
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr "%s: %-45s ¿¹ (db°¡ Á¦°øÇÔ)\n"
 
-#: lib/depends.c:1344
+#: lib/depends.c:1346
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr "%s: %-45s ¿¹ (db ÆÐÅ°Áö)\n"
 
-#: lib/depends.c:1360
+#: lib/depends.c:1362
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr "%s: %-45s ¾Æ´Ï¿À\n"
 
-#: lib/depends.c:1381
+#: lib/depends.c:1383
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: (%s, %s) ÀÇÁ¸(Depends) ij½Ã¿¡ Ãß°¡µÇ¾ú½À´Ï´Ù.\n"
@@ -1504,43 +1504,43 @@ msgstr "%s: (%s, %s) ÀÇÁ¸(Depends) ij½Ã¿¡ Ãß°¡µÇ¾ú½À´Ï´Ù.\n"
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1454
+#: lib/depends.c:1456
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "%s-%s-%s ÆÐÅ°ÁöÀÇ ÇÊ¿ä »çÇ×ÀÌ ¸¸Á·µÇÁö ¾ÊÀ½: %s\n"
 
 #. conflicts exist.
-#: lib/depends.c:1533
+#: lib/depends.c:1535
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "ÆÐÅ°Áö %s (ÀÌ)°¡ Ãæµ¹ÇÔ: %s\n"
 
-#: lib/depends.c:1786
+#: lib/depends.c:1788
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr "tsort °ü°è¿¡¼­ %s-%s-%s \"%s\" (À»)¸¦ »èÁ¦ÇÕ´Ï´Ù.\n"
 
 #. Record all relations.
-#: lib/depends.c:1936
+#: lib/depends.c:1938
 msgid "========== recording tsort relations\n"
 msgstr "========== tsort °ü°è¸¦ ±â·Ï(record)ÇÕ´Ï´Ù\n"
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1996
+#: lib/depends.c:1998
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 "========== ÆÐÅ°Áö¸¦ tsort ÇÕ´Ï´Ù (¼ø¼­, #¼±ÀÓÀÚ, #ÈÄÀÓÀÚ, ±íÀÌ[depth])\n"
 
-#: lib/depends.c:2046
+#: lib/depends.c:2048
 msgid "========== successors only (presentation order)\n"
 msgstr "========== ÈÄÀÓÀÚ [successors only] (Ç¥Çö ¼ø)\n"
 
-#: lib/depends.c:2099
+#: lib/depends.c:2101
 msgid "LOOP:\n"
 msgstr "·çÇÁ(LOOP):\n"
 
-#: lib/depends.c:2129
+#: lib/depends.c:2131
 msgid "========== continuing tsort ...\n"
 msgstr "========== tsort¸¦ ÁøÇàÇÕ´Ï´Ù...\n"
 
@@ -1729,16 +1729,46 @@ msgstr "(¾Ë ¼ö ¾ø´Â À¯Çü)"
 msgid "error creating temporary file %s\n"
 msgstr "Àӽà ÆÄÀÏ %s (À»)¸¦ »ý¼ºÇÏ´Â µµÁß ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù\n"
 
-#: lib/package.c:161
+#: lib/package.c:167 lib/package.c:238
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr "ÀÌ RPM ¹öÀü¿¡¼­´Â ÆÐŰ¡ ¹öÀü '1' ÀÌ Áö¿øµÇÁö ¾Ê½À´Ï´Ù\n"
 
-#: lib/package.c:184
+#: lib/package.c:188 lib/package.c:246
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 "ÀÌ RPM ¹öÀü¿¡¼­´Â ÁÖ¿ä ¹øÈ£(major number) <= 4 ÀÇ ÆÐŰ¡ ¸¸À» Áö¿øÇÕ´Ï´Ù\n"
 
+#: lib/package.c:224 lib/rpmchecksig.c:158 lib/rpmchecksig.c:506
+#, c-format
+msgid "%s: readLead failed\n"
+msgstr "%s: readLead¿¡ ½ÇÆÐÇß½À´Ï´Ù\n"
+
+#: lib/package.c:230
+#, fuzzy, c-format
+msgid "%s: bad magic\n"
+msgstr "À߸øµÈ magic ÀÔ´Ï´Ù"
+
+#: lib/package.c:254 lib/rpmchecksig.c:176 lib/rpmchecksig.c:522
+#, c-format
+msgid "%s: rpmReadSignature failed\n"
+msgstr "%s: rpmReadSignature¿¡ ½ÇÆÐÇß½À´Ï´Ù\n"
+
+#: lib/package.c:258 lib/rpmchecksig.c:180 lib/rpmchecksig.c:527
+#, c-format
+msgid "%s: No signature available\n"
+msgstr "%s: À¯È¿ÇÑ ¼­¸íÀÌ ¾ø½À´Ï´Ù\n"
+
+#: lib/package.c:284
+#, fuzzy, c-format
+msgid "%s: headerRead failed\n"
+msgstr "%s: readLead¿¡ ½ÇÆÐÇß½À´Ï´Ù\n"
+
+#: lib/package.c:303 lib/rpmchecksig.c:109 lib/rpmchecksig.c:450
+#, c-format
+msgid "%s: Fread failed: %s\n"
+msgstr "%s: Fread¿¡ ½ÇÆÐÇß½À´Ï´Ù: %s\n"
+
 #: lib/poptI.c:47
 msgid "exclude paths must begin with a /"
 msgstr "Á¦¿Ü½Ãų °æ·Î´Â ¹Ýµå½Ã '/' ·Î ½ÃÀ۵Ǿî¾ß ÇÕ´Ï´Ù"
@@ -2253,281 +2283,256 @@ msgstr "%%%s %s (À»)¸¦ »ý¼ºÇÒ ¼ö ¾ø½À´Ï´Ù\n"
 msgid "cannot write to %%%s %s\n"
 msgstr "%%%s %s (À»)¸¦ ÀÛ¼ºÇÒ ¼ö ¾ø½À´Ï´Ù\n"
 
-#: lib/psm.c:1214
+#: lib/psm.c:1217
 msgid "source package expected, binary found\n"
 msgstr "¼Ò½º ÆÐÅ°Áö°¡ ¿ä±¸µË´Ï´Ù, ¹ÙÀ̳ʸ®¸¦ ã¾Ò½À´Ï´Ù\n"
 
-#: lib/psm.c:1325
+#: lib/psm.c:1330
 msgid "source package contains no .spec file\n"
 msgstr "¼Ò½º ÆÐÅ°Áö¿¡ .spec ÆÄÀÏÀÌ Æ÷ÇԵǾî ÀÖÁö ¾Ê½À´Ï´Ù\n"
 
-#: lib/psm.c:1432
+#: lib/psm.c:1436
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "%s: %s ½ºÅ©¸³Æ®¸¦ ½ÇÇàÇÕ´Ï´Ù (ÀÖÀ» °æ¿ì)\n"
 
-#: lib/psm.c:1600
+#: lib/psm.c:1604
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 "%2$s-%3$s-%4$s ÀÇ %1$s ½ºÅ©¸³Æ®¸´(scriptlet) ½ÇÇà¿¡ ½ÇÆÐÇß½À´Ï´Ù, waitpid°¡ %"
 "5$s (À»)¸¦ ¹ÝȯÇÏ¿´½À´Ï´Ù \n"
 
-#: lib/psm.c:1607
+#: lib/psm.c:1611
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 "%2$s-%3$s-%4$s ÀÇ %1$s ½ºÅ©¸³Æ®¸´(scriptlet) ½ÇÇà¿¡ ½ÇÆÐÇß½À´Ï´Ù, Á¾·á »óȲ %"
 "5$d\n"
 
-#: lib/psm.c:1954
+#: lib/psm.c:1958
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr "%s: %s-%s-%s (ÀÌ)°¡ %d ÀÇ ÆÄÀÏÀ» °®°í ÀÖ½À´Ï´Ù, Å×½ºÆ® = %d\n"
 
-#: lib/psm.c:2071
+#: lib/psm.c:2075
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 "%s: %s ½ºÅ©¸³Æ®¸´(scriptlet)°¡ ½ÇÆÐÇß½À´Ï´Ù (%d), %s-%s-%s (À»)¸¦ »ý·«ÇÕ´Ï"
 "´Ù\n"
 
-#: lib/psm.c:2186
+#: lib/psm.c:2190
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "%s »ç¿ëÀÚ°¡ Á¸ÀçÇÏÁö ¾Ê½À´Ï´Ù - root¸¦ ÀÌ¿ëÇÕ´Ï´Ù\n"
 
-#: lib/psm.c:2195
+#: lib/psm.c:2199
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "%s ±×·ìÀÌ Á¸ÀçÇÏÁö ¾Ê½À´Ï´Ù - root¸¦ ÀÌ¿ëÇÕ´Ï´Ù\n"
 
-#: lib/psm.c:2236
+#: lib/psm.c:2240
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "¾ÆÄ«À̺긦 Ǫ´Âµ¥ ½ÇÆÐÇÔ%s%s: %s\n"
 
-#: lib/psm.c:2237
+#: lib/psm.c:2241
 msgid " on file "
 msgstr " ´ÙÀ½ ÆÄÀÏ¿¡ "
 
-#: lib/psm.c:2423
+#: lib/psm.c:2427
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "%2$s ÆÄÀÏÀÇ %1$s (ÀÌ)°¡ ½ÇÆÐÇÔ: %3$s\n"
 
-#: lib/psm.c:2426
+#: lib/psm.c:2430
 #, c-format
 msgid "%s failed: %s\n"
 msgstr "%s (ÀÌ)°¡ ½ÇÆÐÇÔ: %s\n"
 
-#: lib/query.c:128
+#: lib/query.c:124
 #, c-format
 msgid "incorrect format: %s\n"
 msgstr "¿Ã¹Ù¸£Áö ¸øÇÑ Çü½Ä: %s\n"
 
-#: lib/query.c:225
+#: lib/query.c:221
 msgid "(contains no files)"
 msgstr "(ÆÄÀÏÀÌ Æ÷ÇԵǾî ÀÖÁö ¾ÊÀ½)"
 
-#: lib/query.c:286
+#: lib/query.c:282
 msgid "normal        "
 msgstr "Á¤»ó(normal)        "
 
-#: lib/query.c:289
+#: lib/query.c:285
 msgid "replaced      "
 msgstr "±³Ã¼µÊ(replaced)    "
 
-#: lib/query.c:292
+#: lib/query.c:288
 msgid "not installed "
 msgstr "¼³Ä¡µÇ¾î ÀÖÁö ¾ÊÀ½  "
 
-#: lib/query.c:295
+#: lib/query.c:291
 msgid "net shared    "
 msgstr "net °øÀ¯µÊ          "
 
-#: lib/query.c:298
+#: lib/query.c:294
 #, c-format
 msgid "(unknown %3d) "
 msgstr "(¾Ë ¼ö ¾ø´Â %3d)    "
 
-#: lib/query.c:303
+#: lib/query.c:299
 msgid "(no state)    "
 msgstr "(»óŸ¦ ¾Ë ¼ö ¾øÀ½) "
 
-#: lib/query.c:322 lib/query.c:378
+#: lib/query.c:318 lib/query.c:374
 msgid "package has neither file owner or id lists\n"
 msgstr "ÆÐÅ°Áö¿¡ ÆÄÀÏ ¼ÒÀ¯ÀÚ ¶Ç´Â id ¸ñ·ÏÀÌ ¾ø½À´Ï´Ù\n"
 
-#: lib/query.c:467
+#: lib/query.c:463
 #, c-format
 msgid "can't query %s: %s\n"
 msgstr "%s (À»)¸¦ ÁúÀÇÇÒ ¼ö ¾øÀ½: %s\n"
 
-#: lib/query.c:582 lib/rpmchecksig.c:159 lib/rpmchecksig.c:492
-#, c-format
-msgid "%s: readLead failed\n"
-msgstr "%s: readLead¿¡ ½ÇÆÐÇß½À´Ï´Ù\n"
-
-#: lib/query.c:588 lib/rpmchecksig.c:498
-#, c-format
-msgid "%s: No signature available (v1.0 RPM)\n"
-msgstr "%s: À¯È¿ÇÑ ¼­¸íÀÌ ¾ø½À´Ï´Ù (v1.0 RPM)\n"
-
-#: lib/query.c:597 lib/rpmchecksig.c:177 lib/rpmchecksig.c:508
-#, c-format
-msgid "%s: rpmReadSignature failed\n"
-msgstr "%s: rpmReadSignature¿¡ ½ÇÆÐÇß½À´Ï´Ù\n"
-
-#: lib/query.c:601 lib/rpmchecksig.c:181 lib/rpmchecksig.c:513
-#, c-format
-msgid "%s: No signature available\n"
-msgstr "%s: À¯È¿ÇÑ ¼­¸íÀÌ ¾ø½À´Ï´Ù\n"
-
-#: lib/query.c:624
-#, fuzzy, c-format
-msgid "%s: headerRead failed\n"
-msgstr "%s: readLead¿¡ ½ÇÆÐÇß½À´Ï´Ù\n"
-
-#: lib/query.c:641 lib/rpmchecksig.c:110 lib/rpmchecksig.c:287
-#, c-format
-msgid "%s: Fread failed: %s\n"
-msgstr "%s: Fread¿¡ ½ÇÆÐÇß½À´Ï´Ù: %s\n"
-
-#: lib/query.c:758 lib/query.c:796 lib/rpminstall.c:324 lib/rpminstall.c:468
-#: lib/rpminstall.c:848
+#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463
+#: lib/rpminstall.c:838
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "%s (À»)¸¦ ¿©´Âµ¥ ½ÇÆÐÇÔ: %s\n"
 
-#: lib/query.c:774
+#: lib/query.c:616
 #, c-format
 msgid "query of %s failed\n"
 msgstr "%s (À»)¸¦ ÁúÀÇÇϴµ¥ ½ÇÆÐÇß½À´Ï´Ù\n"
 
-#: lib/query.c:780
+#: lib/query.c:622
 msgid "old format source packages cannot be queried\n"
 msgstr "ÀÌÀü Çü½ÄÀÇ ¼Ò½º ÆÐÅ°Áö´Â ÁúÀÇÇÒ ¼ö ¾ø½À´Ï´Ù\n"
 
-#: lib/query.c:806 lib/rpminstall.c:481
+#: lib/query.c:648 lib/rpminstall.c:476
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: Àдµ¥ ½ÇÆÐÇß½À´Ï´Ù: %s\n"
 
-#: lib/query.c:850
+#: lib/query.c:692
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "%s spec ÆÄÀÏÀ» ÁúÀÇÇϴµ¥ ½ÇÆÐÇß½À´Ï´Ù, ÆÄÀÏÀ» ºÐ¼®ÇÒ ¼ö ¾ø½À´Ï´Ù\n"
 
-#: lib/query.c:874
+#: lib/query.c:716
 msgid "no packages\n"
 msgstr "ÆÐÅ°Áö°¡ ¾ø½À´Ï´Ù\n"
 
-#: lib/query.c:894
+#: lib/query.c:736
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "%s ±×·ìÀº ¾î¶² ÆÐÅ°Áö¿¡µµ Æ÷ÇԵǾî ÀÖÁö ¾Ê½À´Ï´Ù\n"
 
-#: lib/query.c:904
+#: lib/query.c:746
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "%s (À»)¸¦ ¹ß»ý½ÃÅ°´Â ÆÐÅ°Áö°¡ ¾ø½À´Ï´Ù\n"
 
-#: lib/query.c:914
+#: lib/query.c:756
 #, c-format
 msgid "no package requires %s\n"
 msgstr "%s (À»)¸¦ ÇÊ¿ä·Î ÇÏ´Â ÆÐÅ°Áö°¡ ¾ø½À´Ï´Ù\n"
 
-#: lib/query.c:925
+#: lib/query.c:767
 #, c-format
 msgid "no package provides %s\n"
 msgstr "%s (À»)¸¦ Á¦°øÇÏ´Â ÆÐÅ°Áö°¡ ¾ø½À´Ï´Ù\n"
 
-#: lib/query.c:962
+#: lib/query.c:804
 #, c-format
 msgid "file %s: %s\n"
 msgstr "%s ÆÄÀÏ: %s\n"
 
-#: lib/query.c:966
+#: lib/query.c:808
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "%s ÆÄÀÏÀº ¾î¶² ÆÐÅ°Áö¿¡µµ ¼ÓÇØ ÀÖÁö ¾Ê½À´Ï´Ù\n"
 
-#: lib/query.c:993
+#: lib/query.c:835
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "ºÎÀûÇÕÇÑ ÆÐÅ°Áö ¹øÈ£: %s\n"
 
-#: lib/query.c:996
+#: lib/query.c:838
 #, c-format
 msgid "package record number: %u\n"
 msgstr "ÆÐÅ°Áö ±â·Ï(record) ¹øÈ£: %u\n"
 
-#: lib/query.c:1001
+#: lib/query.c:843
 #, c-format
 msgid "record %u could not be read\n"
 msgstr "±â·Ï(record) ¹øÈ£ %u (Àº)´Â ÀÐÀ» ¼ö ¾ø½À´Ï´Ù\n"
 
-#: lib/query.c:1012 lib/rpminstall.c:634
+#: lib/query.c:854 lib/rpminstall.c:624
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "%s ÆÐÅ°Áö´Â ¼³Ä¡µÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù\n"
 
-#: lib/rpmchecksig.c:50
+#: lib/rpmchecksig.c:49
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s: ¿©´Âµ¥ ½ÇÆÐÇß½À´Ï´Ù: %s\n"
 
-#: lib/rpmchecksig.c:62
+#: lib/rpmchecksig.c:61
 msgid "makeTempFile failed\n"
 msgstr "makeTempFile¿¡ ½ÇÆÐÇß½À´Ï´Ù\n"
 
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:103
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: Fwrite¿¡ ½ÇÆÐÇß½À´Ï´Ù: %s\n"
 
-#: lib/rpmchecksig.c:164
+#: lib/rpmchecksig.c:163
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr "%s: v1.0 RPMÀº ¼­¸íÇÒ ¼ö ¾ø½À´Ï´Ù\n"
 
-#: lib/rpmchecksig.c:168
+#: lib/rpmchecksig.c:167
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr "%s: v2.0 RPMÀº Àç-¼­¸íÇÒ ¼ö ¾ø½À´Ï´Ù\n"
 
-#: lib/rpmchecksig.c:214
+#: lib/rpmchecksig.c:213
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: writeLead¿¡ ½ÇÆÐÇß½À´Ï´Ù: %s\n"
 
-#: lib/rpmchecksig.c:220
+#: lib/rpmchecksig.c:219
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmWriteSignature¿¡ ½ÇÆÐÇß½À´Ï´Ù: %s\n"
 
-#: lib/rpmchecksig.c:731
+#: lib/rpmchecksig.c:512
+#, c-format
+msgid "%s: No signature available (v1.0 RPM)\n"
+msgstr "%s: À¯È¿ÇÑ ¼­¸íÀÌ ¾ø½À´Ï´Ù (v1.0 RPM)\n"
+
+#: lib/rpmchecksig.c:707
 msgid "NOT OK"
 msgstr "¿Ã¹Ù¸£Áö ¾ÊÀ½"
 
-#: lib/rpmchecksig.c:732 lib/rpmchecksig.c:746
+#: lib/rpmchecksig.c:708 lib/rpmchecksig.c:722
 msgid " (MISSING KEYS:"
 msgstr " (Å°¸¦ ãÀ» ¼ö ¾øÀ½:"
 
-#: lib/rpmchecksig.c:734 lib/rpmchecksig.c:748
+#: lib/rpmchecksig.c:710 lib/rpmchecksig.c:724
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:735 lib/rpmchecksig.c:749
+#: lib/rpmchecksig.c:711 lib/rpmchecksig.c:725
 msgid " (UNTRUSTED KEYS:"
 msgstr " (Å°¸¦ ½Å·ÚÇÒ ¼ö ¾øÀ½:"
 
-#: lib/rpmchecksig.c:737 lib/rpmchecksig.c:751
+#: lib/rpmchecksig.c:713 lib/rpmchecksig.c:727
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:745
+#: lib/rpmchecksig.c:721
 msgid "OK"
 msgstr "È®ÀÎ"
 
@@ -2539,86 +2544,86 @@ msgstr "Áغñ Áß..."
 msgid "Preparing packages for installation..."
 msgstr "¼³Ä¡ÇÒ ÆÐÅ°Áö¸¦ ÁغñÇÏ°í ÀÖ½À´Ï´Ù..."
 
-#: lib/rpminstall.c:274
+#: lib/rpminstall.c:228
+#, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr "%s ¾ÈÀÇ ÆÐÅ°Áö µ¥ÀÌÅͺ£À̽º¸¦ ¿­ ¼ö ¾ø½À´Ï´Ù\n"
+
+#: lib/rpminstall.c:285
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "%s (À»)¸¦ º¹±¸ÇÕ´Ï´Ù\n"
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:284
+#: lib/rpminstall.c:295
 #, c-format
 msgid " ... as %s\n"
 msgstr " ... %s (À¸)·Î\n"
 
-#: lib/rpminstall.c:288
+#: lib/rpminstall.c:299
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "%s (À»)¸¦ »ý·«ÇÕ´Ï´Ù - Àü¼Û(transfer)¿¡ ½ÇÆÐÇÔ - %s\n"
 
-#: lib/rpminstall.c:370
-#, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr "%s ¾ÈÀÇ ÆÐÅ°Áö µ¥ÀÌÅͺ£À̽º¸¦ ¿­ ¼ö ¾ø½À´Ï´Ù\n"
-
-#: lib/rpminstall.c:393
+#: lib/rpminstall.c:388
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr "%s ÆÐÅ°Áö´Â Àç¹èÄ¡ÇÒ ¼ö ¾ø½À´Ï´Ù\n"
 
-#: lib/rpminstall.c:442
+#: lib/rpminstall.c:437
 #, c-format
 msgid "error reading from file %s\n"
 msgstr "%s ÆÄÀÏÀ» Àд µµÁß ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù\n"
 
-#: lib/rpminstall.c:448
+#: lib/rpminstall.c:443
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr "%s ÆÄÀÏÀÌ ÃֽŠ¹öÀüÀÇ RPMÀ» ÇÊ¿ä·Î ÇÕ´Ï´Ù\n"
 
-#: lib/rpminstall.c:460 lib/rpminstall.c:705
+#: lib/rpminstall.c:455 lib/rpminstall.c:694
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr "%s (Àº)´Â ¼³Ä¡µÉ ¼ö ¾ø½À´Ï´Ù\n"
 
-#: lib/rpminstall.c:496
+#: lib/rpminstall.c:491
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "%d ÀÇ ¼Ò½º¿Í %d ÀÇ ¹ÙÀ̳ʸ® ÆÐÅ°Áö¸¦ ã¾Ò½À´Ï´Ù\n"
 
-#: lib/rpminstall.c:512
+#: lib/rpminstall.c:507
 msgid "failed dependencies:\n"
 msgstr "ÀÇÁ¸¼º ¹®Á¦·Î ÀÎÇØ ½ÇÆÐÇÔ:\n"
 
-#: lib/rpminstall.c:533
+#: lib/rpminstall.c:528
 msgid "installing binary packages\n"
 msgstr "¹ÙÀ̳ʸ® ÆÐÅ°Áö¸¦ ¼³Ä¡ÇÕ´Ï´Ù\n"
 
-#: lib/rpminstall.c:554
+#: lib/rpminstall.c:549
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "%s ÆÄÀÏÀ» ¿­ ¼ö ¾øÀ½: %s\n"
 
-#: lib/rpminstall.c:621
+#: lib/rpminstall.c:611
 #, c-format
 msgid "cannot open %s/packages.rpm\n"
 msgstr "%s/packages.rpm À» ¿­ ¼ö ¾ø½À´Ï´Ù\n"
 
-#: lib/rpminstall.c:637
+#: lib/rpminstall.c:627
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" ¿©·¯°³ÀÇ ÆÐÅ°Áö¸¦ ÁöÁ¤ÇÕ´Ï´Ù\n"
 
-#: lib/rpminstall.c:661
+#: lib/rpminstall.c:651
 msgid "removing these packages would break dependencies:\n"
 msgstr "ÀÌ ÆÐÅ°ÁöµéÀ» Á¦°ÅÇϸé ÀÇÁ¸¼ºÀÌ ±úÁú ¼ö ÀÖÀ½:\n"
 
-#: lib/rpminstall.c:691
+#: lib/rpminstall.c:680
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr "%s (À»)¸¦ ¿­ ¼ö ¾øÀ½: %s\n"
 
-#: lib/rpminstall.c:697
+#: lib/rpminstall.c:686
 #, c-format
 msgid "Installing %s\n"
 msgstr "%s (À»)¸¦ ¼³Ä¡ÇÕ´Ï´Ù\n"
@@ -2889,17 +2894,17 @@ msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 "ÆÐÅ°Áö¿¡ ±×·ì À̸§°ú id ¸ñ·ÏÀÌ ¾ø½À´Ï´Ù (Àý´ë ÀÌ·¸°Ô µÇ¾î¼­´Â ¾ÈµË´Ï´Ù)\n"
 
-#: lib/verify.c:414
+#: lib/verify.c:417
 #, c-format
 msgid "missing    %s"
 msgstr "´ÙÀ½À» ãÀ» ¼ö ¾ø½À´Ï´Ù    %s"
 
-#: lib/verify.c:511
+#: lib/verify.c:514
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr "%s-%s-%s ¿¡ ÀÇÁ¸¼º ¹®Á¦ ¹ß»ý: "
 
-#: lib/verify.c:556
+#: lib/verify.c:559
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
diff --git a/po/no.po b/po/no.po
index dcb7bb3fb..a7fb61b0f 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-24 21:17-0400\n"
+"POT-Creation-Date: 2001-10-26 00:15-0400\n"
 "PO-Revision-Date: 2001-06-27 12:24+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -65,15 +65,15 @@ msgstr "Bygger målplattformene: %s\n"
 msgid "Building for target %s\n"
 msgstr "Bygger for mål %s\n"
 
-#: rpm2cpio.c:34
+#: rpm2cpio.c:55
 msgid "argument is not an RPM package\n"
 msgstr "argumentet er ikke en RPM-pakke\n"
 
-#: rpm2cpio.c:38
+#: rpm2cpio.c:61
 msgid "error reading header from package\n"
 msgstr "feil under lesing av header fra pakke\n"
 
-#: rpm2cpio.c:60
+#: rpm2cpio.c:83
 #, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr "kan ikke gjenåpne \"payload\": %s\n"
@@ -398,44 +398,44 @@ msgstr ""
 msgid "exec failed\n"
 msgstr "kjøring feilet\n"
 
-#: rpmqv.c:959
+#: rpmqv.c:963
 msgid "no packages files given for rebuild"
 msgstr "ingen pakkefiler oppgitt for ombygging"
 
-#: rpmqv.c:1026
+#: rpmqv.c:1038
 msgid "no spec files given for build"
 msgstr "ingen spec-fil oppgitt for bygging"
 
-#: rpmqv.c:1028
+#: rpmqv.c:1040
 msgid "no tar files given for build"
 msgstr "ingen tar-fil oppgitt for bygging"
 
-#: rpmqv.c:1047
+#: rpmqv.c:1059
 msgid "no packages given for uninstall"
 msgstr "ingen pakker oppgitt for avinstallering"
 
-#: rpmqv.c:1058
+#: rpmqv.c:1070
 msgid "no packages given for install"
 msgstr "ingen pakker oppgitt for installering"
 
-#: rpmqv.c:1106
+#: rpmqv.c:1118
 msgid "no arguments given for query"
 msgstr "ingen argumenter oppgitt for spørring"
 
-#: rpmqv.c:1120
+#: rpmqv.c:1132
 msgid "no arguments given for verify"
 msgstr "ingen argumenter oppgitt for verifisering"
 
-#: rpmqv.c:1128
+#: rpmqv.c:1140
 msgid "unexpected arguments to --querytags "
 msgstr "uventede argumenter til --querytags "
 
-#: rpmqv.c:1144
+#: rpmqv.c:1156
 #, fuzzy
 msgid "no arguments given"
 msgstr "ingen argumenter oppgitt for spørring"
 
-#: build/build.c:125 build/pack.c:466
+#: build/build.c:125 build/pack.c:487
 msgid "Unable to open temp file.\n"
 msgstr "Kunne ikke åpne spec fil %s: %s\n"
 
@@ -646,7 +646,7 @@ msgstr ""
 msgid "Could not open %%files file %s: %s\n"
 msgstr "Kunne ikke åpne spec fil %s: %s\n"
 
-#: build/files.c:1777 build/pack.c:145
+#: build/files.c:1777 build/pack.c:148
 #, c-format
 msgid "line: %s\n"
 msgstr "Installerer %s\n"
@@ -721,156 +721,156 @@ msgstr ""
 msgid "Could not canonicalize hostname: %s\n"
 msgstr ""
 
-#: build/pack.c:78
+#: build/pack.c:81
 #, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr "klarte ikke å åpne %s: %s\n"
 
-#: build/pack.c:81
+#: build/pack.c:84
 #, c-format
 msgid "create archive failed: %s\n"
 msgstr "feil under oppretting av arkiv %s\n"
 
-#: build/pack.c:103
+#: build/pack.c:106
 #, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr "cpio_copy skriving feilet: %s\n"
 
-#: build/pack.c:110
+#: build/pack.c:113
 #, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr "cpio_copy: feil under lesing: %s\n"
 
-#: build/pack.c:213
+#: build/pack.c:216
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr "Kunne ikke åpne PreIn-fil: %s\n"
 
-#: build/pack.c:220
+#: build/pack.c:223
 #, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr "Kunne ikke åpne PreUn-fil: %s\n"
 
-#: build/pack.c:227
+#: build/pack.c:230
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr "Kunne ikke åpne PostIn-fil: %s\n"
 
-#: build/pack.c:234
+#: build/pack.c:237
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr "Kunne ikke åpne PostUn-fil: %s\n"
 
-#: build/pack.c:242
+#: build/pack.c:245
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr "Kunne ikke åpne VerifyScript-fil: %s\n"
 
-#: build/pack.c:257
+#: build/pack.c:260
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr ""
 
-#: build/pack.c:285
+#: build/pack.c:288
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:295
+#: build/pack.c:298
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr ""
 
-#: build/pack.c:304 build/pack.c:508
+#: build/pack.c:307 build/pack.c:529
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: Fseek feilet: %s\n"
 
-#: build/pack.c:320
+#: build/pack.c:341
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr "readRPM: %s er ikke en RPM-pakke\n"
 
-#: build/pack.c:329
+#: build/pack.c:350
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: leser header fra %s\n"
 
-#: build/pack.c:454
+#: build/pack.c:475
 #, fuzzy
 msgid "Unable to create immutable header region.\n"
 msgstr "Kunne ikke åpne spec fil %s: %s\n"
 
-#: build/pack.c:472
+#: build/pack.c:493
 #, fuzzy
 msgid "Unable to write temp header\n"
 msgstr "Kunne ikke skrive header til %s: %s\n"
 
-#: build/pack.c:480
+#: build/pack.c:501
 msgid "Bad CSA data\n"
 msgstr "Ugyldige CSA-data\n"
 
-#: build/pack.c:515
+#: build/pack.c:536
 #, fuzzy
 msgid "Unable to write final header\n"
 msgstr "Kunne ikke skrive header til %s: %s\n"
 
-#: build/pack.c:533
+#: build/pack.c:554
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "Genererer signatur: %d\n"
 
-#: build/pack.c:546
+#: build/pack.c:567
 #, fuzzy
 msgid "Unable to reload signature header.\n"
 msgstr "Kunne ikke åpne spec fil %s: %s\n"
 
-#: build/pack.c:554
+#: build/pack.c:575
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr "Kunne ikke åpne %s: %s\n"
 
-#: build/pack.c:590 lib/psm.c:2149
+#: build/pack.c:611 lib/psm.c:2153
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Kunne ikke skrive pakke: %s\n"
 
-#: build/pack.c:605
+#: build/pack.c:626
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "Kunne ikke åpne sigmål %s: %s\n"
 
-#: build/pack.c:615
+#: build/pack.c:636
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "Kunne ikke åpne spec fil %s: %s\n"
 
-#: build/pack.c:629
+#: build/pack.c:650
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "Kunne ikke skrive header til %s: %s\n"
 
-#: build/pack.c:639
+#: build/pack.c:660
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "Kunne ikke lese \"payload\" fra %s: %s\n"
 
-#: build/pack.c:645
+#: build/pack.c:666
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Kunne ikke skrive \"payload\" til %s: %s\n"
 
-#: build/pack.c:670 lib/psm.c:2415
+#: build/pack.c:691 lib/psm.c:2419
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Skrev: %s\n"
 
-#: build/pack.c:737
+#: build/pack.c:758
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:754
+#: build/pack.c:775
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr ""
@@ -1442,60 +1442,60 @@ msgstr ""
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1248 lib/depends.c:1381
+#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
 msgid "YES"
 msgstr "JA"
 
-#: lib/depends.c:585 lib/depends.c:1248 lib/depends.c:1381
+#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
 msgid "NO "
 msgstr "NEI"
 
-#: lib/depends.c:1042
+#: lib/depends.c:1044
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:1153
+#: lib/depends.c:1155
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:1247
+#: lib/depends.c:1249
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1276
+#: lib/depends.c:1278
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1293
+#: lib/depends.c:1295
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:1317
+#: lib/depends.c:1319
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1330
+#: lib/depends.c:1332
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1344
+#: lib/depends.c:1346
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:1360
+#: lib/depends.c:1362
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1381
+#: lib/depends.c:1383
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
@@ -1503,42 +1503,42 @@ msgstr ""
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1454
+#: lib/depends.c:1456
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1533
+#: lib/depends.c:1535
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "pakke %s er i konflikt: %s\n"
 
-#: lib/depends.c:1786
+#: lib/depends.c:1788
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1936
+#: lib/depends.c:1938
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1996
+#: lib/depends.c:1998
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2046
+#: lib/depends.c:2048
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:2099
+#: lib/depends.c:2101
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:2129
+#: lib/depends.c:2131
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -1724,15 +1724,45 @@ msgstr "(ukjent type)"
 msgid "error creating temporary file %s\n"
 msgstr "feil under oppretting av midlertidig fil %s\n"
 
-#: lib/package.c:161
+#: lib/package.c:167 lib/package.c:238
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:184
+#: lib/package.c:188 lib/package.c:246
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 
+#: lib/package.c:224 lib/rpmchecksig.c:158 lib/rpmchecksig.c:506
+#, c-format
+msgid "%s: readLead failed\n"
+msgstr "%s: readLead feilet\n"
+
+#: lib/package.c:230
+#, fuzzy, c-format
+msgid "%s: bad magic\n"
+msgstr "Ugyldig magi"
+
+#: lib/package.c:254 lib/rpmchecksig.c:176 lib/rpmchecksig.c:522
+#, c-format
+msgid "%s: rpmReadSignature failed\n"
+msgstr "%s: rpmReadSignature feilet\n"
+
+#: lib/package.c:258 lib/rpmchecksig.c:180 lib/rpmchecksig.c:527
+#, c-format
+msgid "%s: No signature available\n"
+msgstr "%s: Ingen signatur tilgjengelig\n"
+
+#: lib/package.c:284
+#, fuzzy, c-format
+msgid "%s: headerRead failed\n"
+msgstr "%s: readLead feilet\n"
+
+#: lib/package.c:303 lib/rpmchecksig.c:109 lib/rpmchecksig.c:450
+#, c-format
+msgid "%s: Fread failed: %s\n"
+msgstr "%s: Fread feilet: %s\n"
+
 #: lib/poptI.c:47
 msgid "exclude paths must begin with a /"
 msgstr "eksluderingssti må begynne med en /"
@@ -2238,275 +2268,250 @@ msgstr "kan ikke opprette %%%s %s\n"
 msgid "cannot write to %%%s %s\n"
 msgstr "kan ikke skrive til %%%s %s\n"
 
-#: lib/psm.c:1214
+#: lib/psm.c:1217
 msgid "source package expected, binary found\n"
 msgstr "kildepakke forventet, binær funnet\n"
 
-#: lib/psm.c:1325
+#: lib/psm.c:1330
 msgid "source package contains no .spec file\n"
 msgstr "kildepakke inneholder ikke en .spec-fil\n"
 
-#: lib/psm.c:1432
+#: lib/psm.c:1436
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "%s: kjører %s-skript (hvis noen)\n"
 
-#: lib/psm.c:1600
+#: lib/psm.c:1604
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1607
+#: lib/psm.c:1611
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1954
+#: lib/psm.c:1958
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2071
+#: lib/psm.c:2075
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2186
+#: lib/psm.c:2190
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2195
+#: lib/psm.c:2199
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2236
+#: lib/psm.c:2240
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2237
+#: lib/psm.c:2241
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2423
+#: lib/psm.c:2427
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "klarte ikke å åpne %s: %s\n"
 
-#: lib/psm.c:2426
+#: lib/psm.c:2430
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s feilet\n"
 
-#: lib/query.c:128
+#: lib/query.c:124
 #, c-format
 msgid "incorrect format: %s\n"
 msgstr "ukorrekt format: %s\n"
 
-#: lib/query.c:225
+#: lib/query.c:221
 msgid "(contains no files)"
 msgstr "(inneholder ingen filer)"
 
-#: lib/query.c:286
+#: lib/query.c:282
 msgid "normal        "
 msgstr "normal        "
 
-#: lib/query.c:289
+#: lib/query.c:285
 msgid "replaced      "
 msgstr "erstattet     "
 
-#: lib/query.c:292
+#: lib/query.c:288
 msgid "not installed "
 msgstr "ikke installert"
 
-#: lib/query.c:295
+#: lib/query.c:291
 msgid "net shared    "
 msgstr "delt via nett "
 
-#: lib/query.c:298
+#: lib/query.c:294
 #, c-format
 msgid "(unknown %3d) "
 msgstr "(ukjent %3d)  "
 
-#: lib/query.c:303
+#: lib/query.c:299
 msgid "(no state)    "
 msgstr "(ingen tilstand)"
 
-#: lib/query.c:322 lib/query.c:378
+#: lib/query.c:318 lib/query.c:374
 msgid "package has neither file owner or id lists\n"
 msgstr "pakken har verken fileier eller id-lister\n"
 
-#: lib/query.c:467
+#: lib/query.c:463
 #, c-format
 msgid "can't query %s: %s\n"
 msgstr "kan ikke spørre på %s: %s\n"
 
-#: lib/query.c:582 lib/rpmchecksig.c:159 lib/rpmchecksig.c:492
-#, c-format
-msgid "%s: readLead failed\n"
-msgstr "%s: readLead feilet\n"
-
-#: lib/query.c:588 lib/rpmchecksig.c:498
-#, c-format
-msgid "%s: No signature available (v1.0 RPM)\n"
-msgstr "%s: Ingen signatur tilgjengelig (v1.0 RPM)\n"
-
-#: lib/query.c:597 lib/rpmchecksig.c:177 lib/rpmchecksig.c:508
-#, c-format
-msgid "%s: rpmReadSignature failed\n"
-msgstr "%s: rpmReadSignature feilet\n"
-
-#: lib/query.c:601 lib/rpmchecksig.c:181 lib/rpmchecksig.c:513
-#, c-format
-msgid "%s: No signature available\n"
-msgstr "%s: Ingen signatur tilgjengelig\n"
-
-#: lib/query.c:624
-#, fuzzy, c-format
-msgid "%s: headerRead failed\n"
-msgstr "%s: readLead feilet\n"
-
-#: lib/query.c:641 lib/rpmchecksig.c:110 lib/rpmchecksig.c:287
-#, c-format
-msgid "%s: Fread failed: %s\n"
-msgstr "%s: Fread feilet: %s\n"
-
-#: lib/query.c:758 lib/query.c:796 lib/rpminstall.c:324 lib/rpminstall.c:468
-#: lib/rpminstall.c:848
+#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463
+#: lib/rpminstall.c:838
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "feil under åpning av %s: %s\n"
 
-#: lib/query.c:774
+#: lib/query.c:616
 #, c-format
 msgid "query of %s failed\n"
 msgstr "spørring på %s feilet\n"
 
-#: lib/query.c:780
+#: lib/query.c:622
 msgid "old format source packages cannot be queried\n"
 msgstr "kildepakker i gammelt format kan ikke spørres\n"
 
-#: lib/query.c:806 lib/rpminstall.c:481
+#: lib/query.c:648 lib/rpminstall.c:476
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: lesing av manifest feilet: %s\n"
 
-#: lib/query.c:850
+#: lib/query.c:692
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:874
+#: lib/query.c:716
 msgid "no packages\n"
 msgstr "ingen pakker\n"
 
-#: lib/query.c:894
+#: lib/query.c:736
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "gruppe %s inneholder ingen pakker\n"
 
-#: lib/query.c:904
+#: lib/query.c:746
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "ingen pakke utløser %s\n"
 
-#: lib/query.c:914
+#: lib/query.c:756
 #, c-format
 msgid "no package requires %s\n"
 msgstr "ingen pakke krever %s\n"
 
-#: lib/query.c:925
+#: lib/query.c:767
 #, c-format
 msgid "no package provides %s\n"
 msgstr "ingen pakke gir %s\n"
 
-#: lib/query.c:962
+#: lib/query.c:804
 #, c-format
 msgid "file %s: %s\n"
 msgstr "fil %s: %s\n"
 
-#: lib/query.c:966
+#: lib/query.c:808
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "filen %s eies ikke av noen pakke\n"
 
-#: lib/query.c:993
+#: lib/query.c:835
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "ugyldig pakkenummer: %s\n"
 
-#: lib/query.c:996
+#: lib/query.c:838
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:1001
+#: lib/query.c:843
 #, c-format
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:1012 lib/rpminstall.c:634
+#: lib/query.c:854 lib/rpminstall.c:624
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "pakke %s er ikke installert\n"
 
-#: lib/rpmchecksig.c:50
+#: lib/rpmchecksig.c:49
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s: åpne feilet: %s\n"
 
-#: lib/rpmchecksig.c:62
+#: lib/rpmchecksig.c:61
 msgid "makeTempFile failed\n"
 msgstr "makeTempFile feilet\n"
 
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:103
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: Fwrite feilet: %s\n"
 
-#: lib/rpmchecksig.c:164
+#: lib/rpmchecksig.c:163
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr "%s: kan ikke signere v1.0 RPM\n"
 
-#: lib/rpmchecksig.c:168
+#: lib/rpmchecksig.c:167
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr "%s: Kan ikke signere v2.0 RPM på nytt\n"
 
-#: lib/rpmchecksig.c:214
+#: lib/rpmchecksig.c:213
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: writeLead feilet: %s\n"
 
-#: lib/rpmchecksig.c:220
+#: lib/rpmchecksig.c:219
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmWriteSignature feilet: %s\n"
 
-#: lib/rpmchecksig.c:731
+#: lib/rpmchecksig.c:512
+#, c-format
+msgid "%s: No signature available (v1.0 RPM)\n"
+msgstr "%s: Ingen signatur tilgjengelig (v1.0 RPM)\n"
+
+#: lib/rpmchecksig.c:707
 msgid "NOT OK"
 msgstr "IKKE OK"
 
-#: lib/rpmchecksig.c:732 lib/rpmchecksig.c:746
+#: lib/rpmchecksig.c:708 lib/rpmchecksig.c:722
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:734 lib/rpmchecksig.c:748
+#: lib/rpmchecksig.c:710 lib/rpmchecksig.c:724
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:735 lib/rpmchecksig.c:749
+#: lib/rpmchecksig.c:711 lib/rpmchecksig.c:725
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:737 lib/rpmchecksig.c:751
+#: lib/rpmchecksig.c:713 lib/rpmchecksig.c:727
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:745
+#: lib/rpmchecksig.c:721
 msgid "OK"
 msgstr "OK"
 
@@ -2518,86 +2523,86 @@ msgstr "Forbereder..."
 msgid "Preparing packages for installation..."
 msgstr "Forbereder pakker for installasjon..."
 
-#: lib/rpminstall.c:274
+#: lib/rpminstall.c:228
+#, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr "kan ikke åpne pakkedatabase i %s\n"
+
+#: lib/rpminstall.c:285
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "Henter %s\n"
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:284
+#: lib/rpminstall.c:295
 #, c-format
 msgid " ... as %s\n"
 msgstr " ... som %s\n"
 
-#: lib/rpminstall.c:288
+#: lib/rpminstall.c:299
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "hopper over %s - overføring feilet - %s\n"
 
-#: lib/rpminstall.c:370
-#, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr "kan ikke åpne pakkedatabase i %s\n"
-
-#: lib/rpminstall.c:393
+#: lib/rpminstall.c:388
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr "pakke %s kan ikke relokeres\n"
 
-#: lib/rpminstall.c:442
+#: lib/rpminstall.c:437
 #, c-format
 msgid "error reading from file %s\n"
 msgstr "feil under lesing fra fil %s\n"
 
-#: lib/rpminstall.c:448
+#: lib/rpminstall.c:443
 #, 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:460 lib/rpminstall.c:705
+#: lib/rpminstall.c:455 lib/rpminstall.c:694
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:496
+#: lib/rpminstall.c:491
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "fant %d kilde- og %d binærpakker\n"
 
-#: lib/rpminstall.c:512
+#: lib/rpminstall.c:507
 msgid "failed dependencies:\n"
 msgstr "feilede avhengigheter:\n"
 
-#: lib/rpminstall.c:533
+#: lib/rpminstall.c:528
 msgid "installing binary packages\n"
 msgstr "installerer binærpakker\n"
 
-#: lib/rpminstall.c:554
+#: lib/rpminstall.c:549
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:621
+#: lib/rpminstall.c:611
 #, c-format
 msgid "cannot open %s/packages.rpm\n"
 msgstr "kan ikke åpne %s/packages.rpm\n"
 
-#: lib/rpminstall.c:637
+#: lib/rpminstall.c:627
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" spesifiserer flere pakker\n"
 
-#: lib/rpminstall.c:661
+#: lib/rpminstall.c:651
 msgid "removing these packages would break dependencies:\n"
 msgstr "fjerning av disse pakkene vil ødelegge avhengigheter:\n"
 
-#: lib/rpminstall.c:691
+#: lib/rpminstall.c:680
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr "kan ikke åpne %s: %s\n"
 
-#: lib/rpminstall.c:697
+#: lib/rpminstall.c:686
 #, c-format
 msgid "Installing %s\n"
 msgstr "Installerer %s\n"
@@ -2865,17 +2870,17 @@ msgstr ""
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:414
+#: lib/verify.c:417
 #, c-format
 msgid "missing    %s"
 msgstr "mangler    %s"
 
-#: lib/verify.c:511
+#: lib/verify.c:514
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
 
-#: lib/verify.c:556
+#: lib/verify.c:559
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index f2acbbeb9..8237d9c37 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-24 21:17-0400\n"
+"POT-Creation-Date: 2001-10-26 00:15-0400\n"
 "PO-Revision-Date: 1999-05-25 17:00+0100\n"
 "Last-Translator: Pawe³ Dziekoñski <pdziekonski@mml.ch.pwr.wroc.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -72,15 +72,15 @@ msgstr "Budowanie dla platform: %s\n"
 msgid "Building for target %s\n"
 msgstr "Budowanie dla %s\n"
 
-#: rpm2cpio.c:34
+#: rpm2cpio.c:55
 msgid "argument is not an RPM package\n"
 msgstr "argument nie jest pakietem RPM\n"
 
-#: rpm2cpio.c:38
+#: rpm2cpio.c:61
 msgid "error reading header from package\n"
 msgstr "b³±d odczytu nag³ówka z pakietu\n"
 
-#: rpm2cpio.c:60
+#: rpm2cpio.c:83
 #, fuzzy, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr "nie mo¿na otworzyæ pliku %s\n"
@@ -414,44 +414,44 @@ msgstr "--sign mo¿na u¿yæ tylko w trakcie budowania pakietu"
 msgid "exec failed\n"
 msgstr "wykonanie nie powiod³o siê\n"
 
-#: rpmqv.c:959
+#: rpmqv.c:963
 msgid "no packages files given for rebuild"
 msgstr "nie podano nazw pakietów do przebudowania"
 
-#: rpmqv.c:1026
+#: rpmqv.c:1038
 msgid "no spec files given for build"
 msgstr "nie podano nazw plików spec do budowania"
 
-#: rpmqv.c:1028
+#: rpmqv.c:1040
 msgid "no tar files given for build"
 msgstr "nie podano nazw plików tar do budowania"
 
-#: rpmqv.c:1047
+#: rpmqv.c:1059
 msgid "no packages given for uninstall"
 msgstr "nie podano nazw plików do usuniêcia"
 
-#: rpmqv.c:1058
+#: rpmqv.c:1070
 msgid "no packages given for install"
 msgstr "nie podano nazw plików do zainstalowania"
 
-#: rpmqv.c:1106
+#: rpmqv.c:1118
 msgid "no arguments given for query"
 msgstr "nie podano argumentów dla trybu zapytañ"
 
-#: rpmqv.c:1120
+#: rpmqv.c:1132
 msgid "no arguments given for verify"
 msgstr "nie podano argumentów dla sprawdzania"
 
-#: rpmqv.c:1128
+#: rpmqv.c:1140
 msgid "unexpected arguments to --querytags "
 msgstr "nieoczekiwane argumenty dla --querytags "
 
-#: rpmqv.c:1144
+#: rpmqv.c:1156
 #, fuzzy
 msgid "no arguments given"
 msgstr "nie podano argumentów dla trybu zapytañ"
 
-#: build/build.c:125 build/pack.c:466
+#: build/build.c:125 build/pack.c:487
 #, fuzzy
 msgid "Unable to open temp file.\n"
 msgstr "Nie mo¿na otworzyæ pliku tymczasowego"
@@ -672,7 +672,7 @@ msgstr "Nie znaleziono pliku: %s"
 msgid "Could not open %%files file %s: %s\n"
 msgstr "Nie mo¿na otworzyæ %%files pliku: %s"
 
-#: build/files.c:1777 build/pack.c:145
+#: build/files.c:1777 build/pack.c:148
 #, fuzzy, c-format
 msgid "line: %s\n"
 msgstr "linia: %s"
@@ -747,157 +747,157 @@ msgstr ""
 msgid "Could not canonicalize hostname: %s\n"
 msgstr "Nie mo¿na rozwi±zaæ nazwy systemu: %s\n"
 
-#: build/pack.c:78
+#: build/pack.c:81
 #, fuzzy, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr "utworzenie archiwum pliku %s nie powiod³o siê: %s"
 
-#: build/pack.c:81
+#: build/pack.c:84
 #, fuzzy, c-format
 msgid "create archive failed: %s\n"
 msgstr "utworzenie archiwum pliku %s nie powiod³o siê: %s"
 
-#: build/pack.c:103
+#: build/pack.c:106
 #, fuzzy, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr "zapis w trybie cpio_copy nie powiód³ siê: %s"
 
-#: build/pack.c:110
+#: build/pack.c:113
 #, fuzzy, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr "odczyt w trybie cpio_copy nie powiód³ siê: %s"
 
-#: build/pack.c:213
+#: build/pack.c:216
 #, fuzzy, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr "Nie mo¿na otworzyæ pliku PreIn: %s"
 
-#: build/pack.c:220
+#: build/pack.c:223
 #, fuzzy, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr "Nie mo¿na otworzyæ pliku PreUn: %s"
 
-#: build/pack.c:227
+#: build/pack.c:230
 #, fuzzy, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr "Nie mo¿na otworzyæ pliku PostIn: %s"
 
-#: build/pack.c:234
+#: build/pack.c:237
 #, fuzzy, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr "Nie mo¿na otworzyæ pliku PostUn: %s"
 
-#: build/pack.c:242
+#: build/pack.c:245
 #, fuzzy, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr "Nie mo¿na otworzyæ pliku VerifyScript: %s"
 
-#: build/pack.c:257
+#: build/pack.c:260
 #, fuzzy, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr "Nie mo¿na otworzyæ skryptu Trigger: %s"
 
-#: build/pack.c:285
+#: build/pack.c:288
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "readRPM: otwieranie %s: %s\n"
 
-#: build/pack.c:295
+#: build/pack.c:298
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr "readRPM: czytanie %s: %s\n"
 
-#: build/pack.c:304 build/pack.c:508
+#: build/pack.c:307 build/pack.c:529
 #, fuzzy, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: readLead nie powiod³o siê\n"
 
-#: build/pack.c:320
+#: build/pack.c:341
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr "readRPM: %s nie jest pakietem RPM\n"
 
-#: build/pack.c:329
+#: build/pack.c:350
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: czytanie nag³ówka z %s\n"
 
-#: build/pack.c:454
+#: build/pack.c:475
 #, fuzzy
 msgid "Unable to create immutable header region.\n"
 msgstr "Nie mo¿na odczytaæ ikony: %s"
 
-#: build/pack.c:472
+#: build/pack.c:493
 #, fuzzy
 msgid "Unable to write temp header\n"
 msgstr "Nie mo¿na zapisaæ %s"
 
-#: build/pack.c:480
+#: build/pack.c:501
 #, fuzzy
 msgid "Bad CSA data\n"
 msgstr "B³êdne dane CSA"
 
-#: build/pack.c:515
+#: build/pack.c:536
 #, fuzzy
 msgid "Unable to write final header\n"
 msgstr "Nie mo¿na zapisaæ %s"
 
-#: build/pack.c:533
+#: build/pack.c:554
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "Generowanie sygnatury: %d\n"
 
-#: build/pack.c:546
+#: build/pack.c:567
 #, fuzzy
 msgid "Unable to reload signature header.\n"
 msgstr "Nie mo¿na odczytaæ ikony: %s"
 
-#: build/pack.c:554
+#: build/pack.c:575
 #, fuzzy, c-format
 msgid "Could not open %s: %s\n"
 msgstr "Nie mo¿na otworzyæ %s\n"
 
-#: build/pack.c:590 lib/psm.c:2149
+#: build/pack.c:611 lib/psm.c:2153
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Nie mo¿na zapisaæ pakietu: %s"
 
-#: build/pack.c:605
+#: build/pack.c:626
 #, fuzzy, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "Nie mo¿na odczytaæ sigtarget: %s"
 
-#: build/pack.c:615
+#: build/pack.c:636
 #, fuzzy, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "Nie mo¿na odczytaæ ikony: %s"
 
-#: build/pack.c:629
+#: build/pack.c:650
 #, fuzzy, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "Nie mo¿na zapisaæ pakietu: %s"
 
-#: build/pack.c:639
+#: build/pack.c:660
 #, fuzzy, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "Nie mo¿na odczytaæ ikony: %s"
 
-#: build/pack.c:645
+#: build/pack.c:666
 #, fuzzy, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Nie mo¿na zapisaæ pakietu: %s"
 
-#: build/pack.c:670 lib/psm.c:2415
+#: build/pack.c:691 lib/psm.c:2419
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Zapisano: %s\n"
 
-#: build/pack.c:737
+#: build/pack.c:758
 #, 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:754
+#: build/pack.c:775
 #, fuzzy, c-format
 msgid "cannot create %s: %s\n"
 msgstr "nie mo¿na utworzyæ %s"
@@ -1483,61 +1483,61 @@ msgstr ""
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1248 lib/depends.c:1381
+#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1248 lib/depends.c:1381
+#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
 #, fuzzy
 msgid "NO "
 msgstr "NIE DOBRZE"
 
-#: lib/depends.c:1042
+#: lib/depends.c:1044
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:1153
+#: lib/depends.c:1155
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:1247
+#: lib/depends.c:1249
 #, fuzzy, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr "plik %s nie nale¿y do ¿adnego pakietu\n"
 
-#: lib/depends.c:1276
+#: lib/depends.c:1278
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1293
+#: lib/depends.c:1295
 #, fuzzy, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "plik %s nie nale¿y do ¿adnego pakietu\n"
 
-#: lib/depends.c:1317
+#: lib/depends.c:1319
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1330
+#: lib/depends.c:1332
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1344
+#: lib/depends.c:1346
 #, fuzzy, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr "plik %s nie nale¿y do ¿adnego pakietu\n"
 
-#: lib/depends.c:1360
+#: lib/depends.c:1362
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1381
+#: lib/depends.c:1383
 #, fuzzy, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "plik %s nie nale¿y do ¿adnego pakietu\n"
@@ -1545,42 +1545,42 @@ msgstr "plik %s nie nale¿y do ¿adnego pakietu\n"
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1454
+#: lib/depends.c:1456
 #, 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:1533
+#: lib/depends.c:1535
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "pakiet %s jest w konflikcie: %s\n"
 
-#: lib/depends.c:1786
+#: lib/depends.c:1788
 #, fuzzy, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr "usuwanie indeksu grupy\n"
 
 #. Record all relations.
-#: lib/depends.c:1936
+#: lib/depends.c:1938
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1996
+#: lib/depends.c:1998
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2046
+#: lib/depends.c:2048
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:2099
+#: lib/depends.c:2101
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:2129
+#: lib/depends.c:2131
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -1769,19 +1769,49 @@ msgstr "(nieznany typ)"
 msgid "error creating temporary file %s\n"
 msgstr "b³±d w tworzeniu pliku tymczasowego %s"
 
-#: lib/package.c:161
+#: lib/package.c:167 lib/package.c:238
 #, fuzzy
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr ""
 "tylko pakiety z numerem g³ównym <= 3 s± obs³ugiwane przez t± wersjê RPM'a"
 
-#: lib/package.c:184
+#: lib/package.c:188 lib/package.c:246
 #, fuzzy
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 "tylko pakiety z numerem g³ównym <= 3 s± obs³ugiwane przez t± wersjê RPM'a"
 
+#: lib/package.c:224 lib/rpmchecksig.c:158 lib/rpmchecksig.c:506
+#, c-format
+msgid "%s: readLead failed\n"
+msgstr "%s: readLead nie powiod³o siê\n"
+
+#: lib/package.c:230
+#, fuzzy, c-format
+msgid "%s: bad magic\n"
+msgstr "B³êdny magic"
+
+#: lib/package.c:254 lib/rpmchecksig.c:176 lib/rpmchecksig.c:522
+#, c-format
+msgid "%s: rpmReadSignature failed\n"
+msgstr "%s: rpmReadSignature nie powiod³o siê\n"
+
+#: lib/package.c:258 lib/rpmchecksig.c:180 lib/rpmchecksig.c:527
+#, c-format
+msgid "%s: No signature available\n"
+msgstr "%s: Sygnatura nie jest dostêpna\n"
+
+#: lib/package.c:284
+#, fuzzy, c-format
+msgid "%s: headerRead failed\n"
+msgstr "%s: readLead nie powiod³o siê\n"
+
+#: lib/package.c:303 lib/rpmchecksig.c:109 lib/rpmchecksig.c:450
+#, fuzzy, c-format
+msgid "%s: Fread failed: %s\n"
+msgstr "%s: readLead nie powiod³o siê\n"
+
 #: lib/poptI.c:47
 msgid "exclude paths must begin with a /"
 msgstr "¶cie¿ki wy³±czeñ musz± siê zaczynaæ od /"
@@ -2320,280 +2350,255 @@ msgstr "nie mo¿na utworzyæ %s"
 msgid "cannot write to %%%s %s\n"
 msgstr "nie mo¿na zapisaæ do %s"
 
-#: lib/psm.c:1214
+#: lib/psm.c:1217
 #, fuzzy
 msgid "source package expected, binary found\n"
 msgstr "spodziewany pakiet ¼ród³owy a nie binarny"
 
-#: lib/psm.c:1325
+#: lib/psm.c:1330
 #, fuzzy
 msgid "source package contains no .spec file\n"
 msgstr "pakiet ¼ród³owy nie zawiera pliku .spec"
 
-#: lib/psm.c:1432
+#: lib/psm.c:1436
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "uruchamianie skryptu postinstall (je¶li istnieje)\n"
 
-#: lib/psm.c:1600
+#: lib/psm.c:1604
 #, fuzzy, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr "wykonanie skryptu nie powiod³o siê"
 
-#: lib/psm.c:1607
+#: lib/psm.c:1611
 #, fuzzy, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr "wykonanie skryptu nie powiod³o siê"
 
-#: lib/psm.c:1954
+#: lib/psm.c:1958
 #, fuzzy, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr "pakiet: %s-%s-%s test plików = %d\n"
 
-#: lib/psm.c:2071
+#: lib/psm.c:2075
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2186
+#: lib/psm.c:2190
 #, fuzzy, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "u¿ytkownik %s nie istnieje - u¿yto konta root"
 
-#: lib/psm.c:2195
+#: lib/psm.c:2199
 #, fuzzy, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "grupa %s nie istnieje - u¿yto grupy root"
 
-#: lib/psm.c:2236
+#: lib/psm.c:2240
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "rozpakowanie archiwum nie powiod³o siê %s%s: %s"
 
-#: lib/psm.c:2237
+#: lib/psm.c:2241
 msgid " on file "
 msgstr " na pliku "
 
-#: lib/psm.c:2423
+#: lib/psm.c:2427
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "nie mo¿na otworzyæ %s: %s"
 
-#: lib/psm.c:2426
+#: lib/psm.c:2430
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s nie powiod³o siê"
 
-#: lib/query.c:128
+#: lib/query.c:124
 #, fuzzy, c-format
 msgid "incorrect format: %s\n"
 msgstr "b³±d w formacie: %s\n"
 
-#: lib/query.c:225
+#: lib/query.c:221
 msgid "(contains no files)"
 msgstr "(nie zawiera plików)"
 
-#: lib/query.c:286
+#: lib/query.c:282
 msgid "normal        "
 msgstr "normalny      "
 
-#: lib/query.c:289
+#: lib/query.c:285
 msgid "replaced      "
 msgstr "zast±piony    "
 
-#: lib/query.c:292
+#: lib/query.c:288
 msgid "not installed "
 msgstr "niezainstalowany"
 
-#: lib/query.c:295
+#: lib/query.c:291
 msgid "net shared    "
 msgstr "udostêpniony w sieci"
 
-#: lib/query.c:298
+#: lib/query.c:294
 #, c-format
 msgid "(unknown %3d) "
 msgstr "(nieznany %3d)"
 
-#: lib/query.c:303
+#: lib/query.c:299
 msgid "(no state)    "
 msgstr "(brak statusu)"
 
-#: lib/query.c:322 lib/query.c:378
+#: lib/query.c:318 lib/query.c:374
 #, fuzzy
 msgid "package has neither file owner or id lists\n"
 msgstr "pakiet nie ma ani w³a¶ciciela pliku ani list id"
 
-#: lib/query.c:467
+#: lib/query.c:463
 #, fuzzy, c-format
 msgid "can't query %s: %s\n"
 msgstr "nie mo¿na odwi±zaæ %s: %s\n"
 
-#: lib/query.c:582 lib/rpmchecksig.c:159 lib/rpmchecksig.c:492
-#, c-format
-msgid "%s: readLead failed\n"
-msgstr "%s: readLead nie powiod³o siê\n"
-
-#: lib/query.c:588 lib/rpmchecksig.c:498
-#, c-format
-msgid "%s: No signature available (v1.0 RPM)\n"
-msgstr "%s: Sygnatura nie jest dostêpna (v1.0 RPM)\n"
-
-#: lib/query.c:597 lib/rpmchecksig.c:177 lib/rpmchecksig.c:508
-#, c-format
-msgid "%s: rpmReadSignature failed\n"
-msgstr "%s: rpmReadSignature nie powiod³o siê\n"
-
-#: lib/query.c:601 lib/rpmchecksig.c:181 lib/rpmchecksig.c:513
-#, c-format
-msgid "%s: No signature available\n"
-msgstr "%s: Sygnatura nie jest dostêpna\n"
-
-#: lib/query.c:624
-#, fuzzy, c-format
-msgid "%s: headerRead failed\n"
-msgstr "%s: readLead nie powiod³o siê\n"
-
-#: lib/query.c:641 lib/rpmchecksig.c:110 lib/rpmchecksig.c:287
-#, fuzzy, c-format
-msgid "%s: Fread failed: %s\n"
-msgstr "%s: readLead nie powiod³o siê\n"
-
-#: lib/query.c:758 lib/query.c:796 lib/rpminstall.c:324 lib/rpminstall.c:468
-#: lib/rpminstall.c:848
+#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463
+#: lib/rpminstall.c:838
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "otwarcie %s nie powiod³o siê\n"
 
-#: lib/query.c:774
+#: lib/query.c:616
 #, c-format
 msgid "query of %s failed\n"
 msgstr "odpytywanie %s nie powiod³o siê\n"
 
-#: lib/query.c:780
+#: lib/query.c:622
 msgid "old format source packages cannot be queried\n"
 msgstr "pakiety w starym formacie nie mog± byæ odpytywane\n"
 
-#: lib/query.c:806 lib/rpminstall.c:481
+#: lib/query.c:648 lib/rpminstall.c:476
 #, fuzzy, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: readLead nie powiod³o siê\n"
 
-#: lib/query.c:850
+#: lib/query.c:692
 #, 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:874
+#: lib/query.c:716
 #, fuzzy
 msgid "no packages\n"
 msgstr "znaleziono %d pakietów\n"
 
-#: lib/query.c:894
+#: lib/query.c:736
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "grupa %s nie zawiera ¿adnych pakietów\n"
 
-#: lib/query.c:904
+#: lib/query.c:746
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "¿aden pakiet nie zahacza %s\n"
 
-#: lib/query.c:914
+#: lib/query.c:756
 #, c-format
 msgid "no package requires %s\n"
 msgstr "¿aden pakiet nie wymaga %s\n"
 
-#: lib/query.c:925
+#: lib/query.c:767
 #, c-format
 msgid "no package provides %s\n"
 msgstr "¿aden pakiet nie udostêpnia %s\n"
 
-#: lib/query.c:962
+#: lib/query.c:804
 #, c-format
 msgid "file %s: %s\n"
 msgstr "plik %s: %s\n"
 
-#: lib/query.c:966
+#: lib/query.c:808
 #, 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:993
+#: lib/query.c:835
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "b³êdny numer pakietu: %s\n"
 
-#: lib/query.c:996
+#: lib/query.c:838
 #, fuzzy, c-format
 msgid "package record number: %u\n"
 msgstr "numer rekordu pakietu: %d\n"
 
-#: lib/query.c:1001
+#: lib/query.c:843
 #, fuzzy, c-format
 msgid "record %u could not be read\n"
 msgstr "nie mo¿na odczytaæ rekordu %d\n"
 
-#: lib/query.c:1012 lib/rpminstall.c:634
+#: lib/query.c:854 lib/rpminstall.c:624
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "pakiet %s nie jest zainstalowany\n"
 
-#: lib/rpmchecksig.c:50
+#: lib/rpmchecksig.c:49
 #, fuzzy, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s: Open nie powiod³o siê\n"
 
-#: lib/rpmchecksig.c:62
+#: lib/rpmchecksig.c:61
 #, fuzzy
 msgid "makeTempFile failed\n"
 msgstr "wykonanie nie powiod³o siê\n"
 
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:103
 #, fuzzy, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: readLead nie powiod³o siê\n"
 
-#: lib/rpmchecksig.c:164
+#: lib/rpmchecksig.c:163
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr "%s: Nie mo¿na podpisaæ v1.0 RPM\n"
 
-#: lib/rpmchecksig.c:168
+#: lib/rpmchecksig.c:167
 #, 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:214
+#: lib/rpmchecksig.c:213
 #, fuzzy, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: readLead nie powiod³o siê\n"
 
-#: lib/rpmchecksig.c:220
+#: lib/rpmchecksig.c:219
 #, fuzzy, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmReadSignature nie powiod³o siê\n"
 
-#: lib/rpmchecksig.c:731
+#: lib/rpmchecksig.c:512
+#, 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:707
 msgid "NOT OK"
 msgstr "NIE DOBRZE"
 
-#: lib/rpmchecksig.c:732 lib/rpmchecksig.c:746
+#: lib/rpmchecksig.c:708 lib/rpmchecksig.c:722
 msgid " (MISSING KEYS:"
 msgstr " (BRAK KLUCZY:"
 
-#: lib/rpmchecksig.c:734 lib/rpmchecksig.c:748
+#: lib/rpmchecksig.c:710 lib/rpmchecksig.c:724
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:735 lib/rpmchecksig.c:749
+#: lib/rpmchecksig.c:711 lib/rpmchecksig.c:725
 msgid " (UNTRUSTED KEYS:"
 msgstr "(NIEWIARYGODNE KLUCZE:"
 
-#: lib/rpmchecksig.c:737 lib/rpmchecksig.c:751
+#: lib/rpmchecksig.c:713 lib/rpmchecksig.c:727
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:745
+#: lib/rpmchecksig.c:721
 msgid "OK"
 msgstr "OK"
 
@@ -2606,86 +2611,86 @@ msgstr ""
 msgid "Preparing packages for installation..."
 msgstr "nie podano nazw plików do zainstalowania"
 
-#: lib/rpminstall.c:274
+#: lib/rpminstall.c:228
+#, fuzzy, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr "nie mo¿na otworzyæ %s/packages.rpm\n"
+
+#: lib/rpminstall.c:285
 #, 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:284
+#: lib/rpminstall.c:295
 #, c-format
 msgid " ... as %s\n"
 msgstr "... jako %s\n"
 
-#: lib/rpminstall.c:288
+#: lib/rpminstall.c:299
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "%s pomijany - transmisja %s nie powiod³a siê\n"
 
-#: lib/rpminstall.c:370
-#, fuzzy, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr "nie mo¿na otworzyæ %s/packages.rpm\n"
-
-#: lib/rpminstall.c:393
+#: lib/rpminstall.c:388
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr "pakiet %s nie jest przesuwalny\n"
 
-#: lib/rpminstall.c:442
+#: lib/rpminstall.c:437
 #, c-format
 msgid "error reading from file %s\n"
 msgstr "b³±d czytania z pliku %s\n"
 
-#: lib/rpminstall.c:448
+#: lib/rpminstall.c:443
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr "plik %s wymaga nowszej wersji RPM\n"
 
-#: lib/rpminstall.c:460 lib/rpminstall.c:705
+#: lib/rpminstall.c:455 lib/rpminstall.c:694
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr "%s nie mo¿e byæ zainstalowany\n"
 
-#: lib/rpminstall.c:496
+#: lib/rpminstall.c:491
 #, 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:512
+#: lib/rpminstall.c:507
 msgid "failed dependencies:\n"
 msgstr "niespe³nione zale¿no¶ci:\n"
 
-#: lib/rpminstall.c:533
+#: lib/rpminstall.c:528
 msgid "installing binary packages\n"
 msgstr "instalacja pakietów binarnych\n"
 
-#: lib/rpminstall.c:554
+#: lib/rpminstall.c:549
 #, fuzzy, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "nie mo¿na otworzyæ pliku %s: %s"
 
-#: lib/rpminstall.c:621
+#: lib/rpminstall.c:611
 #, c-format
 msgid "cannot open %s/packages.rpm\n"
 msgstr "nie mo¿na otworzyæ %s/packages.rpm\n"
 
-#: lib/rpminstall.c:637
+#: lib/rpminstall.c:627
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" okre¶la wiele pakietów\n"
 
-#: lib/rpminstall.c:661
+#: lib/rpminstall.c:651
 msgid "removing these packages would break dependencies:\n"
 msgstr "usuniêcie tych pakietów zerwie zale¿no¶ci:\n"
 
-#: lib/rpminstall.c:691
+#: lib/rpminstall.c:680
 #, fuzzy, c-format
 msgid "cannot open %s: %s\n"
 msgstr "nie mo¿na otworzyæ %s\n"
 
-#: lib/rpminstall.c:697
+#: lib/rpminstall.c:686
 #, c-format
 msgid "Installing %s\n"
 msgstr "Instalacja %s\n"
@@ -2970,17 +2975,17 @@ msgstr ""
 "pakiet nie specyfikuje ani nazwy grupy ani list id (to nie powinno siê "
 "zdarzyæ)"
 
-#: lib/verify.c:414
+#: lib/verify.c:417
 #, fuzzy, c-format
 msgid "missing    %s"
 msgstr "brak    %s\n"
 
-#: lib/verify.c:511
+#: lib/verify.c:514
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr "Niespe³nione zale¿no¶ci dla %s-%s-%s: "
 
-#: lib/verify.c:556
+#: lib/verify.c:559
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
diff --git a/po/pt.po b/po/pt.po
index 6d8e9b800..be8549faa 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-24 21:17-0400\n"
+"POT-Creation-Date: 2001-10-26 00:15-0400\n"
 "PO-Revision-Date: 2000-06-22 01:13+01:00\n"
 "Last-Translator: José Nuno Coelho Sanarra Pires\n"
 "Language-Team: pt <kde@poli.org>\n"
@@ -65,15 +65,15 @@ msgstr "A construir plataformas alvo: %s\n"
 msgid "Building for target %s\n"
 msgstr "A construir para o alvo %s\n"
 
-#: rpm2cpio.c:34
+#: rpm2cpio.c:55
 msgid "argument is not an RPM package\n"
 msgstr "o argumento não é um pacote RPM\n"
 
-#: rpm2cpio.c:38
+#: rpm2cpio.c:61
 msgid "error reading header from package\n"
 msgstr "erro ao ler o cabeçalho do pacote\n"
 
-#: rpm2cpio.c:60
+#: rpm2cpio.c:83
 #, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr "não consigo aceder de novo ao conteúdo: %s\n"
@@ -394,44 +394,44 @@ msgstr "o --sign só pode ser usado na criação do pacote"
 msgid "exec failed\n"
 msgstr "o exec falhou\n"
 
-#: rpmqv.c:959
+#: rpmqv.c:963
 msgid "no packages files given for rebuild"
 msgstr "não foram indicados pacotes para a reconstrução"
 
-#: rpmqv.c:1026
+#: rpmqv.c:1038
 msgid "no spec files given for build"
 msgstr "não foram indicados ficheiros spec para a criação"
 
-#: rpmqv.c:1028
+#: rpmqv.c:1040
 msgid "no tar files given for build"
 msgstr "não foram indicados ficheiros tar para a criação"
 
-#: rpmqv.c:1047
+#: rpmqv.c:1059
 msgid "no packages given for uninstall"
 msgstr "não foram indicados pacote para desinstalar"
 
-#: rpmqv.c:1058
+#: rpmqv.c:1070
 msgid "no packages given for install"
 msgstr "não foram indicados pacotes para instalar"
 
-#: rpmqv.c:1106
+#: rpmqv.c:1118
 msgid "no arguments given for query"
 msgstr "não foram indicados argumentos para a pesquisa"
 
-#: rpmqv.c:1120
+#: rpmqv.c:1132
 msgid "no arguments given for verify"
 msgstr "não foram indicados argumentos para a verificação"
 
-#: rpmqv.c:1128
+#: rpmqv.c:1140
 msgid "unexpected arguments to --querytags "
 msgstr "argumentos inesperados no --querytags "
 
-#: rpmqv.c:1144
+#: rpmqv.c:1156
 #, fuzzy
 msgid "no arguments given"
 msgstr "não foram indicados argumentos para a pesquisa"
 
-#: build/build.c:125 build/pack.c:466
+#: build/build.c:125 build/pack.c:487
 msgid "Unable to open temp file.\n"
 msgstr "Não consegui abrir um ficheiro temporário.\n"
 
@@ -642,7 +642,7 @@ msgstr "Ficheiro não encontrado pelo glob: %s\n"
 msgid "Could not open %%files file %s: %s\n"
 msgstr "Não consegui abrir o ficheiro do %%files %s: %s\n"
 
-#: build/files.c:1777 build/pack.c:145
+#: build/files.c:1777 build/pack.c:148
 #, c-format
 msgid "line: %s\n"
 msgstr "linha: %s\n"
@@ -719,156 +719,156 @@ msgstr "getGnameS: demasiados gid's\n"
 msgid "Could not canonicalize hostname: %s\n"
 msgstr "Não consegui canonizar o nome da máquina: %s\n"
 
-#: build/pack.c:78
+#: build/pack.c:81
 #, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr "a criação do pacote falhou no ficheiro %s: %s\n"
 
-#: build/pack.c:81
+#: build/pack.c:84
 #, fuzzy, c-format
 msgid "create archive failed: %s\n"
 msgstr "a criação do pacote falhou no ficheiro %s: %s\n"
 
-#: build/pack.c:103
+#: build/pack.c:106
 #, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr "a escrita do cpio_copy falhou: %s\n"
 
-#: build/pack.c:110
+#: build/pack.c:113
 #, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr "a leitura do cpio_copy falhou: %s\n"
 
-#: build/pack.c:213
+#: build/pack.c:216
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr "Não consegui abrir o ficheiro PreIn: %s\n"
 
-#: build/pack.c:220
+#: build/pack.c:223
 #, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr "Não consegui abrir o ficheiro PreUn: %s\n"
 
-#: build/pack.c:227
+#: build/pack.c:230
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr "Não consegui abrir o ficheiro PostIn: %s\n"
 
-#: build/pack.c:234
+#: build/pack.c:237
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr "Não consegui abrir o ficheiro PostUn: %s\n"
 
-#: build/pack.c:242
+#: build/pack.c:245
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr "Não consegui abrir o ficheiro VerifyScript: %s\n"
 
-#: build/pack.c:257
+#: build/pack.c:260
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr "Não consegui aceder ao 'script' Trigger: %s\n"
 
-#: build/pack.c:285
+#: build/pack.c:288
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "readRPM: aceder ao %s: %s\n"
 
-#: build/pack.c:295
+#: build/pack.c:298
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr "readRPM: ler o %s: %s\n"
 
-#: build/pack.c:304 build/pack.c:508
+#: build/pack.c:307 build/pack.c:529
 #, fuzzy, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: O fread falhou: %s\n"
 
-#: build/pack.c:320
+#: build/pack.c:341
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr "readRPM: o %s não é um pacote RPM\n"
 
-#: build/pack.c:329
+#: build/pack.c:350
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: a ler o cabeçalho do %s\n"
 
-#: build/pack.c:454
+#: build/pack.c:475
 #, fuzzy
 msgid "Unable to create immutable header region.\n"
 msgstr "Não consegui ler o cabeçalho de %s: %s\n"
 
-#: build/pack.c:472
+#: build/pack.c:493
 #, fuzzy
 msgid "Unable to write temp header\n"
 msgstr "Não consegui gravar o cabeçalho de %s: %s\n"
 
-#: build/pack.c:480
+#: build/pack.c:501
 msgid "Bad CSA data\n"
 msgstr "Dados de CSA inválidos\n"
 
-#: build/pack.c:515
+#: build/pack.c:536
 #, fuzzy
 msgid "Unable to write final header\n"
 msgstr "Não consegui gravar o cabeçalho de %s: %s\n"
 
-#: build/pack.c:533
+#: build/pack.c:554
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "A gerar a assinatura: %d\n"
 
-#: build/pack.c:546
+#: build/pack.c:567
 #, fuzzy
 msgid "Unable to reload signature header.\n"
 msgstr "Não consegui ler o cabeçalho de %s: %s\n"
 
-#: build/pack.c:554
+#: build/pack.c:575
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr "Não consigo aceder ao %s: %s\n"
 
-#: build/pack.c:590 lib/psm.c:2149
+#: build/pack.c:611 lib/psm.c:2153
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Não consegui gravar o pacote: %s\n"
 
-#: build/pack.c:605
+#: build/pack.c:626
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "Não consegui abrir o sigtarget %s: %s\n"
 
-#: build/pack.c:615
+#: build/pack.c:636
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "Não consegui ler o cabeçalho de %s: %s\n"
 
-#: build/pack.c:629
+#: build/pack.c:650
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "Não consegui gravar o cabeçalho de %s: %s\n"
 
-#: build/pack.c:639
+#: build/pack.c:660
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "Não consegui ler o conteúdo de %s: %s\n"
 
-#: build/pack.c:645
+#: build/pack.c:666
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Não consegui escrever o conteúdo de %s: %s\n"
 
-#: build/pack.c:670 lib/psm.c:2415
+#: build/pack.c:691 lib/psm.c:2419
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Gravei: %s\n"
 
-#: build/pack.c:737
+#: build/pack.c:758
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr "Não consigo gerar o ficheiro de saída para o pacote %s: %s\n"
 
-#: build/pack.c:754
+#: build/pack.c:775
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr "não consigo criar o %s: %s\n"
@@ -1440,61 +1440,61 @@ msgstr ""
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s     A %s\tB %s\n"
 
-#: lib/depends.c:585 lib/depends.c:1248 lib/depends.c:1381
+#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1248 lib/depends.c:1381
+#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
 #, fuzzy
 msgid "NO "
 msgstr "NÃO-OK"
 
-#: lib/depends.c:1042
+#: lib/depends.c:1044
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr "%s: %-45s SIM (ficheiros adicionados)\n"
 
-#: lib/depends.c:1153
+#: lib/depends.c:1155
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr "%s: %-45s SIM (oferecidos para adição)\n"
 
-#: lib/depends.c:1247
+#: lib/depends.c:1249
 #, fuzzy, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr "%s: %-45s %-3s (em cache)\n"
 
-#: lib/depends.c:1276
+#: lib/depends.c:1278
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr "%s: %-45s SIM (oferecidos pelo rpmrc)\n"
 
-#: lib/depends.c:1293
+#: lib/depends.c:1295
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "%s: %-45s SIM (oferecidos pela rpmlib)\n"
 
-#: lib/depends.c:1317
+#: lib/depends.c:1319
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr "%s: %-45s SIM (ficheiros db)\n"
 
-#: lib/depends.c:1330
+#: lib/depends.c:1332
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr "%s: %-45s SI (oferecidos pelo db)\n"
 
-#: lib/depends.c:1344
+#: lib/depends.c:1346
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr "%s: %-45s SIM (pacote db)\n"
 
-#: lib/depends.c:1360
+#: lib/depends.c:1362
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr "%s: %-45s NÃO\n"
 
-#: lib/depends.c:1381
+#: lib/depends.c:1383
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: (%s, %s) adicionado à cache de dependências.\n"
@@ -1502,42 +1502,42 @@ msgstr "%s: (%s, %s) adicionado à cache de dependências.\n"
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1454
+#: lib/depends.c:1456
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "requisito %s-%s-%s do pacote não satisfeito: %s\n"
 
 #. conflicts exist.
-#: lib/depends.c:1533
+#: lib/depends.c:1535
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "o pacote %s está em conflito: %s\n"
 
-#: lib/depends.c:1786
+#: lib/depends.c:1788
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr "a remover o %s-%s-%s \"%s\" das relações do tsort.\n"
 
 #. Record all relations.
-#: lib/depends.c:1936
+#: lib/depends.c:1938
 msgid "========== recording tsort relations\n"
 msgstr "=========== a guardar as relações do tsort\n"
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1996
+#: lib/depends.c:1998
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2046
+#: lib/depends.c:2048
 msgid "========== successors only (presentation order)\n"
 msgstr "========== só os sucessores (ordem de apresentação)\n"
 
-#: lib/depends.c:2099
+#: lib/depends.c:2101
 msgid "LOOP:\n"
 msgstr "CICLO:\n"
 
-#: lib/depends.c:2129
+#: lib/depends.c:2131
 msgid "========== continuing tsort ...\n"
 msgstr "========== a prosseguir o tsort ...\n"
 
@@ -1725,15 +1725,45 @@ msgstr "(tipo desconhecido)"
 msgid "error creating temporary file %s\n"
 msgstr "erro ao criar o ficheiro temporário %s\n"
 
-#: lib/package.c:161
+#: lib/package.c:167 lib/package.c:238
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr "a versão 1 dos pacotes não é suportada por esta versão do RPM\n"
 
-#: lib/package.c:184
+#: lib/package.c:188 lib/package.c:246
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr "só os pacotes com versão <= 4 são suportados por esta versão do RPM\n"
 
+#: lib/package.c:224 lib/rpmchecksig.c:158 lib/rpmchecksig.c:506
+#, c-format
+msgid "%s: readLead failed\n"
+msgstr ":%s: o readLead falhou\n"
+
+#: lib/package.c:230
+#, fuzzy, c-format
+msgid "%s: bad magic\n"
+msgstr "Código de integridade inválido"
+
+#: lib/package.c:254 lib/rpmchecksig.c:176 lib/rpmchecksig.c:522
+#, c-format
+msgid "%s: rpmReadSignature failed\n"
+msgstr "%s: o rpmReadSignature falhou\n"
+
+#: lib/package.c:258 lib/rpmchecksig.c:180 lib/rpmchecksig.c:527
+#, c-format
+msgid "%s: No signature available\n"
+msgstr "%s: Nenhuma assinatura disponível\n"
+
+#: lib/package.c:284
+#, fuzzy, c-format
+msgid "%s: headerRead failed\n"
+msgstr ":%s: o readLead falhou\n"
+
+#: lib/package.c:303 lib/rpmchecksig.c:109 lib/rpmchecksig.c:450
+#, c-format
+msgid "%s: Fread failed: %s\n"
+msgstr "%s: O fread falhou: %s\n"
+
 #: lib/poptI.c:47
 msgid "exclude paths must begin with a /"
 msgstr "as directorias de exclusão têm de começar por /"
@@ -2250,275 +2280,250 @@ msgstr "não consigo criar o %s: %s\n"
 msgid "cannot write to %%%s %s\n"
 msgstr "não consigo escrever em %s\n"
 
-#: lib/psm.c:1214
+#: lib/psm.c:1217
 msgid "source package expected, binary found\n"
 msgstr "esperava-se um pacote com código-fonte, foi encontrado um pacote binário\n"
 
-#: lib/psm.c:1325
+#: lib/psm.c:1330
 msgid "source package contains no .spec file\n"
 msgstr "o pacote de código-fonte não contem um ficheiro .spec\n"
 
-#: lib/psm.c:1432
+#: lib/psm.c:1436
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "a correr os programas de pós-instalação (se existirem)\n"
 
-#: lib/psm.c:1600
+#: lib/psm.c:1604
 #, fuzzy, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr "a execução do 'scriptlet' %s do %s-%s-%s falhou com código de erro %d\n"
 
-#: lib/psm.c:1607
+#: lib/psm.c:1611
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr "a execução do 'scriptlet' %s do %s-%s-%s falhou com código de erro %d\n"
 
-#: lib/psm.c:1954
+#: lib/psm.c:1958
 #, fuzzy, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr "pacote: teste dos ficheiros do %s-%s-%s = %d\n"
 
-#: lib/psm.c:2071
+#: lib/psm.c:2075
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2186
+#: lib/psm.c:2190
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "o utilizador %s não existe - a usar o root\n"
 
-#: lib/psm.c:2195
+#: lib/psm.c:2199
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "o grupo %s não existe - a usar o root\n"
 
-#: lib/psm.c:2236
+#: lib/psm.c:2240
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "a abertura do pacote falhou%s%s: %s\n"
 
-#: lib/psm.c:2237
+#: lib/psm.c:2241
 msgid " on file "
 msgstr " no ficheiro "
 
-#: lib/psm.c:2423
+#: lib/psm.c:2427
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "falhei ao aceder ao %s: %s\n"
 
-#: lib/psm.c:2426
+#: lib/psm.c:2430
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "O %s falhou\n"
 
-#: lib/query.c:128
+#: lib/query.c:124
 #, c-format
 msgid "incorrect format: %s\n"
 msgstr "formato incorrecto: %s\n"
 
-#: lib/query.c:225
+#: lib/query.c:221
 msgid "(contains no files)"
 msgstr "(não contém ficheiros)"
 
-#: lib/query.c:286
+#: lib/query.c:282
 msgid "normal        "
 msgstr "normal        "
 
-#: lib/query.c:289
+#: lib/query.c:285
 msgid "replaced      "
 msgstr "substituído   "
 
-#: lib/query.c:292
+#: lib/query.c:288
 msgid "not installed "
 msgstr "não instalado "
 
-#: lib/query.c:295
+#: lib/query.c:291
 msgid "net shared    "
 msgstr "partilhado"
 
-#: lib/query.c:298
+#: lib/query.c:294
 #, c-format
 msgid "(unknown %3d) "
 msgstr "(desconhecido %3d)"
 
-#: lib/query.c:303
+#: lib/query.c:299
 msgid "(no state)    "
 msgstr "(sem estado)  "
 
-#: lib/query.c:322 lib/query.c:378
+#: lib/query.c:318 lib/query.c:374
 msgid "package has neither file owner or id lists\n"
 msgstr "o pacote nem tem um dono do ficheiro ou as listas de IDs\n"
 
-#: lib/query.c:467
+#: lib/query.c:463
 #, c-format
 msgid "can't query %s: %s\n"
 msgstr "não consigo pesquisar o %s: %s\n"
 
-#: lib/query.c:582 lib/rpmchecksig.c:159 lib/rpmchecksig.c:492
-#, c-format
-msgid "%s: readLead failed\n"
-msgstr ":%s: o readLead falhou\n"
-
-#: lib/query.c:588 lib/rpmchecksig.c:498
-#, c-format
-msgid "%s: No signature available (v1.0 RPM)\n"
-msgstr "%s: Nenhuma assinatura disponível (RPM v1.0)\n"
-
-#: lib/query.c:597 lib/rpmchecksig.c:177 lib/rpmchecksig.c:508
-#, c-format
-msgid "%s: rpmReadSignature failed\n"
-msgstr "%s: o rpmReadSignature falhou\n"
-
-#: lib/query.c:601 lib/rpmchecksig.c:181 lib/rpmchecksig.c:513
-#, c-format
-msgid "%s: No signature available\n"
-msgstr "%s: Nenhuma assinatura disponível\n"
-
-#: lib/query.c:624
-#, fuzzy, c-format
-msgid "%s: headerRead failed\n"
-msgstr ":%s: o readLead falhou\n"
-
-#: lib/query.c:641 lib/rpmchecksig.c:110 lib/rpmchecksig.c:287
-#, c-format
-msgid "%s: Fread failed: %s\n"
-msgstr "%s: O fread falhou: %s\n"
-
-#: lib/query.c:758 lib/query.c:796 lib/rpminstall.c:324 lib/rpminstall.c:468
-#: lib/rpminstall.c:848
+#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463
+#: lib/rpminstall.c:838
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "o acesso ao %s falhou: %s\n"
 
-#: lib/query.c:774
+#: lib/query.c:616
 #, c-format
 msgid "query of %s failed\n"
 msgstr "a pesquisa do %s falhou\n"
 
-#: lib/query.c:780
+#: lib/query.c:622
 msgid "old format source packages cannot be queried\n"
 msgstr "os pacotes com código-fonte no formato antigo não podem ser pesquisados\n"
 
-#: lib/query.c:806 lib/rpminstall.c:481
+#: lib/query.c:648 lib/rpminstall.c:476
 #, fuzzy, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: O fread falhou: %s\n"
 
-#: lib/query.c:850
+#: lib/query.c:692
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "a pesquisa do ficheiro spec %s falhou, não consigo analisar\n"
 
-#: lib/query.c:874
+#: lib/query.c:716
 msgid "no packages\n"
 msgstr "nenhum pacote\n"
 
-#: lib/query.c:894
+#: lib/query.c:736
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "o grupo %s não contém nenhum pacote\n"
 
-#: lib/query.c:904
+#: lib/query.c:746
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "nenhum pacote activa o %s\n"
 
-#: lib/query.c:914
+#: lib/query.c:756
 #, c-format
 msgid "no package requires %s\n"
 msgstr "nenhum pacote precisa do %s\n"
 
-#: lib/query.c:925
+#: lib/query.c:767
 #, c-format
 msgid "no package provides %s\n"
 msgstr "nenhum pacote oferece o %s\n"
 
-#: lib/query.c:962
+#: lib/query.c:804
 #, c-format
 msgid "file %s: %s\n"
 msgstr "ficheiro %s: %s\n"
 
-#: lib/query.c:966
+#: lib/query.c:808
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "o ficheiro %s não pertence a nenhum pacote\n"
 
-#: lib/query.c:993
+#: lib/query.c:835
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "número de pacote inválido: %s\n"
 
-#: lib/query.c:996
+#: lib/query.c:838
 #, c-format
 msgid "package record number: %u\n"
 msgstr "número de registo do pacote: %u\n"
 
-#: lib/query.c:1001
+#: lib/query.c:843
 #, fuzzy, c-format
 msgid "record %u could not be read\n"
 msgstr "o registo %d não pôde ser lido\n"
 
-#: lib/query.c:1012 lib/rpminstall.c:634
+#: lib/query.c:854 lib/rpminstall.c:624
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "o pacote %s não está instalado\n"
 
-#: lib/rpmchecksig.c:50
+#: lib/rpmchecksig.c:49
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s: o acesso falhou: %s\n"
 
-#: lib/rpmchecksig.c:62
+#: lib/rpmchecksig.c:61
 msgid "makeTempFile failed\n"
 msgstr "o makeTempFile falhou\n"
 
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:103
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: O fwrite falhou: %s\n"
 
-#: lib/rpmchecksig.c:164
+#: lib/rpmchecksig.c:163
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr "%s: Não consigo assinar o RPM v1.0\n"
 
-#: lib/rpmchecksig.c:168
+#: lib/rpmchecksig.c:167
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr "%s: não consigo assinar de novo o RPM v2.0\n"
 
-#: lib/rpmchecksig.c:214
+#: lib/rpmchecksig.c:213
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: o writeLead falhou: %s\n"
 
-#: lib/rpmchecksig.c:220
+#: lib/rpmchecksig.c:219
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: o rpmWriteSignature falhou: %s\n"
 
-#: lib/rpmchecksig.c:731
+#: lib/rpmchecksig.c:512
+#, c-format
+msgid "%s: No signature available (v1.0 RPM)\n"
+msgstr "%s: Nenhuma assinatura disponível (RPM v1.0)\n"
+
+#: lib/rpmchecksig.c:707
 msgid "NOT OK"
 msgstr "NÃO-OK"
 
-#: lib/rpmchecksig.c:732 lib/rpmchecksig.c:746
+#: lib/rpmchecksig.c:708 lib/rpmchecksig.c:722
 msgid " (MISSING KEYS:"
 msgstr " (FALTAM AS CHAVES:"
 
-#: lib/rpmchecksig.c:734 lib/rpmchecksig.c:748
+#: lib/rpmchecksig.c:710 lib/rpmchecksig.c:724
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:735 lib/rpmchecksig.c:749
+#: lib/rpmchecksig.c:711 lib/rpmchecksig.c:725
 msgid " (UNTRUSTED KEYS:"
 msgstr " (CHAVES SUSPEITAS:"
 
-#: lib/rpmchecksig.c:737 lib/rpmchecksig.c:751
+#: lib/rpmchecksig.c:713 lib/rpmchecksig.c:727
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:745
+#: lib/rpmchecksig.c:721
 msgid "OK"
 msgstr "OK"
 
@@ -2530,86 +2535,86 @@ msgstr "A preparar..."
 msgid "Preparing packages for installation..."
 msgstr "A preparar os pacotes para a instalação..."
 
-#: lib/rpminstall.c:274
+#: lib/rpminstall.c:228
+#, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr "não consigo abrir a base de dados Packages em %s\n"
+
+#: lib/rpminstall.c:285
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "A obter o %s\n"
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:284
+#: lib/rpminstall.c:295
 #, c-format
 msgid " ... as %s\n"
 msgstr " ... como %s\n"
 
-#: lib/rpminstall.c:288
+#: lib/rpminstall.c:299
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "a ignorar o %s - a transferência falhou - %s\n"
 
-#: lib/rpminstall.c:370
-#, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr "não consigo abrir a base de dados Packages em %s\n"
-
-#: lib/rpminstall.c:393
+#: lib/rpminstall.c:388
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr "o pacote %s não pode ser mudado de sítio\n"
 
-#: lib/rpminstall.c:442
+#: lib/rpminstall.c:437
 #, c-format
 msgid "error reading from file %s\n"
 msgstr "erro ao ler do ficheiros %s\n"
 
-#: lib/rpminstall.c:448
+#: lib/rpminstall.c:443
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr "o %s precisa duma versão mais recente do RPM\n"
 
-#: lib/rpminstall.c:460 lib/rpminstall.c:705
+#: lib/rpminstall.c:455 lib/rpminstall.c:694
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr "o %s não pode ser instalado\n"
 
-#: lib/rpminstall.c:496
+#: lib/rpminstall.c:491
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "encontrados %d pacotes com código-fonte e %d binários\n"
 
-#: lib/rpminstall.c:512
+#: lib/rpminstall.c:507
 msgid "failed dependencies:\n"
 msgstr "dependências falhadas:\n"
 
-#: lib/rpminstall.c:533
+#: lib/rpminstall.c:528
 msgid "installing binary packages\n"
 msgstr "a instalar os pacotes binários\n"
 
-#: lib/rpminstall.c:554
+#: lib/rpminstall.c:549
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "não consigo aceder ao ficheiro %s: %s\n"
 
-#: lib/rpminstall.c:621
+#: lib/rpminstall.c:611
 #, c-format
 msgid "cannot open %s/packages.rpm\n"
 msgstr "não consigo abrir %s/packages.rpm\n"
 
-#: lib/rpminstall.c:637
+#: lib/rpminstall.c:627
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "o \"%s\" especifica vários pacotes\n"
 
-#: lib/rpminstall.c:661
+#: lib/rpminstall.c:651
 msgid "removing these packages would break dependencies:\n"
 msgstr "a remoção destes pacotes irá quebrar dependências:\n"
 
-#: lib/rpminstall.c:691
+#: lib/rpminstall.c:680
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr "não consigo aceder ao %s: %s\n"
 
-#: lib/rpminstall.c:697
+#: lib/rpminstall.c:686
 #, c-format
 msgid "Installing %s\n"
 msgstr "A instalar o %s\n"
@@ -2878,17 +2883,17 @@ msgstr "o pacote não tem o nome de utilizador nem as listas de IDs (nunca deve o
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr "o pacote não tem o nome do grupo nem as listas de IDs (nunca deve ocorrer)\n"
 
-#: lib/verify.c:414
+#: lib/verify.c:417
 #, c-format
 msgid "missing    %s"
 msgstr "falta     %s"
 
-#: lib/verify.c:511
+#: lib/verify.c:514
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr "Dependências não satisfeitas para o %s-%s-%s: "
 
-#: lib/verify.c:556
+#: lib/verify.c:559
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index b9cdf9954..16d723121 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-24 21:17-0400\n"
+"POT-Creation-Date: 2001-10-26 00:15-0400\n"
 
 # , c-format
 #: build.c:37
@@ -69,16 +69,16 @@ msgstr ""
 msgid "Building for target %s\n"
 msgstr "instale pacote"
 
-#: rpm2cpio.c:34
+#: rpm2cpio.c:55
 msgid "argument is not an RPM package\n"
 msgstr ""
 
-#: rpm2cpio.c:38
+#: rpm2cpio.c:61
 msgid "error reading header from package\n"
 msgstr ""
 
 # , c-format
-#: rpm2cpio.c:60
+#: rpm2cpio.c:83
 #, fuzzy, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr "No consegui abrir: %s\n"
@@ -443,45 +443,45 @@ msgstr "--sign somente pode ser usado durante a construo de pacotes"
 msgid "exec failed\n"
 msgstr "Construo falhou.\n"
 
-#: rpmqv.c:959
+#: rpmqv.c:963
 msgid "no packages files given for rebuild"
 msgstr "no foram passados pacotes para reconstruo"
 
-#: rpmqv.c:1026
+#: rpmqv.c:1038
 msgid "no spec files given for build"
 msgstr "no foi passado arquivo spec para construo"
 
-#: rpmqv.c:1028
+#: rpmqv.c:1040
 msgid "no tar files given for build"
 msgstr "no foram passados arquivos tar para construo"
 
-#: rpmqv.c:1047
+#: rpmqv.c:1059
 msgid "no packages given for uninstall"
 msgstr "no foi passado pacote para desinstalao"
 
-#: rpmqv.c:1058
+#: rpmqv.c:1070
 msgid "no packages given for install"
 msgstr "no foi passado pacote para instalao"
 
-#: rpmqv.c:1106
+#: rpmqv.c:1118
 msgid "no arguments given for query"
 msgstr "no foi passado argumento para pesquisa"
 
-#: rpmqv.c:1120
+#: rpmqv.c:1132
 msgid "no arguments given for verify"
 msgstr "no foi passado argumento para verificao"
 
-#: rpmqv.c:1128
+#: rpmqv.c:1140
 msgid "unexpected arguments to --querytags "
 msgstr "argumentos no esperados em --querytags"
 
-#: rpmqv.c:1144
+#: rpmqv.c:1156
 #, fuzzy
 msgid "no arguments given"
 msgstr "no foi passado argumento para pesquisa"
 
 # , c-format
-#: build/build.c:125 build/pack.c:466
+#: build/build.c:125 build/pack.c:487
 #, fuzzy
 msgid "Unable to open temp file.\n"
 msgstr "No consegui abrir: %s\n"
@@ -709,7 +709,7 @@ msgid "Could not open %%files file %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/files.c:1777 build/pack.c:145
+#: build/files.c:1777 build/pack.c:148
 #, fuzzy, c-format
 msgid "line: %s\n"
 msgstr "No consegui ler o arquivo spec de %s\n"
@@ -790,180 +790,180 @@ msgid "Could not canonicalize hostname: %s\n"
 msgstr ""
 
 # , c-format
-#: build/pack.c:78
+#: build/pack.c:81
 #, fuzzy, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:81
+#: build/pack.c:84
 #, fuzzy, c-format
 msgid "create archive failed: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:103
+#: build/pack.c:106
 #, fuzzy, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:110
+#: build/pack.c:113
 #, fuzzy, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:213
+#: build/pack.c:216
 #, fuzzy, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:220
+#: build/pack.c:223
 #, fuzzy, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:227
+#: build/pack.c:230
 #, fuzzy, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:234
+#: build/pack.c:237
 #, fuzzy, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:242
+#: build/pack.c:245
 #, fuzzy, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:257
+#: build/pack.c:260
 #, fuzzy, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:285
+#: build/pack.c:288
 #, fuzzy, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:295
+#: build/pack.c:298
 #, fuzzy, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr "No consegui ler o arquivo spec de %s\n"
 
 # , c-format
-#: build/pack.c:304 build/pack.c:508
+#: build/pack.c:307 build/pack.c:529
 #, fuzzy, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: build/pack.c:320
+#: build/pack.c:341
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr ""
 
-#: build/pack.c:329
+#: build/pack.c:350
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
 # , c-format
-#: build/pack.c:454
+#: build/pack.c:475
 #, fuzzy
 msgid "Unable to create immutable header region.\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:472
+#: build/pack.c:493
 #, fuzzy
 msgid "Unable to write temp header\n"
 msgstr "No consegui abrir: %s\n"
 
-#: build/pack.c:480
+#: build/pack.c:501
 msgid "Bad CSA data\n"
 msgstr ""
 
 # , c-format
-#: build/pack.c:515
+#: build/pack.c:536
 #, fuzzy
 msgid "Unable to write final header\n"
 msgstr "No consegui abrir: %s\n"
 
-#: build/pack.c:533
+#: build/pack.c:554
 #, fuzzy, c-format
 msgid "Generating signature: %d\n"
 msgstr "gere assinatura PGP"
 
 # , c-format
-#: build/pack.c:546
+#: build/pack.c:567
 #, fuzzy
 msgid "Unable to reload signature header.\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:554
+#: build/pack.c:575
 #, fuzzy, c-format
 msgid "Could not open %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:590 lib/psm.c:2149
+#: build/pack.c:611 lib/psm.c:2153
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:605
+#: build/pack.c:626
 #, fuzzy, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:615
+#: build/pack.c:636
 #, fuzzy, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:629
+#: build/pack.c:650
 #, fuzzy, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:639
+#: build/pack.c:660
 #, fuzzy, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:645
+#: build/pack.c:666
 #, fuzzy, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: build/pack.c:670 lib/psm.c:2415
+#: build/pack.c:691 lib/psm.c:2419
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:737
+#: build/pack.c:758
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
 # , c-format
-#: build/pack.c:754
+#: build/pack.c:775
 #, fuzzy, c-format
 msgid "cannot create %s: %s\n"
 msgstr "No consegui abrir: %s\n"
@@ -1596,60 +1596,60 @@ msgstr ""
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1248 lib/depends.c:1381
+#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1248 lib/depends.c:1381
+#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:1042
+#: lib/depends.c:1044
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:1153
+#: lib/depends.c:1155
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:1247
+#: lib/depends.c:1249
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1276
+#: lib/depends.c:1278
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1293
+#: lib/depends.c:1295
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:1317
+#: lib/depends.c:1319
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1330
+#: lib/depends.c:1332
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1344
+#: lib/depends.c:1346
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:1360
+#: lib/depends.c:1362
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1381
+#: lib/depends.c:1383
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
@@ -1657,42 +1657,42 @@ msgstr ""
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1454
+#: lib/depends.c:1456
 #, fuzzy, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "no foi passado pacote para instalao"
 
 #. conflicts exist.
-#: lib/depends.c:1533
+#: lib/depends.c:1535
 #, fuzzy, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "no foi passado pacote para desinstalao"
 
-#: lib/depends.c:1786
+#: lib/depends.c:1788
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1936
+#: lib/depends.c:1938
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1996
+#: lib/depends.c:1998
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2046
+#: lib/depends.c:2048
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:2099
+#: lib/depends.c:2101
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:2129
+#: lib/depends.c:2131
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -1888,15 +1888,47 @@ msgstr ""
 msgid "error creating temporary file %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/package.c:161
+#: lib/package.c:167 lib/package.c:238
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:184
+#: lib/package.c:188 lib/package.c:246
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 
+#: lib/package.c:224 lib/rpmchecksig.c:158 lib/rpmchecksig.c:506
+#, c-format
+msgid "%s: readLead failed\n"
+msgstr ""
+
+#: lib/package.c:230
+#, c-format
+msgid "%s: bad magic\n"
+msgstr ""
+
+#: lib/package.c:254 lib/rpmchecksig.c:176 lib/rpmchecksig.c:522
+#, c-format
+msgid "%s: rpmReadSignature failed\n"
+msgstr ""
+
+#: lib/package.c:258 lib/rpmchecksig.c:180 lib/rpmchecksig.c:527
+#, c-format
+msgid "%s: No signature available\n"
+msgstr ""
+
+# , c-format
+#: lib/package.c:284
+#, fuzzy, c-format
+msgid "%s: headerRead failed\n"
+msgstr "No consegui abrir: %s\n"
+
+# , c-format
+#: lib/package.c:303 lib/rpmchecksig.c:109 lib/rpmchecksig.c:450
+#, fuzzy, c-format
+msgid "%s: Fread failed: %s\n"
+msgstr "No consegui abrir: %s\n"
+
 #: lib/poptI.c:47
 #, fuzzy
 msgid "exclude paths must begin with a /"
@@ -2470,288 +2502,261 @@ msgstr "No consegui abrir: %s\n"
 msgid "cannot write to %%%s %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/psm.c:1214
+#: lib/psm.c:1217
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1325
+#: lib/psm.c:1330
 #, fuzzy
 msgid "source package contains no .spec file\n"
 msgstr "pesquise o pacote ao qual <arquivo> pertence"
 
-#: lib/psm.c:1432
+#: lib/psm.c:1436
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "no execute nenhum estgio"
 
-#: lib/psm.c:1600
+#: lib/psm.c:1604
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1607
+#: lib/psm.c:1611
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1954
+#: lib/psm.c:1958
 #, fuzzy, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr "no foi passado pacote para instalao"
 
-#: lib/psm.c:2071
+#: lib/psm.c:2075
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2186
+#: lib/psm.c:2190
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2195
+#: lib/psm.c:2199
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2236
+#: lib/psm.c:2240
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "Construo falhou.\n"
 
-#: lib/psm.c:2237
+#: lib/psm.c:2241
 msgid " on file "
 msgstr ""
 
 # , c-format
-#: lib/psm.c:2423
+#: lib/psm.c:2427
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/psm.c:2426
+#: lib/psm.c:2430
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "Construo falhou.\n"
 
-#: lib/query.c:128
+#: lib/query.c:124
 #, c-format
 msgid "incorrect format: %s\n"
 msgstr ""
 
-#: lib/query.c:225
+#: lib/query.c:221
 msgid "(contains no files)"
 msgstr ""
 
-#: lib/query.c:286
+#: lib/query.c:282
 msgid "normal        "
 msgstr ""
 
-#: lib/query.c:289
+#: lib/query.c:285
 msgid "replaced      "
 msgstr ""
 
-#: lib/query.c:292
+#: lib/query.c:288
 #, fuzzy
 msgid "not installed "
 msgstr "no foi passado pacote para instalao"
 
-#: lib/query.c:295
+#: lib/query.c:291
 msgid "net shared    "
 msgstr ""
 
-#: lib/query.c:298
+#: lib/query.c:294
 #, c-format
 msgid "(unknown %3d) "
 msgstr ""
 
-#: lib/query.c:303
+#: lib/query.c:299
 msgid "(no state)    "
 msgstr ""
 
-#: lib/query.c:322 lib/query.c:378
+#: lib/query.c:318 lib/query.c:374
 #, fuzzy
 msgid "package has neither file owner or id lists\n"
 msgstr "no foi passado pacote para instalao"
 
 # , c-format
-#: lib/query.c:467
+#: lib/query.c:463
 #, fuzzy, c-format
 msgid "can't query %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/query.c:582 lib/rpmchecksig.c:159 lib/rpmchecksig.c:492
-#, c-format
-msgid "%s: readLead failed\n"
-msgstr ""
-
-#: lib/query.c:588 lib/rpmchecksig.c:498
-#, c-format
-msgid "%s: No signature available (v1.0 RPM)\n"
-msgstr ""
-
-#: lib/query.c:597 lib/rpmchecksig.c:177 lib/rpmchecksig.c:508
-#, c-format
-msgid "%s: rpmReadSignature failed\n"
-msgstr ""
-
-#: lib/query.c:601 lib/rpmchecksig.c:181 lib/rpmchecksig.c:513
-#, c-format
-msgid "%s: No signature available\n"
-msgstr ""
-
-# , c-format
-#: lib/query.c:624
-#, fuzzy, c-format
-msgid "%s: headerRead failed\n"
-msgstr "No consegui abrir: %s\n"
-
-# , c-format
-#: lib/query.c:641 lib/rpmchecksig.c:110 lib/rpmchecksig.c:287
-#, fuzzy, c-format
-msgid "%s: Fread failed: %s\n"
-msgstr "No consegui abrir: %s\n"
-
-#: lib/query.c:758 lib/query.c:796 lib/rpminstall.c:324 lib/rpminstall.c:468
-#: lib/rpminstall.c:848
+#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463
+#: lib/rpminstall.c:838
 #, fuzzy, c-format
 msgid "open of %s failed: %s\n"
 msgstr "Construo falhou.\n"
 
-#: lib/query.c:774
+#: lib/query.c:616
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:780
+#: lib/query.c:622
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
 # , c-format
-#: lib/query.c:806 lib/rpminstall.c:481
+#: lib/query.c:648 lib/rpminstall.c:476
 #, fuzzy, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/query.c:850
+#: lib/query.c:692
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:874
+#: lib/query.c:716
 #, fuzzy
 msgid "no packages\n"
 msgstr "pesquise todos os pacotes"
 
-#: lib/query.c:894
+#: lib/query.c:736
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:904
+#: lib/query.c:746
 #, fuzzy, c-format
 msgid "no package triggers %s\n"
 msgstr "no foram passados pacotes para assinatura"
 
-#: lib/query.c:914
+#: lib/query.c:756
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:925
+#: lib/query.c:767
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:962
+#: lib/query.c:804
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:966
+#: lib/query.c:808
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:993
+#: lib/query.c:835
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:996
+#: lib/query.c:838
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:1001
+#: lib/query.c:843
 #, c-format
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:1012 lib/rpminstall.c:634
+#: lib/query.c:854 lib/rpminstall.c:624
 #, fuzzy, c-format
 msgid "package %s is not installed\n"
 msgstr "no foi passado pacote para instalao"
 
 # , c-format
-#: lib/rpmchecksig.c:50
+#: lib/rpmchecksig.c:49
 #, fuzzy, c-format
 msgid "%s: open failed: %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/rpmchecksig.c:62
+#: lib/rpmchecksig.c:61
 #, fuzzy
 msgid "makeTempFile failed\n"
 msgstr "Construo falhou.\n"
 
 # , c-format
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:103
 #, fuzzy, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/rpmchecksig.c:164
+#: lib/rpmchecksig.c:163
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:168
+#: lib/rpmchecksig.c:167
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:214
+#: lib/rpmchecksig.c:213
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
 # , c-format
-#: lib/rpmchecksig.c:220
+#: lib/rpmchecksig.c:219
 #, fuzzy, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/rpmchecksig.c:731
+#: lib/rpmchecksig.c:512
+#, c-format
+msgid "%s: No signature available (v1.0 RPM)\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:707
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:732 lib/rpmchecksig.c:746
+#: lib/rpmchecksig.c:708 lib/rpmchecksig.c:722
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:734 lib/rpmchecksig.c:748
+#: lib/rpmchecksig.c:710 lib/rpmchecksig.c:724
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:735 lib/rpmchecksig.c:749
+#: lib/rpmchecksig.c:711 lib/rpmchecksig.c:725
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:737 lib/rpmchecksig.c:751
+#: lib/rpmchecksig.c:713 lib/rpmchecksig.c:727
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:745
+#: lib/rpmchecksig.c:721
 msgid "OK"
 msgstr ""
 
@@ -2764,6 +2769,12 @@ msgstr ""
 msgid "Preparing packages for installation..."
 msgstr "no foi passado pacote para instalao"
 
+# , c-format
+#: lib/rpminstall.c:228
+#, fuzzy, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr "No consegui abrir: %s\n"
+
 # "Project-Id-Version: rpm-2.5.3\n"
 # "PO-Revision-Date: 1997-09-11 14:00 MET DST\n"
 # "Last-Translator: Arnaldo Carvalho de Melo <acme@conectiva.com.br>\n"
@@ -2772,92 +2783,86 @@ msgstr "no foi passado pacote para instalao"
 # "Content-Type: text/plain; charset=ISO-8859-1\n"
 # "Content-Transfer-Encoding: 8-bit\n"
 # , c-format
-#: lib/rpminstall.c:274
+#: lib/rpminstall.c:285
 #, fuzzy, c-format
 msgid "Retrieving %s\n"
 msgstr "RPM verso %s\n"
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:284
+#: lib/rpminstall.c:295
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:288
+#: lib/rpminstall.c:299
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-# , c-format
-#: lib/rpminstall.c:370
-#, fuzzy, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr "No consegui abrir: %s\n"
-
-#: lib/rpminstall.c:393
+#: lib/rpminstall.c:388
 #, fuzzy, c-format
 msgid "package %s is not relocateable\n"
 msgstr "no foi passado pacote para instalao"
 
-#: lib/rpminstall.c:442
+#: lib/rpminstall.c:437
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:448
+#: lib/rpminstall.c:443
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:460 lib/rpminstall.c:705
+#: lib/rpminstall.c:455 lib/rpminstall.c:694
 #, fuzzy, c-format
 msgid "%s cannot be installed\n"
 msgstr "no foi passado pacote para instalao"
 
-#: lib/rpminstall.c:496
+#: lib/rpminstall.c:491
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:512
+#: lib/rpminstall.c:507
 #, fuzzy
 msgid "failed dependencies:\n"
 msgstr "lista dependncias do pacote"
 
-#: lib/rpminstall.c:533
+#: lib/rpminstall.c:528
 #, fuzzy
 msgid "installing binary packages\n"
 msgstr "instale pacote"
 
 # , c-format
-#: lib/rpminstall.c:554
+#: lib/rpminstall.c:549
 #, fuzzy, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/rpminstall.c:621
+#: lib/rpminstall.c:611
 #, c-format
 msgid "cannot open %s/packages.rpm\n"
 msgstr ""
 
-#: lib/rpminstall.c:637
+#: lib/rpminstall.c:627
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:661
+#: lib/rpminstall.c:651
 #, fuzzy
 msgid "removing these packages would break dependencies:\n"
 msgstr "lista dependncias do pacote"
 
 # , c-format
-#: lib/rpminstall.c:691
+#: lib/rpminstall.c:680
 #, fuzzy, c-format
 msgid "cannot open %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/rpminstall.c:697
+#: lib/rpminstall.c:686
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
@@ -3153,17 +3158,17 @@ msgstr ""
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:414
+#: lib/verify.c:417
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:511
+#: lib/verify.c:514
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
 
-#: lib/verify.c:556
+#: lib/verify.c:559
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
diff --git a/po/ro.po b/po/ro.po
index 67006a14c..e3407a52c 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-24 21:17-0400\n"
+"POT-Creation-Date: 2001-10-26 00:15-0400\n"
 "PO-Revision-Date: 1999-04-10 12:00+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
@@ -65,15 +65,15 @@ msgstr ""
 msgid "Building for target %s\n"
 msgstr ""
 
-#: rpm2cpio.c:34
+#: rpm2cpio.c:55
 msgid "argument is not an RPM package\n"
 msgstr ""
 
-#: rpm2cpio.c:38
+#: rpm2cpio.c:61
 msgid "error reading header from package\n"
 msgstr ""
 
-#: rpm2cpio.c:60
+#: rpm2cpio.c:83
 #, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr ""
@@ -392,43 +392,43 @@ msgstr ""
 msgid "exec failed\n"
 msgstr ""
 
-#: rpmqv.c:959
+#: rpmqv.c:963
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1026
+#: rpmqv.c:1038
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1028
+#: rpmqv.c:1040
 msgid "no tar files given for build"
 msgstr ""
 
-#: rpmqv.c:1047
+#: rpmqv.c:1059
 msgid "no packages given for uninstall"
 msgstr ""
 
-#: rpmqv.c:1058
+#: rpmqv.c:1070
 msgid "no packages given for install"
 msgstr ""
 
-#: rpmqv.c:1106
+#: rpmqv.c:1118
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpmqv.c:1120
+#: rpmqv.c:1132
 msgid "no arguments given for verify"
 msgstr ""
 
-#: rpmqv.c:1128
+#: rpmqv.c:1140
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpmqv.c:1144
+#: rpmqv.c:1156
 msgid "no arguments given"
 msgstr ""
 
-#: build/build.c:125 build/pack.c:466
+#: build/build.c:125 build/pack.c:487
 msgid "Unable to open temp file.\n"
 msgstr ""
 
@@ -636,7 +636,7 @@ msgstr ""
 msgid "Could not open %%files file %s: %s\n"
 msgstr ""
 
-#: build/files.c:1777 build/pack.c:145
+#: build/files.c:1777 build/pack.c:148
 #, c-format
 msgid "line: %s\n"
 msgstr ""
@@ -711,152 +711,152 @@ msgstr ""
 msgid "Could not canonicalize hostname: %s\n"
 msgstr ""
 
-#: build/pack.c:78
+#: build/pack.c:81
 #, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr ""
 
-#: build/pack.c:81
+#: build/pack.c:84
 #, c-format
 msgid "create archive failed: %s\n"
 msgstr ""
 
-#: build/pack.c:103
+#: build/pack.c:106
 #, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr ""
 
-#: build/pack.c:110
+#: build/pack.c:113
 #, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr ""
 
-#: build/pack.c:213
+#: build/pack.c:216
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr ""
 
-#: build/pack.c:220
+#: build/pack.c:223
 #, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr ""
 
-#: build/pack.c:227
+#: build/pack.c:230
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr ""
 
-#: build/pack.c:234
+#: build/pack.c:237
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr ""
 
-#: build/pack.c:242
+#: build/pack.c:245
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr ""
 
-#: build/pack.c:257
+#: build/pack.c:260
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr ""
 
-#: build/pack.c:285
+#: build/pack.c:288
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:295
+#: build/pack.c:298
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr ""
 
-#: build/pack.c:304 build/pack.c:508
+#: build/pack.c:307 build/pack.c:529
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr ""
 
-#: build/pack.c:320
+#: build/pack.c:341
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr ""
 
-#: build/pack.c:329
+#: build/pack.c:350
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:454
+#: build/pack.c:475
 msgid "Unable to create immutable header region.\n"
 msgstr ""
 
-#: build/pack.c:472
+#: build/pack.c:493
 msgid "Unable to write temp header\n"
 msgstr ""
 
-#: build/pack.c:480
+#: build/pack.c:501
 msgid "Bad CSA data\n"
 msgstr ""
 
-#: build/pack.c:515
+#: build/pack.c:536
 msgid "Unable to write final header\n"
 msgstr ""
 
-#: build/pack.c:533
+#: build/pack.c:554
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr ""
 
-#: build/pack.c:546
+#: build/pack.c:567
 msgid "Unable to reload signature header.\n"
 msgstr ""
 
-#: build/pack.c:554
+#: build/pack.c:575
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:590 lib/psm.c:2149
+#: build/pack.c:611 lib/psm.c:2153
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
 
-#: build/pack.c:605
+#: build/pack.c:626
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr ""
 
-#: build/pack.c:615
+#: build/pack.c:636
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr ""
 
-#: build/pack.c:629
+#: build/pack.c:650
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:639
+#: build/pack.c:660
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr ""
 
-#: build/pack.c:645
+#: build/pack.c:666
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:670 lib/psm.c:2415
+#: build/pack.c:691 lib/psm.c:2419
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:737
+#: build/pack.c:758
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:754
+#: build/pack.c:775
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr ""
@@ -1423,60 +1423,60 @@ msgstr ""
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1248 lib/depends.c:1381
+#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1248 lib/depends.c:1381
+#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:1042
+#: lib/depends.c:1044
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:1153
+#: lib/depends.c:1155
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:1247
+#: lib/depends.c:1249
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1276
+#: lib/depends.c:1278
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1293
+#: lib/depends.c:1295
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:1317
+#: lib/depends.c:1319
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1330
+#: lib/depends.c:1332
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1344
+#: lib/depends.c:1346
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:1360
+#: lib/depends.c:1362
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1381
+#: lib/depends.c:1383
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
@@ -1484,42 +1484,42 @@ msgstr ""
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1454
+#: lib/depends.c:1456
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1533
+#: lib/depends.c:1535
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1786
+#: lib/depends.c:1788
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1936
+#: lib/depends.c:1938
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1996
+#: lib/depends.c:1998
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2046
+#: lib/depends.c:2048
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:2099
+#: lib/depends.c:2101
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:2129
+#: lib/depends.c:2131
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -1705,15 +1705,45 @@ msgstr ""
 msgid "error creating temporary file %s\n"
 msgstr ""
 
-#: lib/package.c:161
+#: lib/package.c:167 lib/package.c:238
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:184
+#: lib/package.c:188 lib/package.c:246
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 
+#: lib/package.c:224 lib/rpmchecksig.c:158 lib/rpmchecksig.c:506
+#, c-format
+msgid "%s: readLead failed\n"
+msgstr ""
+
+#: lib/package.c:230
+#, c-format
+msgid "%s: bad magic\n"
+msgstr ""
+
+#: lib/package.c:254 lib/rpmchecksig.c:176 lib/rpmchecksig.c:522
+#, c-format
+msgid "%s: rpmReadSignature failed\n"
+msgstr ""
+
+#: lib/package.c:258 lib/rpmchecksig.c:180 lib/rpmchecksig.c:527
+#, c-format
+msgid "%s: No signature available\n"
+msgstr ""
+
+#: lib/package.c:284
+#, c-format
+msgid "%s: headerRead failed\n"
+msgstr ""
+
+#: lib/package.c:303 lib/rpmchecksig.c:109 lib/rpmchecksig.c:450
+#, c-format
+msgid "%s: Fread failed: %s\n"
+msgstr ""
+
 #: lib/poptI.c:47
 msgid "exclude paths must begin with a /"
 msgstr ""
@@ -2206,275 +2236,250 @@ msgstr ""
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1214
+#: lib/psm.c:1217
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1325
+#: lib/psm.c:1330
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1432
+#: lib/psm.c:1436
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1600
+#: lib/psm.c:1604
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1607
+#: lib/psm.c:1611
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1954
+#: lib/psm.c:1958
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2071
+#: lib/psm.c:2075
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2186
+#: lib/psm.c:2190
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2195
+#: lib/psm.c:2199
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2236
+#: lib/psm.c:2240
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2237
+#: lib/psm.c:2241
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2423
+#: lib/psm.c:2427
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2426
+#: lib/psm.c:2430
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:128
+#: lib/query.c:124
 #, c-format
 msgid "incorrect format: %s\n"
 msgstr ""
 
-#: lib/query.c:225
+#: lib/query.c:221
 msgid "(contains no files)"
 msgstr ""
 
-#: lib/query.c:286
+#: lib/query.c:282
 msgid "normal        "
 msgstr ""
 
-#: lib/query.c:289
+#: lib/query.c:285
 msgid "replaced      "
 msgstr ""
 
-#: lib/query.c:292
+#: lib/query.c:288
 msgid "not installed "
 msgstr ""
 
-#: lib/query.c:295
+#: lib/query.c:291
 msgid "net shared    "
 msgstr ""
 
-#: lib/query.c:298
+#: lib/query.c:294
 #, c-format
 msgid "(unknown %3d) "
 msgstr ""
 
-#: lib/query.c:303
+#: lib/query.c:299
 msgid "(no state)    "
 msgstr ""
 
-#: lib/query.c:322 lib/query.c:378
+#: lib/query.c:318 lib/query.c:374
 msgid "package has neither file owner or id lists\n"
 msgstr ""
 
-#: lib/query.c:467
+#: lib/query.c:463
 #, c-format
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:582 lib/rpmchecksig.c:159 lib/rpmchecksig.c:492
-#, c-format
-msgid "%s: readLead failed\n"
-msgstr ""
-
-#: lib/query.c:588 lib/rpmchecksig.c:498
-#, c-format
-msgid "%s: No signature available (v1.0 RPM)\n"
-msgstr ""
-
-#: lib/query.c:597 lib/rpmchecksig.c:177 lib/rpmchecksig.c:508
-#, c-format
-msgid "%s: rpmReadSignature failed\n"
-msgstr ""
-
-#: lib/query.c:601 lib/rpmchecksig.c:181 lib/rpmchecksig.c:513
-#, c-format
-msgid "%s: No signature available\n"
-msgstr ""
-
-#: lib/query.c:624
-#, c-format
-msgid "%s: headerRead failed\n"
-msgstr ""
-
-#: lib/query.c:641 lib/rpmchecksig.c:110 lib/rpmchecksig.c:287
-#, c-format
-msgid "%s: Fread failed: %s\n"
-msgstr ""
-
-#: lib/query.c:758 lib/query.c:796 lib/rpminstall.c:324 lib/rpminstall.c:468
-#: lib/rpminstall.c:848
+#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463
+#: lib/rpminstall.c:838
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:774
+#: lib/query.c:616
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:780
+#: lib/query.c:622
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:806 lib/rpminstall.c:481
+#: lib/query.c:648 lib/rpminstall.c:476
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr ""
 
-#: lib/query.c:850
+#: lib/query.c:692
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:874
+#: lib/query.c:716
 msgid "no packages\n"
 msgstr ""
 
-#: lib/query.c:894
+#: lib/query.c:736
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:904
+#: lib/query.c:746
 #, c-format
 msgid "no package triggers %s\n"
 msgstr ""
 
-#: lib/query.c:914
+#: lib/query.c:756
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:925
+#: lib/query.c:767
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:962
+#: lib/query.c:804
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:966
+#: lib/query.c:808
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:993
+#: lib/query.c:835
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:996
+#: lib/query.c:838
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:1001
+#: lib/query.c:843
 #, c-format
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:1012 lib/rpminstall.c:634
+#: lib/query.c:854 lib/rpminstall.c:624
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:50
+#: lib/rpmchecksig.c:49
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:62
+#: lib/rpmchecksig.c:61
 msgid "makeTempFile failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:103
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:164
+#: lib/rpmchecksig.c:163
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:168
+#: lib/rpmchecksig.c:167
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:214
+#: lib/rpmchecksig.c:213
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:220
+#: lib/rpmchecksig.c:219
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:731
+#: lib/rpmchecksig.c:512
+#, c-format
+msgid "%s: No signature available (v1.0 RPM)\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:707
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:732 lib/rpmchecksig.c:746
+#: lib/rpmchecksig.c:708 lib/rpmchecksig.c:722
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:734 lib/rpmchecksig.c:748
+#: lib/rpmchecksig.c:710 lib/rpmchecksig.c:724
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:735 lib/rpmchecksig.c:749
+#: lib/rpmchecksig.c:711 lib/rpmchecksig.c:725
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:737 lib/rpmchecksig.c:751
+#: lib/rpmchecksig.c:713 lib/rpmchecksig.c:727
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:745
+#: lib/rpmchecksig.c:721
 msgid "OK"
 msgstr ""
 
@@ -2486,86 +2491,86 @@ msgstr ""
 msgid "Preparing packages for installation..."
 msgstr ""
 
-#: lib/rpminstall.c:274
+#: lib/rpminstall.c:228
+#, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr ""
+
+#: lib/rpminstall.c:285
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:284
+#: lib/rpminstall.c:295
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:288
+#: lib/rpminstall.c:299
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:370
-#, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr ""
-
-#: lib/rpminstall.c:393
+#: lib/rpminstall.c:388
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:442
+#: lib/rpminstall.c:437
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:448
+#: lib/rpminstall.c:443
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:460 lib/rpminstall.c:705
+#: lib/rpminstall.c:455 lib/rpminstall.c:694
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:496
+#: lib/rpminstall.c:491
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:512
+#: lib/rpminstall.c:507
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:533
+#: lib/rpminstall.c:528
 msgid "installing binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:554
+#: lib/rpminstall.c:549
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:621
+#: lib/rpminstall.c:611
 #, c-format
 msgid "cannot open %s/packages.rpm\n"
 msgstr ""
 
-#: lib/rpminstall.c:637
+#: lib/rpminstall.c:627
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:661
+#: lib/rpminstall.c:651
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:691
+#: lib/rpminstall.c:680
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:697
+#: lib/rpminstall.c:686
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
@@ -2831,17 +2836,17 @@ msgstr ""
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:414
+#: lib/verify.c:417
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:511
+#: lib/verify.c:514
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
 
-#: lib/verify.c:556
+#: lib/verify.c:559
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
diff --git a/po/rpm.pot b/po/rpm.pot
index cef0e7a10..d56aaa22e 100644
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-10-24 21:17-0400\n"
+"POT-Creation-Date: 2001-10-26 00:15-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"
@@ -70,15 +70,15 @@ msgstr ""
 msgid "Building for target %s\n"
 msgstr ""
 
-#: rpm2cpio.c:34
+#: rpm2cpio.c:55
 msgid "argument is not an RPM package\n"
 msgstr ""
 
-#: rpm2cpio.c:38
+#: rpm2cpio.c:61
 msgid "error reading header from package\n"
 msgstr ""
 
-#: rpm2cpio.c:60
+#: rpm2cpio.c:83
 #, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr ""
@@ -397,43 +397,43 @@ msgstr ""
 msgid "exec failed\n"
 msgstr ""
 
-#: rpmqv.c:959
+#: rpmqv.c:963
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1026
+#: rpmqv.c:1038
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1028
+#: rpmqv.c:1040
 msgid "no tar files given for build"
 msgstr ""
 
-#: rpmqv.c:1047
+#: rpmqv.c:1059
 msgid "no packages given for uninstall"
 msgstr ""
 
-#: rpmqv.c:1058
+#: rpmqv.c:1070
 msgid "no packages given for install"
 msgstr ""
 
-#: rpmqv.c:1106
+#: rpmqv.c:1118
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpmqv.c:1120
+#: rpmqv.c:1132
 msgid "no arguments given for verify"
 msgstr ""
 
-#: rpmqv.c:1128
+#: rpmqv.c:1140
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpmqv.c:1144
+#: rpmqv.c:1156
 msgid "no arguments given"
 msgstr ""
 
-#: build/build.c:125 build/pack.c:466
+#: build/build.c:125 build/pack.c:487
 msgid "Unable to open temp file.\n"
 msgstr ""
 
@@ -641,7 +641,7 @@ msgstr ""
 msgid "Could not open %%files file %s: %s\n"
 msgstr ""
 
-#: build/files.c:1777 build/pack.c:145
+#: build/files.c:1777 build/pack.c:148
 #, c-format
 msgid "line: %s\n"
 msgstr ""
@@ -716,152 +716,152 @@ msgstr ""
 msgid "Could not canonicalize hostname: %s\n"
 msgstr ""
 
-#: build/pack.c:78
+#: build/pack.c:81
 #, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr ""
 
-#: build/pack.c:81
+#: build/pack.c:84
 #, c-format
 msgid "create archive failed: %s\n"
 msgstr ""
 
-#: build/pack.c:103
+#: build/pack.c:106
 #, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr ""
 
-#: build/pack.c:110
+#: build/pack.c:113
 #, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr ""
 
-#: build/pack.c:213
+#: build/pack.c:216
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr ""
 
-#: build/pack.c:220
+#: build/pack.c:223
 #, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr ""
 
-#: build/pack.c:227
+#: build/pack.c:230
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr ""
 
-#: build/pack.c:234
+#: build/pack.c:237
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr ""
 
-#: build/pack.c:242
+#: build/pack.c:245
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr ""
 
-#: build/pack.c:257
+#: build/pack.c:260
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr ""
 
-#: build/pack.c:285
+#: build/pack.c:288
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:295
+#: build/pack.c:298
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr ""
 
-#: build/pack.c:304 build/pack.c:508
+#: build/pack.c:307 build/pack.c:529
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr ""
 
-#: build/pack.c:320
+#: build/pack.c:341
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr ""
 
-#: build/pack.c:329
+#: build/pack.c:350
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:454
+#: build/pack.c:475
 msgid "Unable to create immutable header region.\n"
 msgstr ""
 
-#: build/pack.c:472
+#: build/pack.c:493
 msgid "Unable to write temp header\n"
 msgstr ""
 
-#: build/pack.c:480
+#: build/pack.c:501
 msgid "Bad CSA data\n"
 msgstr ""
 
-#: build/pack.c:515
+#: build/pack.c:536
 msgid "Unable to write final header\n"
 msgstr ""
 
-#: build/pack.c:533
+#: build/pack.c:554
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr ""
 
-#: build/pack.c:546
+#: build/pack.c:567
 msgid "Unable to reload signature header.\n"
 msgstr ""
 
-#: build/pack.c:554
+#: build/pack.c:575
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:590 lib/psm.c:2149
+#: build/pack.c:611 lib/psm.c:2153
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
 
-#: build/pack.c:605
+#: build/pack.c:626
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr ""
 
-#: build/pack.c:615
+#: build/pack.c:636
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr ""
 
-#: build/pack.c:629
+#: build/pack.c:650
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:639
+#: build/pack.c:660
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr ""
 
-#: build/pack.c:645
+#: build/pack.c:666
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:670 lib/psm.c:2415
+#: build/pack.c:691 lib/psm.c:2419
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:737
+#: build/pack.c:758
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:754
+#: build/pack.c:775
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr ""
@@ -1428,60 +1428,60 @@ msgstr ""
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1248 lib/depends.c:1381
+#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1248 lib/depends.c:1381
+#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:1042
+#: lib/depends.c:1044
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:1153
+#: lib/depends.c:1155
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:1247
+#: lib/depends.c:1249
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1276
+#: lib/depends.c:1278
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1293
+#: lib/depends.c:1295
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:1317
+#: lib/depends.c:1319
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1330
+#: lib/depends.c:1332
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1344
+#: lib/depends.c:1346
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:1360
+#: lib/depends.c:1362
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1381
+#: lib/depends.c:1383
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
@@ -1489,42 +1489,42 @@ msgstr ""
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1454
+#: lib/depends.c:1456
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1533
+#: lib/depends.c:1535
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1786
+#: lib/depends.c:1788
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1936
+#: lib/depends.c:1938
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1996
+#: lib/depends.c:1998
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2046
+#: lib/depends.c:2048
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:2099
+#: lib/depends.c:2101
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:2129
+#: lib/depends.c:2131
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -1710,15 +1710,45 @@ msgstr ""
 msgid "error creating temporary file %s\n"
 msgstr ""
 
-#: lib/package.c:161
+#: lib/package.c:167 lib/package.c:238
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:184
+#: lib/package.c:188 lib/package.c:246
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 
+#: lib/package.c:224 lib/rpmchecksig.c:158 lib/rpmchecksig.c:506
+#, c-format
+msgid "%s: readLead failed\n"
+msgstr ""
+
+#: lib/package.c:230
+#, c-format
+msgid "%s: bad magic\n"
+msgstr ""
+
+#: lib/package.c:254 lib/rpmchecksig.c:176 lib/rpmchecksig.c:522
+#, c-format
+msgid "%s: rpmReadSignature failed\n"
+msgstr ""
+
+#: lib/package.c:258 lib/rpmchecksig.c:180 lib/rpmchecksig.c:527
+#, c-format
+msgid "%s: No signature available\n"
+msgstr ""
+
+#: lib/package.c:284
+#, c-format
+msgid "%s: headerRead failed\n"
+msgstr ""
+
+#: lib/package.c:303 lib/rpmchecksig.c:109 lib/rpmchecksig.c:450
+#, c-format
+msgid "%s: Fread failed: %s\n"
+msgstr ""
+
 #: lib/poptI.c:47
 msgid "exclude paths must begin with a /"
 msgstr ""
@@ -2211,275 +2241,250 @@ msgstr ""
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1214
+#: lib/psm.c:1217
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1325
+#: lib/psm.c:1330
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1432
+#: lib/psm.c:1436
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1600
+#: lib/psm.c:1604
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1607
+#: lib/psm.c:1611
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1954
+#: lib/psm.c:1958
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2071
+#: lib/psm.c:2075
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2186
+#: lib/psm.c:2190
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2195
+#: lib/psm.c:2199
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2236
+#: lib/psm.c:2240
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2237
+#: lib/psm.c:2241
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2423
+#: lib/psm.c:2427
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2426
+#: lib/psm.c:2430
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:128
+#: lib/query.c:124
 #, c-format
 msgid "incorrect format: %s\n"
 msgstr ""
 
-#: lib/query.c:225
+#: lib/query.c:221
 msgid "(contains no files)"
 msgstr ""
 
-#: lib/query.c:286
+#: lib/query.c:282
 msgid "normal        "
 msgstr ""
 
-#: lib/query.c:289
+#: lib/query.c:285
 msgid "replaced      "
 msgstr ""
 
-#: lib/query.c:292
+#: lib/query.c:288
 msgid "not installed "
 msgstr ""
 
-#: lib/query.c:295
+#: lib/query.c:291
 msgid "net shared    "
 msgstr ""
 
-#: lib/query.c:298
+#: lib/query.c:294
 #, c-format
 msgid "(unknown %3d) "
 msgstr ""
 
-#: lib/query.c:303
+#: lib/query.c:299
 msgid "(no state)    "
 msgstr ""
 
-#: lib/query.c:322 lib/query.c:378
+#: lib/query.c:318 lib/query.c:374
 msgid "package has neither file owner or id lists\n"
 msgstr ""
 
-#: lib/query.c:467
+#: lib/query.c:463
 #, c-format
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:582 lib/rpmchecksig.c:159 lib/rpmchecksig.c:492
-#, c-format
-msgid "%s: readLead failed\n"
-msgstr ""
-
-#: lib/query.c:588 lib/rpmchecksig.c:498
-#, c-format
-msgid "%s: No signature available (v1.0 RPM)\n"
-msgstr ""
-
-#: lib/query.c:597 lib/rpmchecksig.c:177 lib/rpmchecksig.c:508
-#, c-format
-msgid "%s: rpmReadSignature failed\n"
-msgstr ""
-
-#: lib/query.c:601 lib/rpmchecksig.c:181 lib/rpmchecksig.c:513
-#, c-format
-msgid "%s: No signature available\n"
-msgstr ""
-
-#: lib/query.c:624
-#, c-format
-msgid "%s: headerRead failed\n"
-msgstr ""
-
-#: lib/query.c:641 lib/rpmchecksig.c:110 lib/rpmchecksig.c:287
-#, c-format
-msgid "%s: Fread failed: %s\n"
-msgstr ""
-
-#: lib/query.c:758 lib/query.c:796 lib/rpminstall.c:324 lib/rpminstall.c:468
-#: lib/rpminstall.c:848
+#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463
+#: lib/rpminstall.c:838
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:774
+#: lib/query.c:616
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:780
+#: lib/query.c:622
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:806 lib/rpminstall.c:481
+#: lib/query.c:648 lib/rpminstall.c:476
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr ""
 
-#: lib/query.c:850
+#: lib/query.c:692
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:874
+#: lib/query.c:716
 msgid "no packages\n"
 msgstr ""
 
-#: lib/query.c:894
+#: lib/query.c:736
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:904
+#: lib/query.c:746
 #, c-format
 msgid "no package triggers %s\n"
 msgstr ""
 
-#: lib/query.c:914
+#: lib/query.c:756
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:925
+#: lib/query.c:767
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:962
+#: lib/query.c:804
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:966
+#: lib/query.c:808
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:993
+#: lib/query.c:835
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:996
+#: lib/query.c:838
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:1001
+#: lib/query.c:843
 #, c-format
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:1012 lib/rpminstall.c:634
+#: lib/query.c:854 lib/rpminstall.c:624
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:50
+#: lib/rpmchecksig.c:49
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:62
+#: lib/rpmchecksig.c:61
 msgid "makeTempFile failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:103
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:164
+#: lib/rpmchecksig.c:163
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:168
+#: lib/rpmchecksig.c:167
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:214
+#: lib/rpmchecksig.c:213
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:220
+#: lib/rpmchecksig.c:219
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:731
+#: lib/rpmchecksig.c:512
+#, c-format
+msgid "%s: No signature available (v1.0 RPM)\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:707
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:732 lib/rpmchecksig.c:746
+#: lib/rpmchecksig.c:708 lib/rpmchecksig.c:722
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:734 lib/rpmchecksig.c:748
+#: lib/rpmchecksig.c:710 lib/rpmchecksig.c:724
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:735 lib/rpmchecksig.c:749
+#: lib/rpmchecksig.c:711 lib/rpmchecksig.c:725
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:737 lib/rpmchecksig.c:751
+#: lib/rpmchecksig.c:713 lib/rpmchecksig.c:727
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:745
+#: lib/rpmchecksig.c:721
 msgid "OK"
 msgstr ""
 
@@ -2491,86 +2496,86 @@ msgstr ""
 msgid "Preparing packages for installation..."
 msgstr ""
 
-#: lib/rpminstall.c:274
+#: lib/rpminstall.c:228
+#, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr ""
+
+#: lib/rpminstall.c:285
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:284
+#: lib/rpminstall.c:295
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:288
+#: lib/rpminstall.c:299
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:370
-#, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr ""
-
-#: lib/rpminstall.c:393
+#: lib/rpminstall.c:388
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:442
+#: lib/rpminstall.c:437
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:448
+#: lib/rpminstall.c:443
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:460 lib/rpminstall.c:705
+#: lib/rpminstall.c:455 lib/rpminstall.c:694
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:496
+#: lib/rpminstall.c:491
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:512
+#: lib/rpminstall.c:507
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:533
+#: lib/rpminstall.c:528
 msgid "installing binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:554
+#: lib/rpminstall.c:549
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:621
+#: lib/rpminstall.c:611
 #, c-format
 msgid "cannot open %s/packages.rpm\n"
 msgstr ""
 
-#: lib/rpminstall.c:637
+#: lib/rpminstall.c:627
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:661
+#: lib/rpminstall.c:651
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:691
+#: lib/rpminstall.c:680
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:697
+#: lib/rpminstall.c:686
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
@@ -2836,17 +2841,17 @@ msgstr ""
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:414
+#: lib/verify.c:417
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:511
+#: lib/verify.c:514
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
 
-#: lib/verify.c:556
+#: lib/verify.c:559
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
diff --git a/po/ru.po b/po/ru.po
index 4a7e9b3ec..609ce70ff 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-24 21:17-0400\n"
+"POT-Creation-Date: 2001-10-26 00:15-0400\n"
 "PO-Revision-Date: 2001-08-29 13:55-0400\n"
 "Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
 "Language-Team:  Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
@@ -67,15 +67,15 @@ msgstr "ðÌÁÔÆÏÒÍÙ ÄÌÑ ÓÂÏÒËÉ: %s\n"
 msgid "Building for target %s\n"
 msgstr "óÂÏÒËÁ ÄÌÑ ÐÌÁÔÆÏÒÍÙ %s\n"
 
-#: rpm2cpio.c:34
+#: rpm2cpio.c:55
 msgid "argument is not an RPM package\n"
 msgstr "ÚÁÄÁÎÎÙÊ ÁÒÇÕÍÅÎÔ ÎÅ Ñ×ÌÑÅÔÓÑ ÐÁËÅÔÏÍ RPM\n"
 
-#: rpm2cpio.c:38
+#: rpm2cpio.c:61
 msgid "error reading header from package\n"
 msgstr "ÏÛÉÂËÁ ÞÔÅÎÉÑ ÚÁÇÏÌÏ×ËÁ ÉÚ ÐÁËÅÔÁ\n"
 
-#: rpm2cpio.c:60
+#: rpm2cpio.c:83
 #, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÏ×ÔÏÒÎÏ ÏÔËÒÙÔØ payload: %s\n"
@@ -411,44 +411,44 @@ msgstr "--sign ÍÏÖÅÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎ ÔÏÌØËÏ ÐÒÉ ÓÂÏÒËÅ ÐÁËÅÔÏ×"
 msgid "exec failed\n"
 msgstr "ÚÁÐÕÓË ÎÅ ÕÄÁÌÓÑ\n"
 
-#: rpmqv.c:959
+#: rpmqv.c:963
 msgid "no packages files given for rebuild"
 msgstr "ÎÅ ÚÁÄÁÎÙ ÐÁËÅÔÙ ÄÌÑ ÐÅÒÅÓÂÏÒËÉ"
 
-#: rpmqv.c:1026
+#: rpmqv.c:1038
 msgid "no spec files given for build"
 msgstr "ÎÅ ÚÁÄÁÎ ÆÁÊÌ ÓÐÅÃÉÆÉËÁÃÉÉ ÄÌÑ ÓÂÏÒËÉ ÐÁËÅÔÁ"
 
-#: rpmqv.c:1028
+#: rpmqv.c:1040
 msgid "no tar files given for build"
 msgstr "ÎÅ ÚÁÄÁÎÙ tar-ÆÁÊÌÙ ÄÌÑ ÓÂÏÒËÉ ÐÁËÅÔÁ"
 
-#: rpmqv.c:1047
+#: rpmqv.c:1059
 msgid "no packages given for uninstall"
 msgstr "ÎÅ ÚÁÄÁÎÙ ÐÁËÅÔÙ ÄÌÑ ÕÄÁÌÅÎÉÑ"
 
-#: rpmqv.c:1058
+#: rpmqv.c:1070
 msgid "no packages given for install"
 msgstr "ÎÅ ÚÁÄÁÎÙ ÐÁËÅÔÙ ÄÌÑ ÕÓÔÁÎÏ×ËÉ"
 
-#: rpmqv.c:1106
+#: rpmqv.c:1118
 msgid "no arguments given for query"
 msgstr "ÎÅ ÚÁÄÁÎÙ ÁÒÇÕÍÅÎÔÙ ÚÁÐÒÏÓÁ"
 
-#: rpmqv.c:1120
+#: rpmqv.c:1132
 msgid "no arguments given for verify"
 msgstr "ÎÅ ÚÁÄÁÎÙ ÁÒÇÕÍÅÎÔÙ ÄÌÑ ×ÅÒÉÆÉËÁÃÉÉ"
 
-#: rpmqv.c:1128
+#: rpmqv.c:1140
 msgid "unexpected arguments to --querytags "
 msgstr "ÎÅÏÖÉÄÁÎÎÙÅ ÁÒÇÕÍÅÎÔÙ ÄÌÑ --querytags "
 
-#: rpmqv.c:1144
+#: rpmqv.c:1156
 #, fuzzy
 msgid "no arguments given"
 msgstr "ÎÅ ÚÁÄÁÎÙ ÁÒÇÕÍÅÎÔÙ ÚÁÐÒÏÓÁ"
 
-#: build/build.c:125 build/pack.c:466
+#: build/build.c:125 build/pack.c:487
 msgid "Unable to open temp file.\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ×ÒÅÍÅÎÎÙÊ ÆÁÊÌ.\n"
 
@@ -659,7 +659,7 @@ msgstr "æÁÊÌ ÎÅ ÎÁÊÄÅÎ: %s\n"
 msgid "Could not open %%files file %s: %s\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ %%files %s: %s\n"
 
-#: build/files.c:1777 build/pack.c:145
+#: build/files.c:1777 build/pack.c:148
 #, c-format
 msgid "line: %s\n"
 msgstr "ÓÔÒÏËÁ: %s\n"
@@ -734,152 +734,152 @@ msgstr "getGidS: ÓÌÉÛËÏÍ ÍÎÏÇÏ ÉÄÅÎÔÉÆÉËÁÔÏÒÏ× ÇÒÕÐÐ.\n"
 msgid "Could not canonicalize hostname: %s\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ËÁÎÏÎÉÚÉÒÏ×ÁÔØ ÉÍÑ ËÏÍÐØÀÔÅÒÁ: %s\n"
 
-#: build/pack.c:78
+#: build/pack.c:81
 #, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr "ÏÛÉÂËÁ ÓÏÚÄÁÎÉÑ ÁÒÈÉ×Á ÎÁ ÆÁÊÌÅ %s: %s\n"
 
-#: build/pack.c:81
+#: build/pack.c:84
 #, c-format
 msgid "create archive failed: %s\n"
 msgstr "ÏÛÉÂËÁ ÓÏÚÄÁÎÉÑ ÁÒÈÉ×Á: %s\n"
 
-#: build/pack.c:103
+#: build/pack.c:106
 #, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr "cpio_copy: ÏÛÉÂËÁ ÚÁÐÉÓÉ: %s\n"
 
-#: build/pack.c:110
+#: build/pack.c:113
 #, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr "cpio_copy: ÏÛÉÂËÁ ÞÔÅÎÉÑ: %s\n"
 
-#: build/pack.c:213
+#: build/pack.c:216
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ PreIn: %s\n"
 
-#: build/pack.c:220
+#: build/pack.c:223
 #, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ PreUn: %s\n"
 
-#: build/pack.c:227
+#: build/pack.c:230
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ PostIn: %s\n"
 
-#: build/pack.c:234
+#: build/pack.c:237
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ PostUn: %s\n"
 
-#: build/pack.c:242
+#: build/pack.c:245
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ VerifyScript: %s\n"
 
-#: build/pack.c:257
+#: build/pack.c:260
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ Trigger script: %s\n"
 
-#: build/pack.c:285
+#: build/pack.c:288
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "readRPM: ÏÔËÒÙÔÉÅ %s: %s\n"
 
-#: build/pack.c:295
+#: build/pack.c:298
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr "readRPM: ÞÔÅÎÉÅ %s: %s\n"
 
-#: build/pack.c:304 build/pack.c:508
+#: build/pack.c:307 build/pack.c:529
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: ÏÛÉÂËÁ Fseek: %s\n"
 
-#: build/pack.c:320
+#: build/pack.c:341
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr "readRPM: %s  ÎÅ Ñ×ÌÑÅÔÓÑ ÐÁËÅÔÏÍ RPM\n"
 
-#: build/pack.c:329
+#: build/pack.c:350
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: ÞÉÔÁÅÔÓÑ ÚÁÇÏÌÏ×ÏË ÉÚ %s\n"
 
-#: build/pack.c:454
+#: build/pack.c:475
 msgid "Unable to create immutable header region.\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÏÍÅÓÔÉÔØ ÚÁÇÏÌÏ×ÏË × ÎÅÒÐÅÒÙ×ÎÕÀ ÏÂÌÁÓÔØ ÐÁÍÑÔÉ.\n"
 
-#: build/pack.c:472
+#: build/pack.c:493
 msgid "Unable to write temp header\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁÐÉÓÁÔØ ×ÒÅÍÅÎÎÙÊ ÚÁÇÏÌÏ×ÏË\n"
 
-#: build/pack.c:480
+#: build/pack.c:501
 msgid "Bad CSA data\n"
 msgstr "îÅ×ÅÒÎÙÅ ÄÁÎÎÙÅ CSA\n"
 
-#: build/pack.c:515
+#: build/pack.c:536
 msgid "Unable to write final header\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁÐÉÓÁÔØ ÏËÏÎÞÁÔÅÌØÎÙÊ ÚÁÇÏÌÏ×ÏË\n"
 
-#: build/pack.c:533
+#: build/pack.c:554
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "çÅÎÅÒÉÒÕÅÔÓÑ ÐÏÄÐÉÓØ: %d\n"
 
-#: build/pack.c:546
+#: build/pack.c:567
 msgid "Unable to reload signature header.\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÅÒÅÚÁÇÒÕÚÉÔØ ÚÁÇÏÌÏ×ÏË ÐÏÄÐÉÓÉ.\n"
 
-#: build/pack.c:554
+#: build/pack.c:575
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s\n"
 
-#: build/pack.c:590 lib/psm.c:2149
+#: build/pack.c:611 lib/psm.c:2153
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁÐÉÓÁÔØ ÐÁËÅÔ: %s\n"
 
-#: build/pack.c:605
+#: build/pack.c:626
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÃÅÌØ ÐÏÄÐÉÓÉ %s: %s\n"
 
-#: build/pack.c:615
+#: build/pack.c:636
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ ÚÁÇÏÌÏ×ÏË ÉÚ %s: %s\n"
 
-#: build/pack.c:629
+#: build/pack.c:650
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁÐÉÓÁÔØ ÚÁÇÏÌÏ×ÏË × %s: %s\n"
 
-#: build/pack.c:639
+#: build/pack.c:660
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ ÓÏÄÅÒÖÉÍÏÅ ÉÚ %s: %s\n"
 
-#: build/pack.c:645
+#: build/pack.c:666
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁÐÉÓÁÔØ ÓÏÄÅÒÖÉÍÏÅ × %s: %s\n"
 
-#: build/pack.c:670 lib/psm.c:2415
+#: build/pack.c:691 lib/psm.c:2419
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "úÁÐÉÓÁÎ: %s\n"
 
-#: build/pack.c:737
+#: build/pack.c:758
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÉÍÑ ÆÁÊÌÁ ÄÌÑ ÐÁËÅÔÁ %s: %s\n"
 
-#: build/pack.c:754
+#: build/pack.c:775
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ %s: %s\n"
@@ -1461,60 +1461,60 @@ msgstr ""
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
-#: lib/depends.c:585 lib/depends.c:1248 lib/depends.c:1381
+#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
 msgid "YES"
 msgstr "äá"
 
-#: lib/depends.c:585 lib/depends.c:1248 lib/depends.c:1381
+#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
 msgid "NO "
 msgstr "îåT"
 
-#: lib/depends.c:1042
+#: lib/depends.c:1044
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr "%s: %-45s YES (added files)\n"
 
-#: lib/depends.c:1153
+#: lib/depends.c:1155
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr "%s: %-45s YES (added provide)\n"
 
-#: lib/depends.c:1247
+#: lib/depends.c:1249
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr "%s: %-45s %-s (cached)\n"
 
-#: lib/depends.c:1276
+#: lib/depends.c:1278
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr "%s: %-45s YES (rpmrc provides)\n"
 
-#: lib/depends.c:1293
+#: lib/depends.c:1295
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "%s: %-45s YES (rpmlib provides)\n"
 
-#: lib/depends.c:1317
+#: lib/depends.c:1319
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr "%s: %-45s YES (db files)\n"
 
-#: lib/depends.c:1330
+#: lib/depends.c:1332
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr "%s: %-45s YES (db provides)\n"
 
-#: lib/depends.c:1344
+#: lib/depends.c:1346
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr "%s: %-45s YES (db package)\n"
 
-#: lib/depends.c:1360
+#: lib/depends.c:1362
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr "%s: %-45s NO\n"
 
-#: lib/depends.c:1381
+#: lib/depends.c:1383
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: (%s, %s) ÄÏÂÁ×ÌÅÎÏ × ËÅÛ ÚÁ×ÉÓÉÍÏÓÔÅÊ\n"
@@ -1522,44 +1522,44 @@ msgstr "%s: (%s, %s) ÄÏÂÁ×ÌÅÎÏ × ËÅÛ ÚÁ×ÉÓÉÍÏÓÔÅÊ\n"
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1454
+#: lib/depends.c:1456
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "ÔÒÅÂÏ×ÁÎÉÑ ÐÁËÅÔÁ %s-%s-%s ÎÅ ÕÄÏ×ÌÅÔ×ÏÒÅÎÙ: %s\n"
 
 #. conflicts exist.
-#: lib/depends.c:1533
+#: lib/depends.c:1535
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "ÐÁËÅÔ %s ËÏÎÆÌÉËÔÕÅÔ Ó: %s\n"
 
-#: lib/depends.c:1786
+#: lib/depends.c:1788
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr "ÕÄÁÌÑÅÔÓÑ %s-%s-%s \"%s\" ÉÚ ÕÐÏÒÑÄÏÞÅÎÎÙÈ ÚÁ×ÉÓÉÍÏÓÔÅÊ.\n"
 
 #. Record all relations.
-#: lib/depends.c:1936
+#: lib/depends.c:1938
 msgid "========== recording tsort relations\n"
 msgstr "========== ÚÁÐÉÓØ ÕÐÏÒÑÄÏÞÅÎÎÙÈ ÚÁ×ÉÓÉÍÏÓÔÅÊ\n"
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1996
+#: lib/depends.c:1998
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 "========== ÓÏÒÔÉÒÏ×ËÁ ÐÁËÅÔÏ× (ÏÞÅÒÅÄÎÏÓÔØ, #predecessors, #succesors, "
 "ÇÌÕÂÉÎÁ)\n"
 
-#: lib/depends.c:2046
+#: lib/depends.c:2048
 msgid "========== successors only (presentation order)\n"
 msgstr "========== ÔÏÌØËÏ ÐÏÓÌÅÄÏ×ÁÔÅÌÉ (× ÐÏÒÑÄËÅ ÐÒÅÄÓÔÁ×ÌÅÎÉÑ)\n"
 
-#: lib/depends.c:2099
+#: lib/depends.c:2101
 msgid "LOOP:\n"
 msgstr "ãéëì:\n"
 
-#: lib/depends.c:2129
+#: lib/depends.c:2131
 msgid "========== continuing tsort ...\n"
 msgstr "========== ÐÒÏÄÏÌÖÅÎÉÅ ÕÐÏÒÑÄÏÞÅÎÉÑ ...\n"
 
@@ -1748,15 +1748,45 @@ msgstr "(ÎÅÉÚ×ÅÓÔÎÙÊ ÔÉÐ)"
 msgid "error creating temporary file %s\n"
 msgstr "ÏÛÉÂËÁ ÓÏÚÄÁÎÉÑ ×ÒÅÍÅÎÎÏÇÏ ÆÁÊÌÁ %s\n"
 
-#: lib/package.c:161
+#: lib/package.c:167 lib/package.c:238
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr "ÐÁËÅÔÙ ×ÅÒÓÉÉ 1 ÎÅ ÐÏÄÄÅÒÖÉ×ÁÀÔÓÑ ÜÔÏÊ ×ÅÒÓÉÅÊ RPM\n"
 
-#: lib/package.c:184
+#: lib/package.c:188 lib/package.c:246
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr "ÜÔÁ ×ÅÒÓÉÑ RPM ÐÏÄÄÅÒÖÉ×ÁÅÔ ÔÏÌØËÏ ÐÁËÅÔÙ ×ÅÒÓÉÉ <= 4\n"
 
+#: lib/package.c:224 lib/rpmchecksig.c:158 lib/rpmchecksig.c:506
+#, c-format
+msgid "%s: readLead failed\n"
+msgstr "%s: ÏÛÉÂËÁ readLead\n"
+
+#: lib/package.c:230
+#, fuzzy, c-format
+msgid "%s: bad magic\n"
+msgstr "îÅ×ÅÒÎÙÊ magic"
+
+#: lib/package.c:254 lib/rpmchecksig.c:176 lib/rpmchecksig.c:522
+#, c-format
+msgid "%s: rpmReadSignature failed\n"
+msgstr "%s: ÏÛÉÂËÁ rpmReadSignature\n"
+
+#: lib/package.c:258 lib/rpmchecksig.c:180 lib/rpmchecksig.c:527
+#, c-format
+msgid "%s: No signature available\n"
+msgstr "%s: ðÏÄÐÉÓØ ÎÅÄÏÓÔÕÐÎÁ\n"
+
+#: lib/package.c:284
+#, fuzzy, c-format
+msgid "%s: headerRead failed\n"
+msgstr "%s: ÏÛÉÂËÁ readLead\n"
+
+#: lib/package.c:303 lib/rpmchecksig.c:109 lib/rpmchecksig.c:450
+#, c-format
+msgid "%s: Fread failed: %s\n"
+msgstr "%s: ÏÛÉÂËÁ Fread: %s\n"
+
 #: lib/poptI.c:47
 msgid "exclude paths must begin with a /"
 msgstr "ÉÓËÌÀÞÅÎÉÑ ÄÏÌÖÎÙ ÎÁÞÉÎÁÔØÓÑ Ó /"
@@ -2266,275 +2296,250 @@ msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ %%%s %s\n"
 msgid "cannot write to %%%s %s\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÉÓÁÔØ × %%%s %s\n"
 
-#: lib/psm.c:1214
+#: lib/psm.c:1217
 msgid "source package expected, binary found\n"
 msgstr "ÏÂÎÁÒÕÖÅÎ Ä×ÏÉÞÎÙÊ ÐÁËÅÔ ×ÍÅÓÔÏ ÏÖÉÄÁÅÍÏÇÏ ÉÓÈÏÄÎÏÇÏ\n"
 
-#: lib/psm.c:1325
+#: lib/psm.c:1330
 msgid "source package contains no .spec file\n"
 msgstr "ÉÓÈÏÄÎÙÊ ÐÁËÅÔ ÎÅ ÓÏÄÅÒÖÉÔ ÆÁÊÌÁ ÓÐÅÃÉÆÉËÁÃÉÉ\n"
 
-#: lib/psm.c:1432
+#: lib/psm.c:1436
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "%s: ×ÙÐÏÌÎÑÅÔÓÑ ÓÃÅÎÁÒÉÊ %s (ÅÓÌÉ ÅÓÔØ)\n"
 
-#: lib/psm.c:1600
+#: lib/psm.c:1604
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr "ÏÛÉÂËÁ ×ÙÐÏÌÎÅÎÉÑ ÓÃÅÎÁÒÉÑ %s ÉÚ %s-%s-%s, waitpid() ×ÏÚ×ÒÁÔÉÌ %s\n"
 
-#: lib/psm.c:1607
+#: lib/psm.c:1611
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr "ÏÛÉÂËÁ ×ÙÐÏÌÎÅÎÉÑ ÓÃÅÎÁÒÉÑ %s ÉÚ %s-%s-%s, ËÏÄ ×ÏÚ×ÒÁÔÁ %d\n"
 
-#: lib/psm.c:1954
+#: lib/psm.c:1958
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr "%s: %s-%s-%s ÓÏÄÅÒÖÉÔ %d ÆÁÊÌÏ×, test = %d\n"
 
-#: lib/psm.c:2071
+#: lib/psm.c:2075
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr "%s: ÏÛÉÂËÁ ÓÃÅÎÁÒÉÑ %s (%d), %s-%s-%s ÐÒÏÐÕÓËÁÅÔÓÑ\n"
 
-#: lib/psm.c:2186
+#: lib/psm.c:2190
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "ÐÏÌØÚÏ×ÁÔÅÌØ %s ÎÅ ÓÕÝÅÓÔ×ÕÅÔ - ÉÓÐÏÌØÚÕÅÔÓÑ root\n"
 
-#: lib/psm.c:2195
+#: lib/psm.c:2199
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "ÇÒÕÐÐÁ %s ÎÅ ÓÕÝÅÓÔ×ÕÅÔ - ÉÓÐÏÌØÚÕÅÔÓÑ root\n"
 
-#: lib/psm.c:2236
+#: lib/psm.c:2240
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "ÒÁÓÐÁËÏ×ËÁ ÁÒÈÉ×Á ÎÅ ÕÄÁÌÁÓØ%s%s: %s\n"
 
-#: lib/psm.c:2237
+#: lib/psm.c:2241
 msgid " on file "
 msgstr " ÎÁ ÆÁÊÌÅ "
 
-#: lib/psm.c:2423
+#: lib/psm.c:2427
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "%s ÏÛÉÂËÁ ÎÁ ÆÁÊÌÅ %s: %s\n"
 
-#: lib/psm.c:2426
+#: lib/psm.c:2430
 #, c-format
 msgid "%s failed: %s\n"
 msgstr "%s ÎÅ ÕÄÁÌÏÓØ: %s\n"
 
-#: lib/query.c:128
+#: lib/query.c:124
 #, c-format
 msgid "incorrect format: %s\n"
 msgstr "ÏÛÉÂËÁ × ÆÏÒÍÁÔÅ: %s\n"
 
-#: lib/query.c:225
+#: lib/query.c:221
 msgid "(contains no files)"
 msgstr "(ÎÅ ÓÏÄÅÒÖÉÔ ÆÁÊÌÏ×)"
 
-#: lib/query.c:286
+#: lib/query.c:282
 msgid "normal        "
 msgstr "ÎÏÒÍÁÌØÎÙÊ    "
 
-#: lib/query.c:289
+#: lib/query.c:285
 msgid "replaced      "
 msgstr "ÚÁÍÅÎÅÎÎÙÊ    "
 
-#: lib/query.c:292
+#: lib/query.c:288
 msgid "not installed "
 msgstr "ÎÅ ÕÓÔÁÎÏ×ÌÅÎ "
 
-#: lib/query.c:295
+#: lib/query.c:291
 msgid "net shared    "
 msgstr "ÓÅÔÅ×ÏÊ       "
 
-#: lib/query.c:298
+#: lib/query.c:294
 #, c-format
 msgid "(unknown %3d) "
 msgstr "(ÎÅÉÚ×. %3d)  "
 
-#: lib/query.c:303
+#: lib/query.c:299
 msgid "(no state)    "
 msgstr "(ÓÏÓÔ. ÎÅÔ)   "
 
-#: lib/query.c:322 lib/query.c:378
+#: lib/query.c:318 lib/query.c:374
 msgid "package has neither file owner or id lists\n"
 msgstr "ÐÁËÅÔ ÎÅ ÓÏÄÅÒÖÉÔ ÓÐÉÓËÏ× ÎÉ ÈÏÚÑÅ× ÆÁÊÌÏ×, ÎÉ ÉÈ ID\n"
 
-#: lib/query.c:467
+#: lib/query.c:463
 #, c-format
 msgid "can't query %s: %s\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁÐÒÏÓÉÔØ %s: %s\n"
 
-#: lib/query.c:582 lib/rpmchecksig.c:159 lib/rpmchecksig.c:492
-#, c-format
-msgid "%s: readLead failed\n"
-msgstr "%s: ÏÛÉÂËÁ readLead\n"
-
-#: lib/query.c:588 lib/rpmchecksig.c:498
-#, c-format
-msgid "%s: No signature available (v1.0 RPM)\n"
-msgstr "%s: ðÏÄÐÉÓÉ ÎÅÔ (RPM v1.0)\n"
-
-#: lib/query.c:597 lib/rpmchecksig.c:177 lib/rpmchecksig.c:508
-#, c-format
-msgid "%s: rpmReadSignature failed\n"
-msgstr "%s: ÏÛÉÂËÁ rpmReadSignature\n"
-
-#: lib/query.c:601 lib/rpmchecksig.c:181 lib/rpmchecksig.c:513
-#, c-format
-msgid "%s: No signature available\n"
-msgstr "%s: ðÏÄÐÉÓØ ÎÅÄÏÓÔÕÐÎÁ\n"
-
-#: lib/query.c:624
-#, fuzzy, c-format
-msgid "%s: headerRead failed\n"
-msgstr "%s: ÏÛÉÂËÁ readLead\n"
-
-#: lib/query.c:641 lib/rpmchecksig.c:110 lib/rpmchecksig.c:287
-#, c-format
-msgid "%s: Fread failed: %s\n"
-msgstr "%s: ÏÛÉÂËÁ Fread: %s\n"
-
-#: lib/query.c:758 lib/query.c:796 lib/rpminstall.c:324 lib/rpminstall.c:468
-#: lib/rpminstall.c:848
+#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463
+#: lib/rpminstall.c:838
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s\n"
 
-#: lib/query.c:774
+#: lib/query.c:616
 #, c-format
 msgid "query of %s failed\n"
 msgstr "ÏÛÉÂËÁ ÚÁÐÒÏÓÁ %s\n"
 
-#: lib/query.c:780
+#: lib/query.c:622
 msgid "old format source packages cannot be queried\n"
 msgstr "ÚÁÐÒÏÓÙ Ë ÉÓÈÏÄÎÙÍ ÐÁËÅÔÁÍ × ÓÔÁÒÏÍ ÆÏÒÍÁÔÅ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÀÔÓÑ\n"
 
-#: lib/query.c:806 lib/rpminstall.c:481
+#: lib/query.c:648 lib/rpminstall.c:476
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: ÏÛÉÂËÁ ÞÔÅÎÉÑ ÓÐÉÓËÁ ÆÁÊÌÏ×: %s\n"
 
-#: lib/query.c:850
+#: lib/query.c:692
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "ÚÁÐÒÏÓ ÆÁÊÌÁ ÓÐÅÃÉÆÉËÁÃÉÉ %s ÎÅ ÕÄÁÌÓÑ, ÎÅ×ÏÚÍÏÖÎÏ ÒÁÚÏÂÒÁÔØ ÆÁÊÌ\n"
 
-#: lib/query.c:874
+#: lib/query.c:716
 msgid "no packages\n"
 msgstr "ÎÅÔ ÐÁËÅÔÏ×\n"
 
-#: lib/query.c:894
+#: lib/query.c:736
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "ÇÒÕÐÐÁ %s ÎÅ ÓÏÄÅÒÖÉÔ ÎÉËÁËÉÈ ÐÁËÅÔÏ×\n"
 
-#: lib/query.c:904
+#: lib/query.c:746
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "ÎÉ ÏÄÉÎ ÉÚ ÐÁËÅÔÏ× ÎÅ ×Ú×ÏÄÉÔ ÔÒÉÇÇÅÒ %s\n"
 
-#: lib/query.c:914
+#: lib/query.c:756
 #, c-format
 msgid "no package requires %s\n"
 msgstr "ÎÉ ÏÄÉÎ ÉÚ ÐÁËÅÔÏ× ÎÅ ÔÒÅÂÕÅÔ %s\n"
 
-#: lib/query.c:925
+#: lib/query.c:767
 #, c-format
 msgid "no package provides %s\n"
 msgstr "ÎÉ ÏÄÉÎ ÉÚ ÐÁËÅÔÏ× ÎÅ ÐÒÅÄÏÓÔÁ×ÌÑÅÔ %s\n"
 
-#: lib/query.c:962
+#: lib/query.c:804
 #, c-format
 msgid "file %s: %s\n"
 msgstr "ÆÁÊÌ %s: %s\n"
 
-#: lib/query.c:966
+#: lib/query.c:808
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "ÆÁÊÌ %s ÎÅ ÐÒÉÎÁÄÌÅÖÉÔ ÎÉ ÏÄÎÏÍÕ ÉÚ ÐÁËÅÔÏ×\n"
 
-#: lib/query.c:993
+#: lib/query.c:835
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "ÎÅ×ÅÒÎÙÊ ÎÏÍÅÒ ÐÁËÅÔÁ: %s\n"
 
-#: lib/query.c:996
+#: lib/query.c:838
 #, c-format
 msgid "package record number: %u\n"
 msgstr "ÎÏÍÅÒ ÚÁÐÉÓÉ ÐÁËÅÔÁ: %u\n"
 
-#: lib/query.c:1001
+#: lib/query.c:843
 #, c-format
 msgid "record %u could not be read\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ ÚÁÐÉÓØ %u\n"
 
-#: lib/query.c:1012 lib/rpminstall.c:634
+#: lib/query.c:854 lib/rpminstall.c:624
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "ÐÁËÅÔ %s ÎÅ ÕÓÔÁÎÏ×ÌÅÎ\n"
 
-#: lib/rpmchecksig.c:50
+#: lib/rpmchecksig.c:49
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s: ÏÛÉÂËÁ ÏÔËÒÙÔÉÑ: %s\n"
 
-#: lib/rpmchecksig.c:62
+#: lib/rpmchecksig.c:61
 msgid "makeTempFile failed\n"
 msgstr "ÏÛÉÂËÁ makeTempFile\n"
 
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:103
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: ÏÛÉÂËÁ Fwrite: %s\n"
 
-#: lib/rpmchecksig.c:164
+#: lib/rpmchecksig.c:163
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr "%s: îÅ ÍÏÇÕ ÐÏÄÐÉÓÁÔØ RPM v1.0\n"
 
-#: lib/rpmchecksig.c:168
+#: lib/rpmchecksig.c:167
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr "%s: îÅ ÍÏÇÕ ÐÅÒÅÐÏÄÐÉÓÁÔØ RPM v2.0\n"
 
-#: lib/rpmchecksig.c:214
+#: lib/rpmchecksig.c:213
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: ÏÛÉÂËÁ writeLead: %s\n"
 
-#: lib/rpmchecksig.c:220
+#: lib/rpmchecksig.c:219
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: ÏÛÉÂËÁ rpmWriteSignature: %s\n"
 
-#: lib/rpmchecksig.c:731
+#: lib/rpmchecksig.c:512
+#, c-format
+msgid "%s: No signature available (v1.0 RPM)\n"
+msgstr "%s: ðÏÄÐÉÓÉ ÎÅÔ (RPM v1.0)\n"
+
+#: lib/rpmchecksig.c:707
 msgid "NOT OK"
 msgstr "îå Oë"
 
-#: lib/rpmchecksig.c:732 lib/rpmchecksig.c:746
+#: lib/rpmchecksig.c:708 lib/rpmchecksig.c:722
 msgid " (MISSING KEYS:"
 msgstr " (ïôóõôóô÷õàô ëìàþé:"
 
-#: lib/rpmchecksig.c:734 lib/rpmchecksig.c:748
+#: lib/rpmchecksig.c:710 lib/rpmchecksig.c:724
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:735 lib/rpmchecksig.c:749
+#: lib/rpmchecksig.c:711 lib/rpmchecksig.c:725
 msgid " (UNTRUSTED KEYS:"
 msgstr " (îåô äï÷åòéñ ë ëìàþáí:"
 
-#: lib/rpmchecksig.c:737 lib/rpmchecksig.c:751
+#: lib/rpmchecksig.c:713 lib/rpmchecksig.c:727
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:745
+#: lib/rpmchecksig.c:721
 msgid "OK"
 msgstr "Oë"
 
@@ -2546,86 +2551,86 @@ msgstr "ðÏÄÇÏÔÏ×ËÁ..."
 msgid "Preparing packages for installation..."
 msgstr "ðÏÄÇÏÔÏ×ËÁ ÐÁËÅÔÏ× ÄÌÑ ÕÓÔÁÎÏ×ËÉ..."
 
-#: lib/rpminstall.c:274
+#: lib/rpminstall.c:228
+#, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ ÂÁÚÕ ÄÁÎÎÙÈ Packages × %s\n"
+
+#: lib/rpminstall.c:285
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "úÁÇÒÕÖÁÅÔÓÑ %s\n"
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:284
+#: lib/rpminstall.c:295
 #, c-format
 msgid " ... as %s\n"
 msgstr " ... ËÁË %s\n"
 
-#: lib/rpminstall.c:288
+#: lib/rpminstall.c:299
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "%s ÐÒÏÐÕÓËÁÅÔÓÑ - ÏÛÉÂËÁ ÐÅÒÅÄÁÞÉ - %s\n"
 
-#: lib/rpminstall.c:370
-#, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr "ÎÅ ÍÏÇÕ ÏÔËÒÙÔØ ÂÁÚÕ ÄÁÎÎÙÈ Packages × %s\n"
-
-#: lib/rpminstall.c:393
+#: lib/rpminstall.c:388
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr "ÐÁËÅÔ %s - ÎÅ ÐÅÒÅÍÅÝÁÅÍÙÊ\n"
 
-#: lib/rpminstall.c:442
+#: lib/rpminstall.c:437
 #, c-format
 msgid "error reading from file %s\n"
 msgstr "ÏÛÉÂËÁ ÞÔÅÎÉÑ ÉÚ ÆÁÊÌÁ %s\n"
 
-#: lib/rpminstall.c:448
+#: lib/rpminstall.c:443
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr "ÄÌÑ ÆÁÊÌÁ %s ÎÅÏÂÈÏÄÉÍÁ ÂÏÌÅÅ ÎÏ×ÁÑ ×ÅÒÓÉÑ RPM\n"
 
-#: lib/rpminstall.c:460 lib/rpminstall.c:705
+#: lib/rpminstall.c:455 lib/rpminstall.c:694
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr "%s ÎÅ ÍÏÖÅÔ ÂÙÔØ ÕÓÔÁÎÏ×ÌÅÎ\n"
 
-#: lib/rpminstall.c:496
+#: lib/rpminstall.c:491
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "ÎÁÊÄÅÎÏ %d ÉÓÈÏÄÎÙÈ É %d ÂÉÎÁÒÎÙÈ ÐÁËÅÔÏ×\n"
 
-#: lib/rpminstall.c:512
+#: lib/rpminstall.c:507
 msgid "failed dependencies:\n"
 msgstr "ÎÅÕÄÏ×ÌÅÔ×ÏÒÅÎÎÙÅ ÚÁ×ÉÓÉÍÏÓÔÉ:\n"
 
-#: lib/rpminstall.c:533
+#: lib/rpminstall.c:528
 msgid "installing binary packages\n"
 msgstr "ÕÓÔÁÎÁ×ÌÉ×ÁÀ ÂÉÎÁÒÎÙÅ ÐÁËÅÔÙ\n"
 
-#: lib/rpminstall.c:554
+#: lib/rpminstall.c:549
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ %s: %s\n"
 
-#: lib/rpminstall.c:621
+#: lib/rpminstall.c:611
 #, c-format
 msgid "cannot open %s/packages.rpm\n"
 msgstr "ÏÛÉÂËÁ ÏÔËÒÙÔÉÑ %s/packages.rpm\n"
 
-#: lib/rpminstall.c:637
+#: lib/rpminstall.c:627
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" ÚÁÄÁÅÔ ÎÅÓËÏÌØËÏ ÐÁËÅÔÏ×\n"
 
-#: lib/rpminstall.c:661
+#: lib/rpminstall.c:651
 msgid "removing these packages would break dependencies:\n"
 msgstr "ÕÄÁÌÅÎÉÅ ÜÔÉÈ ÐÁËÅÔÏ× ÎÁÒÕÛÉÔ ÚÁ×ÉÓÉÍÏÓÔÉ:\n"
 
-#: lib/rpminstall.c:691
+#: lib/rpminstall.c:680
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s\n"
 
-#: lib/rpminstall.c:697
+#: lib/rpminstall.c:686
 #, c-format
 msgid "Installing %s\n"
 msgstr "õÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ %s\n"
@@ -2899,17 +2904,17 @@ msgstr ""
 "× ÐÁËÅÔÅ ÎÅÔ ÎÉ ÉÍÅÎ ÇÒÕÐÐ, ÎÉ ÓÐÉÓËÁ ÉÈ ÉÄÅÎÔÉÆÉËÁÔÏÒÏ× (ÔÁËÏÇÏ ÎÅ ÄÏÌÖÎÏ "
 "ÂÙÔØ)\n"
 
-#: lib/verify.c:414
+#: lib/verify.c:417
 #, c-format
 msgid "missing    %s"
 msgstr "ÏÔÓÕÔÓÔ×ÕÅÔ %s"
 
-#: lib/verify.c:511
+#: lib/verify.c:514
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr "îÅÕÄÏ×ÌÅÔ×ÏÒÅÎÎÙÅ ÚÁ×ÉÓÉÍÏÓÔÉ ÄÌÑ %s-%s-%s: "
 
-#: lib/verify.c:556
+#: lib/verify.c:559
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr "%s-%s-%s: ÎÅÐÒÁ×ÉÌØÎÁÑ ÐÏÄÐÉÓØ ÏÂÌÁÓÔÉ ÚÁÇÏÌÏ×ËÁ ÐÁËÅÔÁ\n"
diff --git a/po/sk.po b/po/sk.po
index 11d6ee8bb..d2bde8741 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-24 21:17-0400\n"
+"POT-Creation-Date: 2001-10-26 00:15-0400\n"
 "PO-Revision-Date: 1999-04-08 21:37+02:00\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -66,15 +66,15 @@ msgstr "predefinova» cieµovú platformu"
 msgid "Building for target %s\n"
 msgstr "vyhµadáva sa balík %s\n"
 
-#: rpm2cpio.c:34
+#: rpm2cpio.c:55
 msgid "argument is not an RPM package\n"
 msgstr "argument nie je RPM balík\n"
 
-#: rpm2cpio.c:38
+#: rpm2cpio.c:61
 msgid "error reading header from package\n"
 msgstr "chyba pri èítaní hlavièky balíka\n"
 
-#: rpm2cpio.c:60
+#: rpm2cpio.c:83
 #, fuzzy, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr "nie je mo¾né otvori» súbor %s\n"
@@ -412,44 +412,44 @@ msgstr "--sign mô¾e by» pou¾íté iba poèas zostavenia balíka"
 msgid "exec failed\n"
 msgstr "vykonanie zlyhalo\n"
 
-#: rpmqv.c:959
+#: rpmqv.c:963
 msgid "no packages files given for rebuild"
 msgstr "neboli zadané ¾iadne balíky pre znovuzostavenie"
 
-#: rpmqv.c:1026
+#: rpmqv.c:1038
 msgid "no spec files given for build"
 msgstr "neboli zadané ¾iadne spec-súbory pre zostavenie"
 
-#: rpmqv.c:1028
+#: rpmqv.c:1040
 msgid "no tar files given for build"
 msgstr "neboli zadané ¾iadne tar-súbory pre zostavenie"
 
-#: rpmqv.c:1047
+#: rpmqv.c:1059
 msgid "no packages given for uninstall"
 msgstr "neboli zadané ¾iadne balíky pre odin¹talovanie"
 
-#: rpmqv.c:1058
+#: rpmqv.c:1070
 msgid "no packages given for install"
 msgstr "neboli zadané ¾iadne balíky pre in¹taláciu"
 
-#: rpmqv.c:1106
+#: rpmqv.c:1118
 msgid "no arguments given for query"
 msgstr "neboli zadané ¾iadne argumenty pre otázku"
 
-#: rpmqv.c:1120
+#: rpmqv.c:1132
 msgid "no arguments given for verify"
 msgstr "neboli zadané ¾iadne argumenty pre overenie"
 
-#: rpmqv.c:1128
+#: rpmqv.c:1140
 msgid "unexpected arguments to --querytags "
 msgstr "neoèakávané argumenty pre --querytags"
 
-#: rpmqv.c:1144
+#: rpmqv.c:1156
 #, fuzzy
 msgid "no arguments given"
 msgstr "neboli zadané ¾iadne argumenty pre otázku"
 
-#: build/build.c:125 build/pack.c:466
+#: build/build.c:125 build/pack.c:487
 #, fuzzy
 msgid "Unable to open temp file.\n"
 msgstr "Nie je mo¾né otvori» doèasný súbor"
@@ -670,7 +670,7 @@ msgstr "Súbor nebol nájdený: %s"
 msgid "Could not open %%files file %s: %s\n"
 msgstr "chybe: nie je mo¾né otvori» %%files súbor: %s"
 
-#: build/files.c:1777 build/pack.c:145
+#: build/files.c:1777 build/pack.c:148
 #, fuzzy, c-format
 msgid "line: %s\n"
 msgstr "riadok: %s"
@@ -745,157 +745,157 @@ msgstr ""
 msgid "Could not canonicalize hostname: %s\n"
 msgstr "Nie je mo¾né kanonizova» názov poèítaèa: %s\n"
 
-#: build/pack.c:78
+#: build/pack.c:81
 #, fuzzy, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr "vytvorenie archívu zlyhalo pri súbore %s: %s"
 
-#: build/pack.c:81
+#: build/pack.c:84
 #, fuzzy, c-format
 msgid "create archive failed: %s\n"
 msgstr "vytvorenie archívu zlyhalo pri súbore %s: %s"
 
-#: build/pack.c:103
+#: build/pack.c:106
 #, fuzzy, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr "cpio_copy zápis zlyhal: %s"
 
-#: build/pack.c:110
+#: build/pack.c:113
 #, fuzzy, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr "cpio_copy èítanie zlyhalo: %s"
 
-#: build/pack.c:213
+#: build/pack.c:216
 #, fuzzy, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr "Nie je mo¾né otvori» PreIn súbor: %s"
 
-#: build/pack.c:220
+#: build/pack.c:223
 #, fuzzy, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr "Nie je mo¾né otvori» PreUn súbor: %s"
 
-#: build/pack.c:227
+#: build/pack.c:230
 #, fuzzy, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr "Nie je mo¾né otvori» PostIn súbor: %s"
 
-#: build/pack.c:234
+#: build/pack.c:237
 #, fuzzy, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr "Nie je mo¾né otvori» PostUn súbor: %s"
 
-#: build/pack.c:242
+#: build/pack.c:245
 #, fuzzy, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr "Nie je mo¾né otvori» VerifyScript súbor: %s"
 
-#: build/pack.c:257
+#: build/pack.c:260
 #, fuzzy, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr "Nie je mo¾né otvori» Trigger skriptový súbor: %s"
 
-#: build/pack.c:285
+#: build/pack.c:288
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "readRPM: otvorenie %s: %s\n"
 
-#: build/pack.c:295
+#: build/pack.c:298
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr "readRPM: èítanie %s: %s\n"
 
-#: build/pack.c:304 build/pack.c:508
+#: build/pack.c:307 build/pack.c:529
 #, fuzzy, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: readLead zlyhalo\n"
 
-#: build/pack.c:320
+#: build/pack.c:341
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr "readRPM: %s nie je RPM balík\n"
 
-#: build/pack.c:329
+#: build/pack.c:350
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: èítanie hlavièky %s\n"
 
-#: build/pack.c:454
+#: build/pack.c:475
 #, fuzzy
 msgid "Unable to create immutable header region.\n"
 msgstr "Nie je mo¾né preèíta» ikonu: %s"
 
-#: build/pack.c:472
+#: build/pack.c:493
 #, fuzzy
 msgid "Unable to write temp header\n"
 msgstr "Nie je mo¾né zapísa» %s"
 
-#: build/pack.c:480
+#: build/pack.c:501
 #, fuzzy
 msgid "Bad CSA data\n"
 msgstr "Chybné CSA dáta"
 
-#: build/pack.c:515
+#: build/pack.c:536
 #, fuzzy
 msgid "Unable to write final header\n"
 msgstr "Nie je mo¾né zapísa» %s"
 
-#: build/pack.c:533
+#: build/pack.c:554
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "Vytvára sa PGP podpis: %d\n"
 
-#: build/pack.c:546
+#: build/pack.c:567
 #, fuzzy
 msgid "Unable to reload signature header.\n"
 msgstr "Nie je mo¾né preèíta» ikonu: %s"
 
-#: build/pack.c:554
+#: build/pack.c:575
 #, fuzzy, c-format
 msgid "Could not open %s: %s\n"
 msgstr "Otvorenie %s zlyhalo\n"
 
-#: build/pack.c:590 lib/psm.c:2149
+#: build/pack.c:611 lib/psm.c:2153
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Nie je mo¾né zapísa» balík: %s"
 
-#: build/pack.c:605
+#: build/pack.c:626
 #, fuzzy, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "Nie je preèíta» sigtarget: %s"
 
-#: build/pack.c:615
+#: build/pack.c:636
 #, fuzzy, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "Nie je mo¾né preèíta» ikonu: %s"
 
-#: build/pack.c:629
+#: build/pack.c:650
 #, fuzzy, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "Nie je mo¾né zapísa» balík: %s"
 
-#: build/pack.c:639
+#: build/pack.c:660
 #, fuzzy, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "Nie je mo¾né preèíta» ikonu: %s"
 
-#: build/pack.c:645
+#: build/pack.c:666
 #, fuzzy, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Nie je mo¾né zapísa» balík: %s"
 
-#: build/pack.c:670 lib/psm.c:2415
+#: build/pack.c:691 lib/psm.c:2419
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Zapísané: %s\n"
 
-#: build/pack.c:737
+#: build/pack.c:758
 #, 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:754
+#: build/pack.c:775
 #, fuzzy, c-format
 msgid "cannot create %s: %s\n"
 msgstr "nie je mo¾né zapísa» do %s: "
@@ -1482,61 +1482,61 @@ msgstr ""
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1248 lib/depends.c:1381
+#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1248 lib/depends.c:1381
+#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
 #, fuzzy
 msgid "NO "
 msgstr "NIE JE V PORIADKU"
 
-#: lib/depends.c:1042
+#: lib/depends.c:1044
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:1153
+#: lib/depends.c:1155
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:1247
+#: lib/depends.c:1249
 #, fuzzy, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n"
 
-#: lib/depends.c:1276
+#: lib/depends.c:1278
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1293
+#: lib/depends.c:1295
 #, fuzzy, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n"
 
-#: lib/depends.c:1317
+#: lib/depends.c:1319
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1330
+#: lib/depends.c:1332
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1344
+#: lib/depends.c:1346
 #, fuzzy, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n"
 
-#: lib/depends.c:1360
+#: lib/depends.c:1362
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1381
+#: lib/depends.c:1383
 #, fuzzy, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n"
@@ -1544,42 +1544,42 @@ msgstr "súbor %s nie je vlastnený ¾iadnym balíkom\n"
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1454
+#: lib/depends.c:1456
 #, 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:1533
+#: lib/depends.c:1535
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "balík %s koliduje: %s\n"
 
-#: lib/depends.c:1786
+#: lib/depends.c:1788
 #, 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:1936
+#: lib/depends.c:1938
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1996
+#: lib/depends.c:1998
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2046
+#: lib/depends.c:2048
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:2099
+#: lib/depends.c:2101
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:2129
+#: lib/depends.c:2131
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -1768,17 +1768,47 @@ msgstr "(neznámy typ)"
 msgid "error creating temporary file %s\n"
 msgstr "chyba pri vytváraní doèasného súboru %s"
 
-#: lib/package.c:161
+#: lib/package.c:167 lib/package.c:238
 #, fuzzy
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr "táto verzia RPM podporuje iba balíky s hlavným èíslom <= 3"
 
-#: lib/package.c:184
+#: lib/package.c:188 lib/package.c:246
 #, fuzzy
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr "táto verzia RPM podporuje iba balíky s hlavným èíslom <= 3"
 
+#: lib/package.c:224 lib/rpmchecksig.c:158 lib/rpmchecksig.c:506
+#, c-format
+msgid "%s: readLead failed\n"
+msgstr "%s: readLead zlyhalo\n"
+
+#: lib/package.c:230
+#, fuzzy, c-format
+msgid "%s: bad magic\n"
+msgstr "Chybné magické èíslo"
+
+#: lib/package.c:254 lib/rpmchecksig.c:176 lib/rpmchecksig.c:522
+#, c-format
+msgid "%s: rpmReadSignature failed\n"
+msgstr "%s: rpmReadSignature zlyhalo\n"
+
+#: lib/package.c:258 lib/rpmchecksig.c:180 lib/rpmchecksig.c:527
+#, c-format
+msgid "%s: No signature available\n"
+msgstr "%s: Podpis nie je k dispozícii\n"
+
+#: lib/package.c:284
+#, fuzzy, c-format
+msgid "%s: headerRead failed\n"
+msgstr "%s: readLead zlyhalo\n"
+
+#: lib/package.c:303 lib/rpmchecksig.c:109 lib/rpmchecksig.c:450
+#, fuzzy, c-format
+msgid "%s: Fread failed: %s\n"
+msgstr "%s: readLead zlyhalo\n"
+
 #: lib/poptI.c:47
 msgid "exclude paths must begin with a /"
 msgstr "vynechané cesty musia zaèína» znakom /"
@@ -2317,280 +2347,255 @@ msgstr "nie je mo¾né zapísa» do %s: "
 msgid "cannot write to %%%s %s\n"
 msgstr "nie je mo¾né zapísa» do %s: "
 
-#: lib/psm.c:1214
+#: lib/psm.c:1217
 #, fuzzy
 msgid "source package expected, binary found\n"
 msgstr "oèakávaný zdrojový balík, nájdený binárny"
 
-#: lib/psm.c:1325
+#: lib/psm.c:1330
 #, fuzzy
 msgid "source package contains no .spec file\n"
 msgstr "zdrojový balík neobsahuje ¾iadny .spec súbor"
 
-#: lib/psm.c:1432
+#: lib/psm.c:1436
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "vykonávajú sa poin¹talaèné skripty (ak existujú)\n"
 
-#: lib/psm.c:1600
+#: lib/psm.c:1604
 #, fuzzy, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr "vykonanie skriptu zlyhalo"
 
-#: lib/psm.c:1607
+#: lib/psm.c:1611
 #, fuzzy, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr "vykonanie skriptu zlyhalo"
 
-#: lib/psm.c:1954
+#: lib/psm.c:1958
 #, fuzzy, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr "balík: %s-%s-%s test súborov = %d\n"
 
-#: lib/psm.c:2071
+#: lib/psm.c:2075
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2186
+#: lib/psm.c:2190
 #, fuzzy, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "pou¾ívateµ %s neexistuje - pou¾ije sa root"
 
-#: lib/psm.c:2195
+#: lib/psm.c:2199
 #, fuzzy, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "skupina %s neexistuje - pou¾ije sa root"
 
-#: lib/psm.c:2236
+#: lib/psm.c:2240
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "rozbalenie archívu zlyhalo%s%s: %s"
 
-#: lib/psm.c:2237
+#: lib/psm.c:2241
 msgid " on file "
 msgstr " pre súbor "
 
-#: lib/psm.c:2423
+#: lib/psm.c:2427
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "nepodarilo sa otvori» %s: %s"
 
-#: lib/psm.c:2426
+#: lib/psm.c:2430
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s zlyhalo"
 
-#: lib/query.c:128
+#: lib/query.c:124
 #, fuzzy, c-format
 msgid "incorrect format: %s\n"
 msgstr "chyba formátu: %s\n"
 
-#: lib/query.c:225
+#: lib/query.c:221
 msgid "(contains no files)"
 msgstr "(neobsahuje ¾iadne súbory)"
 
-#: lib/query.c:286
+#: lib/query.c:282
 msgid "normal        "
 msgstr "normálny      "
 
-#: lib/query.c:289
+#: lib/query.c:285
 msgid "replaced      "
 msgstr "nahradený     "
 
-#: lib/query.c:292
+#: lib/query.c:288
 msgid "not installed "
 msgstr "nein¹talovaný "
 
-#: lib/query.c:295
+#: lib/query.c:291
 msgid "net shared    "
 msgstr "zdieµaný      "
 
-#: lib/query.c:298
+#: lib/query.c:294
 #, c-format
 msgid "(unknown %3d) "
 msgstr "(neznámy %d)  "
 
-#: lib/query.c:303
+#: lib/query.c:299
 msgid "(no state)    "
 msgstr "(¾iadny stav) "
 
-#: lib/query.c:322 lib/query.c:378
+#: lib/query.c:318 lib/query.c:374
 #, fuzzy
 msgid "package has neither file owner or id lists\n"
 msgstr "balík neobsahuje ani vlastníka súboru, ani zoznamy identifikácií"
 
-#: lib/query.c:467
+#: lib/query.c:463
 #, fuzzy, c-format
 msgid "can't query %s: %s\n"
 msgstr "zmazanie %s zlyhalo: %s\n"
 
-#: lib/query.c:582 lib/rpmchecksig.c:159 lib/rpmchecksig.c:492
-#, c-format
-msgid "%s: readLead failed\n"
-msgstr "%s: readLead zlyhalo\n"
-
-#: lib/query.c:588 lib/rpmchecksig.c:498
-#, c-format
-msgid "%s: No signature available (v1.0 RPM)\n"
-msgstr "%s: Podpis nie je k dispozícii (v1.0 RPM)\n"
-
-#: lib/query.c:597 lib/rpmchecksig.c:177 lib/rpmchecksig.c:508
-#, c-format
-msgid "%s: rpmReadSignature failed\n"
-msgstr "%s: rpmReadSignature zlyhalo\n"
-
-#: lib/query.c:601 lib/rpmchecksig.c:181 lib/rpmchecksig.c:513
-#, c-format
-msgid "%s: No signature available\n"
-msgstr "%s: Podpis nie je k dispozícii\n"
-
-#: lib/query.c:624
-#, fuzzy, c-format
-msgid "%s: headerRead failed\n"
-msgstr "%s: readLead zlyhalo\n"
-
-#: lib/query.c:641 lib/rpmchecksig.c:110 lib/rpmchecksig.c:287
-#, fuzzy, c-format
-msgid "%s: Fread failed: %s\n"
-msgstr "%s: readLead zlyhalo\n"
-
-#: lib/query.c:758 lib/query.c:796 lib/rpminstall.c:324 lib/rpminstall.c:468
-#: lib/rpminstall.c:848
+#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463
+#: lib/rpminstall.c:838
 #, fuzzy, c-format
 msgid "open of %s failed: %s\n"
 msgstr "otvorenie %s zlyhalo\n"
 
-#: lib/query.c:774
+#: lib/query.c:616
 #, c-format
 msgid "query of %s failed\n"
 msgstr "otázka na %s zlyhala\n"
 
-#: lib/query.c:780
+#: lib/query.c:622
 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:806 lib/rpminstall.c:481
+#: lib/query.c:648 lib/rpminstall.c:476
 #, fuzzy, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: readLead zlyhalo\n"
 
-#: lib/query.c:850
+#: lib/query.c:692
 #, 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:874
+#: lib/query.c:716
 #, fuzzy
 msgid "no packages\n"
 msgstr "nájdených %d balíkov\n"
 
-#: lib/query.c:894
+#: lib/query.c:736
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "skupina %s neobsahuje ¾iadne balíky\n"
 
-#: lib/query.c:904
+#: lib/query.c:746
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "¾iadny z balíkov nespú¹»a %s\n"
 
-#: lib/query.c:914
+#: lib/query.c:756
 #, c-format
 msgid "no package requires %s\n"
 msgstr "¾iadny z balíkov nevy¾aduje %s\n"
 
-#: lib/query.c:925
+#: lib/query.c:767
 #, c-format
 msgid "no package provides %s\n"
 msgstr "¾iadny z balíkov neposkytuje %s\n"
 
-#: lib/query.c:962
+#: lib/query.c:804
 #, c-format
 msgid "file %s: %s\n"
 msgstr "súbor %s: %s\n"
 
-#: lib/query.c:966
+#: lib/query.c:808
 #, 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:993
+#: lib/query.c:835
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "chybné èíslo balíku: %s\n"
 
-#: lib/query.c:996
+#: lib/query.c:838
 #, fuzzy, c-format
 msgid "package record number: %u\n"
 msgstr "po¾aduje sa záznam èíslo %d\n"
 
-#: lib/query.c:1001
+#: lib/query.c:843
 #, fuzzy, c-format
 msgid "record %u could not be read\n"
 msgstr "záznam %d nie je mo¾né preèíta»\n"
 
-#: lib/query.c:1012 lib/rpminstall.c:634
+#: lib/query.c:854 lib/rpminstall.c:624
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "balík %s nie je nain¹talovaný\n"
 
-#: lib/rpmchecksig.c:50
+#: lib/rpmchecksig.c:49
 #, fuzzy, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s: otvorenie zlyhalo\n"
 
-#: lib/rpmchecksig.c:62
+#: lib/rpmchecksig.c:61
 #, fuzzy
 msgid "makeTempFile failed\n"
 msgstr "vykonanie zlyhalo\n"
 
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:103
 #, fuzzy, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: readLead zlyhalo\n"
 
-#: lib/rpmchecksig.c:164
+#: lib/rpmchecksig.c:163
 #, 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:168
+#: lib/rpmchecksig.c:167
 #, 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:214
+#: lib/rpmchecksig.c:213
 #, fuzzy, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: readLead zlyhalo\n"
 
-#: lib/rpmchecksig.c:220
+#: lib/rpmchecksig.c:219
 #, fuzzy, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmReadSignature zlyhalo\n"
 
-#: lib/rpmchecksig.c:731
+#: lib/rpmchecksig.c:512
+#, 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:707
 msgid "NOT OK"
 msgstr "NIE JE V PORIADKU"
 
-#: lib/rpmchecksig.c:732 lib/rpmchecksig.c:746
+#: lib/rpmchecksig.c:708 lib/rpmchecksig.c:722
 msgid " (MISSING KEYS:"
 msgstr " (CHÝBAJÚCE K¥ÚÈE):"
 
-#: lib/rpmchecksig.c:734 lib/rpmchecksig.c:748
+#: lib/rpmchecksig.c:710 lib/rpmchecksig.c:724
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:735 lib/rpmchecksig.c:749
+#: lib/rpmchecksig.c:711 lib/rpmchecksig.c:725
 msgid " (UNTRUSTED KEYS:"
 msgstr " (NEDÔVERUJE SA K¥ÚÈOM: "
 
-#: lib/rpmchecksig.c:737 lib/rpmchecksig.c:751
+#: lib/rpmchecksig.c:713 lib/rpmchecksig.c:727
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:745
+#: lib/rpmchecksig.c:721
 msgid "OK"
 msgstr "V PORIADKU"
 
@@ -2603,86 +2608,86 @@ msgstr ""
 msgid "Preparing packages for installation..."
 msgstr "neboli zadané ¾iadne balíky pre in¹taláciu"
 
-#: lib/rpminstall.c:274
+#: lib/rpminstall.c:228
+#, fuzzy, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr "nie je mo¾né otvori» %s/packages.rpm\n"
+
+#: lib/rpminstall.c:285
 #, 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:284
+#: lib/rpminstall.c:295
 #, c-format
 msgid " ... as %s\n"
 msgstr "... ako %s\n"
 
-#: lib/rpminstall.c:288
+#: lib/rpminstall.c:299
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "%s vynechané - prenos zlyhal - %s\n"
 
-#: lib/rpminstall.c:370
-#, fuzzy, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr "nie je mo¾né otvori» %s/packages.rpm\n"
-
-#: lib/rpminstall.c:393
+#: lib/rpminstall.c:388
 #, fuzzy, c-format
 msgid "package %s is not relocateable\n"
 msgstr "balík %s nie je nain¹talovaný\n"
 
-#: lib/rpminstall.c:442
+#: lib/rpminstall.c:437
 #, fuzzy, c-format
 msgid "error reading from file %s\n"
 msgstr "chyba pri vytváraní doèasného súboru %s"
 
-#: lib/rpminstall.c:448
+#: lib/rpminstall.c:443
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:460 lib/rpminstall.c:705
+#: lib/rpminstall.c:455 lib/rpminstall.c:694
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr "%s nie je mo¾né nain¹talova»\n"
 
-#: lib/rpminstall.c:496
+#: lib/rpminstall.c:491
 #, 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:512
+#: lib/rpminstall.c:507
 msgid "failed dependencies:\n"
 msgstr "nevyrie¹ené závislosti:\n"
 
-#: lib/rpminstall.c:533
+#: lib/rpminstall.c:528
 msgid "installing binary packages\n"
 msgstr "in¹talujú sa binárne balíky\n"
 
-#: lib/rpminstall.c:554
+#: lib/rpminstall.c:549
 #, fuzzy, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "nie je mo¾né otvori» súbor %s: %s"
 
-#: lib/rpminstall.c:621
+#: lib/rpminstall.c:611
 #, c-format
 msgid "cannot open %s/packages.rpm\n"
 msgstr "nie je mo¾né otvori» %s/packages.rpm\n"
 
-#: lib/rpminstall.c:637
+#: lib/rpminstall.c:627
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" ¹pecifikuje viac balíkov\n"
 
-#: lib/rpminstall.c:661
+#: lib/rpminstall.c:651
 msgid "removing these packages would break dependencies:\n"
 msgstr "odstránenie týchto balíkov by poru¹ilo závislosti:\n"
 
-#: lib/rpminstall.c:691
+#: lib/rpminstall.c:680
 #, fuzzy, c-format
 msgid "cannot open %s: %s\n"
 msgstr "nie je mo¾né otvori» %s\n"
 
-#: lib/rpminstall.c:697
+#: lib/rpminstall.c:686
 #, c-format
 msgid "Installing %s\n"
 msgstr "In¹taluje sa %s\n"
@@ -2967,17 +2972,17 @@ msgstr ""
 "v balíku chýba tak meno skupiny, ako aj zoznamy identifikácií (nemalo by sa "
 "nikdy sta»)"
 
-#: lib/verify.c:414
+#: lib/verify.c:417
 #, fuzzy, c-format
 msgid "missing    %s"
 msgstr "chýbajúce    %s\n"
 
-#: lib/verify.c:511
+#: lib/verify.c:514
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr "Nevyrie¹ené závislosti pre %s-%s-%s: "
 
-#: lib/verify.c:556
+#: lib/verify.c:559
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
diff --git a/po/sl.po b/po/sl.po
index 59f380a03..0d1936754 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,12 +1,12 @@
 # -*- mode:po; coding:iso-latin-2; -*- Slovenian messages for Redhat pkg. mngr.
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Primo¾ Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2000.
-# $Id: sl.po,v 1.173 2001/10/25 01:36:43 jbj Exp $
+# $Id: sl.po,v 1.174 2001/10/26 04:16:46 jbj Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-24 21:17-0400\n"
+"POT-Creation-Date: 2001-10-26 00:15-0400\n"
 "PO-Revision-Date: 2000-10-08 19:05+0200\n"
 "Last-Translator: Grega Fajdiga <gregor.fajdiga@telemach.net>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -70,15 +70,15 @@ msgstr "Izgradnja za ciljna strojna okolja: %s\n"
 msgid "Building for target %s\n"
 msgstr "Izgradnja za ciljni sistem %s\n"
 
-#: rpm2cpio.c:34
+#: rpm2cpio.c:55
 msgid "argument is not an RPM package\n"
 msgstr "navedeni argument ni paket RPM\n"
 
-#: rpm2cpio.c:38
+#: rpm2cpio.c:61
 msgid "error reading header from package\n"
 msgstr "napaka pri branju glave paketa\n"
 
-#: rpm2cpio.c:60
+#: rpm2cpio.c:83
 #, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr "ni mo¾no vnoviè odpreti (payload): %s\n"
@@ -410,44 +410,44 @@ msgstr "--sign sme biti podan le ob izgradnji paketa"
 msgid "exec failed\n"
 msgstr "izvajanje je bilo neuspe¹no\n"
 
-#: rpmqv.c:959
+#: rpmqv.c:963
 msgid "no packages files given for rebuild"
 msgstr "paketi za vnovièno izgradnjo niso navedeni"
 
-#: rpmqv.c:1026
+#: rpmqv.c:1038
 msgid "no spec files given for build"
 msgstr "datoteka spec za izgradnjo manjka"
 
-#: rpmqv.c:1028
+#: rpmqv.c:1040
 msgid "no tar files given for build"
 msgstr "arhiv tar za izgradnjo manjka"
 
-#: rpmqv.c:1047
+#: rpmqv.c:1059
 msgid "no packages given for uninstall"
 msgstr "paketi katere bi bilo potrebno odstraniti niso navedeni"
 
-#: rpmqv.c:1058
+#: rpmqv.c:1070
 msgid "no packages given for install"
 msgstr "paketi katere bi bilo potrebno namestiti niso navedeni"
 
-#: rpmqv.c:1106
+#: rpmqv.c:1118
 msgid "no arguments given for query"
 msgstr "argumenti za poizvedbo niso podani"
 
-#: rpmqv.c:1120
+#: rpmqv.c:1132
 msgid "no arguments given for verify"
 msgstr "argumenti za preverjanje niso podani"
 
-#: rpmqv.c:1128
+#: rpmqv.c:1140
 msgid "unexpected arguments to --querytags "
 msgstr "neprièakovani argumenti za --querytags "
 
-#: rpmqv.c:1144
+#: rpmqv.c:1156
 #, fuzzy
 msgid "no arguments given"
 msgstr "argumenti za poizvedbo niso podani"
 
-#: build/build.c:125 build/pack.c:466
+#: build/build.c:125 build/pack.c:487
 #, fuzzy
 msgid "Unable to open temp file.\n"
 msgstr "Zaèasne datoteke ni mo¾no odpreti"
@@ -668,7 +668,7 @@ msgstr "Datoteke ni mo¾no najti z raz¹iritvijo metaznakov v imenu: %s"
 msgid "Could not open %%files file %s: %s\n"
 msgstr "Datoteke %s iz %%files ni mo¾no odpreti: %s"
 
-#: build/files.c:1777 build/pack.c:145
+#: build/files.c:1777 build/pack.c:148
 #, fuzzy, c-format
 msgid "line: %s\n"
 msgstr "vrstica: %s"
@@ -743,157 +743,157 @@ msgstr ""
 msgid "Could not canonicalize hostname: %s\n"
 msgstr "Iskanje kanoniènega imena gostitelja je bilo neuspe¹no: %s\n"
 
-#: build/pack.c:78
+#: build/pack.c:81
 #, fuzzy, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr "ustvarjanje arhiva je bilo za datoteko %s neuspe¹no: %s"
 
-#: build/pack.c:81
+#: build/pack.c:84
 #, fuzzy, c-format
 msgid "create archive failed: %s\n"
 msgstr "ustvarjanje arhiva je bilo za datoteko %s neuspe¹no: %s"
 
-#: build/pack.c:103
+#: build/pack.c:106
 #, fuzzy, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr "pisanje cpio_copy neuspe¹no: %s"
 
-#: build/pack.c:110
+#: build/pack.c:113
 #, fuzzy, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr "branje cpio_copy neuspe¹no: %s"
 
-#: build/pack.c:213
+#: build/pack.c:216
 #, fuzzy, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr "Datoteke PreIn ni mo¾no odpreti: %s"
 
-#: build/pack.c:220
+#: build/pack.c:223
 #, fuzzy, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr "Datoteke PreUn ni mo¾no odpreti: %s"
 
-#: build/pack.c:227
+#: build/pack.c:230
 #, fuzzy, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr "Datoteke PostIn ni mo¾no odpreti: %s"
 
-#: build/pack.c:234
+#: build/pack.c:237
 #, fuzzy, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr "Datoteke PostUn ni mo¾no odpreti: %s"
 
-#: build/pack.c:242
+#: build/pack.c:245
 #, fuzzy, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr "Datoteke VerifyScript ni mo¾no odpreti: %s"
 
-#: build/pack.c:257
+#: build/pack.c:260
 #, fuzzy, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr "Skriptne datoteke Trigger ni mo¾no odpreti: %s"
 
-#: build/pack.c:285
+#: build/pack.c:288
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "readRPM: odpiranje %s: %s\n"
 
-#: build/pack.c:295
+#: build/pack.c:298
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr "readRPM: branje %s: %s\n"
 
-#: build/pack.c:304 build/pack.c:508
+#: build/pack.c:307 build/pack.c:529
 #, fuzzy, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: branje Fread je bilo neuspe¹no: %s\n"
 
-#: build/pack.c:320
+#: build/pack.c:341
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr "readRPM: %s ni paket tipa RPM\n"
 
-#: build/pack.c:329
+#: build/pack.c:350
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: branje glave %s\n"
 
-#: build/pack.c:454
+#: build/pack.c:475
 #, fuzzy
 msgid "Unable to create immutable header region.\n"
 msgstr "Ikone %s ni mo¾no prebrati: %s"
 
-#: build/pack.c:472
+#: build/pack.c:493
 #, fuzzy
 msgid "Unable to write temp header\n"
 msgstr "Ni mo¾no zapisati paketa %s: %s"
 
-#: build/pack.c:480
+#: build/pack.c:501
 #, fuzzy
 msgid "Bad CSA data\n"
 msgstr "Po¹kodovani podatki CSA"
 
-#: build/pack.c:515
+#: build/pack.c:536
 #, fuzzy
 msgid "Unable to write final header\n"
 msgstr "Ni mo¾no zapisati paketa %s: %s"
 
-#: build/pack.c:533
+#: build/pack.c:554
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "Izdelujemo podpis: %d\n"
 
-#: build/pack.c:546
+#: build/pack.c:567
 #, fuzzy
 msgid "Unable to reload signature header.\n"
 msgstr "Ikone %s ni mo¾no prebrati: %s"
 
-#: build/pack.c:554
+#: build/pack.c:575
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr "Ni mo¾no odpreti %s: %s\n"
 
-#: build/pack.c:590 lib/psm.c:2149
+#: build/pack.c:611 lib/psm.c:2153
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Ni mo¾no zapisati paketa: %s"
 
-#: build/pack.c:605
+#: build/pack.c:626
 #, fuzzy, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "Ciljnega podpisa %s ni mo¾no odpreti: %s"
 
-#: build/pack.c:615
+#: build/pack.c:636
 #, fuzzy, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "Ikone %s ni mo¾no prebrati: %s"
 
-#: build/pack.c:629
+#: build/pack.c:650
 #, fuzzy, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "Ni mo¾no zapisati paketa %s: %s"
 
-#: build/pack.c:639
+#: build/pack.c:660
 #, fuzzy, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "Ikone %s ni mo¾no prebrati: %s"
 
-#: build/pack.c:645
+#: build/pack.c:666
 #, fuzzy, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Ni mo¾no zapisati paketa %s: %s"
 
-#: build/pack.c:670 lib/psm.c:2415
+#: build/pack.c:691 lib/psm.c:2419
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Zapisano: %s\n"
 
-#: build/pack.c:737
+#: build/pack.c:758
 #, 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:754
+#: build/pack.c:775
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr "ni mo¾no ustvariti %s: %s\n"
@@ -1485,61 +1485,61 @@ msgstr ""
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
-#: lib/depends.c:585 lib/depends.c:1248 lib/depends.c:1381
+#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1248 lib/depends.c:1381
+#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
 #, fuzzy
 msgid "NO "
 msgstr "NI DOBRO"
 
-#: lib/depends.c:1042
+#: lib/depends.c:1044
 #, fuzzy, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr "%s: %-45s DA (dodane datoteke)\n"
 
-#: lib/depends.c:1153
+#: lib/depends.c:1155
 #, fuzzy, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr "%s: %-45s DA (dodane ponudbe)\n"
 
-#: lib/depends.c:1247
+#: lib/depends.c:1249
 #, fuzzy, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr "%s: %-45s %-3s (predpomnjeno)\n"
 
-#: lib/depends.c:1276
+#: lib/depends.c:1278
 #, fuzzy, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr "%s: %-45s DA (rpmrc ponudbe)\n"
 
-#: lib/depends.c:1293
+#: lib/depends.c:1295
 #, fuzzy, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "%s: %-45s DA (rpmlib ponudbe)\n"
 
-#: lib/depends.c:1317
+#: lib/depends.c:1319
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr "%s: %-45s DA (db datoteke)\n"
 
-#: lib/depends.c:1330
+#: lib/depends.c:1332
 #, fuzzy, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr "%s: %-45s DA (db ponudbe)\n"
 
-#: lib/depends.c:1344
+#: lib/depends.c:1346
 #, fuzzy, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr "%s: %s zadovoljen ob paketih db.\n"
 
-#: lib/depends.c:1360
+#: lib/depends.c:1362
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr "%s: %-45s NE\n"
 
-#: lib/depends.c:1381
+#: lib/depends.c:1383
 #, fuzzy, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: (%s, %s) dodano v predpomnilnik Depends.\n"
@@ -1547,42 +1547,42 @@ msgstr "%s: (%s, %s) dodano v predpomnilnik Depends.\n"
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1454
+#: lib/depends.c:1456
 #, fuzzy, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "Za paket %s-%s-%s: zahteva %s ni zadovoljena\n"
 
 #. conflicts exist.
-#: lib/depends.c:1533
+#: lib/depends.c:1535
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "paket %s jw v sporu z: %s\n"
 
-#: lib/depends.c:1786
+#: lib/depends.c:1788
 #, fuzzy, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr "odstranjujemo seznam skupin\n"
 
 #. Record all relations.
-#: lib/depends.c:1936
+#: lib/depends.c:1938
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1996
+#: lib/depends.c:1998
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2046
+#: lib/depends.c:2048
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:2099
+#: lib/depends.c:2101
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:2129
+#: lib/depends.c:2131
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -1771,17 +1771,47 @@ msgstr "(neznan tip)"
 msgid "error creating temporary file %s\n"
 msgstr "napaka pri ustvarjanju zaèasne datoteke %s"
 
-#: lib/package.c:161
+#: lib/package.c:167 lib/package.c:238
 #, fuzzy
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr "ta razlièica RPM podpira samo pakete z glavnim ¹tevilom razlièice <= 3"
 
-#: lib/package.c:184
+#: lib/package.c:188 lib/package.c:246
 #, fuzzy
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr "ta razlièica RPM podpira samo pakete z glavnim ¹tevilom razlièice <=4"
 
+#: lib/package.c:224 lib/rpmchecksig.c:158 lib/rpmchecksig.c:506
+#, c-format
+msgid "%s: readLead failed\n"
+msgstr "%s: readLead je bil neuspe¹en\n"
+
+#: lib/package.c:230
+#, fuzzy, c-format
+msgid "%s: bad magic\n"
+msgstr "Napaèno magièno ¹tevilo"
+
+#: lib/package.c:254 lib/rpmchecksig.c:176 lib/rpmchecksig.c:522
+#, c-format
+msgid "%s: rpmReadSignature failed\n"
+msgstr "%s: rpmReadSignature je bil neuspe¹en\n"
+
+#: lib/package.c:258 lib/rpmchecksig.c:180 lib/rpmchecksig.c:527
+#, c-format
+msgid "%s: No signature available\n"
+msgstr "%s: Podpis ni na voljo\n"
+
+#: lib/package.c:284
+#, fuzzy, c-format
+msgid "%s: headerRead failed\n"
+msgstr "%s: readLead je bil neuspe¹en\n"
+
+#: lib/package.c:303 lib/rpmchecksig.c:109 lib/rpmchecksig.c:450
+#, c-format
+msgid "%s: Fread failed: %s\n"
+msgstr "%s: branje Fread je bilo neuspe¹no: %s\n"
+
 #: lib/poptI.c:47
 msgid "exclude paths must begin with a /"
 msgstr "poti, ki niso obdelane, se morajo zaèeti z /"
@@ -2318,279 +2348,254 @@ msgstr "ni mo¾no ustvariti %s: %s\n"
 msgid "cannot write to %%%s %s\n"
 msgstr "pisanje na %s ni mo¾no"
 
-#: lib/psm.c:1214
+#: lib/psm.c:1217
 #, fuzzy
 msgid "source package expected, binary found\n"
 msgstr "prièakovan je bil izvorni paket, najden binarni"
 
-#: lib/psm.c:1325
+#: lib/psm.c:1330
 #, fuzzy
 msgid "source package contains no .spec file\n"
 msgstr "izvorni paket ne vsebuje datoteke .spec"
 
-#: lib/psm.c:1432
+#: lib/psm.c:1436
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "poganjanje ponamestitvenih skript (èe obstajajo)\n"
 
-#: lib/psm.c:1600
+#: lib/psm.c:1604
 #, fuzzy, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr "skript se ni uspe¹no izvedel"
 
-#: lib/psm.c:1607
+#: lib/psm.c:1611
 #, fuzzy, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr "skript se ni uspe¹no izvedel"
 
-#: lib/psm.c:1954
+#: lib/psm.c:1958
 #, fuzzy, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr "paket: %s-%s-%s datoteke test = %d\n"
 
-#: lib/psm.c:2071
+#: lib/psm.c:2075
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2186
+#: lib/psm.c:2190
 #, fuzzy, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "uporabnik %s ne obstaja - uporabljam root"
 
-#: lib/psm.c:2195
+#: lib/psm.c:2199
 #, fuzzy, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "skupina %s ne obstaja - uporabljam root"
 
-#: lib/psm.c:2236
+#: lib/psm.c:2240
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "raz¹iritev arhiva je bilo neuspe¹no%s%s: %s"
 
-#: lib/psm.c:2237
+#: lib/psm.c:2241
 msgid " on file "
 msgstr " za datoteko "
 
-#: lib/psm.c:2423
+#: lib/psm.c:2427
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "neuspe¹no odpiranje %s: %s\n"
 
-#: lib/psm.c:2426
+#: lib/psm.c:2430
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s neuspe¹en"
 
-#: lib/query.c:128
+#: lib/query.c:124
 #, fuzzy, c-format
 msgid "incorrect format: %s\n"
 msgstr "napaka v obliki: %s\n"
 
-#: lib/query.c:225
+#: lib/query.c:221
 msgid "(contains no files)"
 msgstr "(ne vsebuje datotek)"
 
-#: lib/query.c:286
+#: lib/query.c:282
 msgid "normal        "
 msgstr "normalno      "
 
-#: lib/query.c:289
+#: lib/query.c:285
 msgid "replaced      "
 msgstr "nadome¹èeno   "
 
-#: lib/query.c:292
+#: lib/query.c:288
 msgid "not installed "
 msgstr "ni name¹èeno  "
 
-#: lib/query.c:295
+#: lib/query.c:291
 msgid "net shared    "
 msgstr "omre¾ni       "
 
-#: lib/query.c:298
+#: lib/query.c:294
 #, c-format
 msgid "(unknown %3d) "
 msgstr "(neznano %3d) "
 
-#: lib/query.c:303
+#: lib/query.c:299
 msgid "(no state)    "
 msgstr "(brez stanja) "
 
-#: lib/query.c:322 lib/query.c:378
+#: lib/query.c:318 lib/query.c:374
 #, fuzzy
 msgid "package has neither file owner or id lists\n"
 msgstr "paket ne vsebuje ne lastnika datotek niti seznamov id"
 
-#: lib/query.c:467
+#: lib/query.c:463
 #, fuzzy, c-format
 msgid "can't query %s: %s\n"
 msgstr "ni mo¾no poizvedeti o %s: %s\n"
 
-#: lib/query.c:582 lib/rpmchecksig.c:159 lib/rpmchecksig.c:492
-#, c-format
-msgid "%s: readLead failed\n"
-msgstr "%s: readLead je bil neuspe¹en\n"
-
-#: lib/query.c:588 lib/rpmchecksig.c:498
-#, c-format
-msgid "%s: No signature available (v1.0 RPM)\n"
-msgstr "%s: Podpis ni na voljo (RPM v1.0)\n"
-
-#: lib/query.c:597 lib/rpmchecksig.c:177 lib/rpmchecksig.c:508
-#, c-format
-msgid "%s: rpmReadSignature failed\n"
-msgstr "%s: rpmReadSignature je bil neuspe¹en\n"
-
-#: lib/query.c:601 lib/rpmchecksig.c:181 lib/rpmchecksig.c:513
-#, c-format
-msgid "%s: No signature available\n"
-msgstr "%s: Podpis ni na voljo\n"
-
-#: lib/query.c:624
-#, fuzzy, c-format
-msgid "%s: headerRead failed\n"
-msgstr "%s: readLead je bil neuspe¹en\n"
-
-#: lib/query.c:641 lib/rpmchecksig.c:110 lib/rpmchecksig.c:287
-#, c-format
-msgid "%s: Fread failed: %s\n"
-msgstr "%s: branje Fread je bilo neuspe¹no: %s\n"
-
-#: lib/query.c:758 lib/query.c:796 lib/rpminstall.c:324 lib/rpminstall.c:468
-#: lib/rpminstall.c:848
+#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463
+#: lib/rpminstall.c:838
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "odpiranje %s je bilo neuspe¹no: %s\n"
 
-#: lib/query.c:774
+#: lib/query.c:616
 #, c-format
 msgid "query of %s failed\n"
 msgstr "poizvedba po %s je bila neuspe¹na\n"
 
-#: lib/query.c:780
+#: lib/query.c:622
 msgid "old format source packages cannot be queried\n"
 msgstr "poizvedba po izvornih paketih v stari obliki ni mo¾na\n"
 
-#: lib/query.c:806 lib/rpminstall.c:481
+#: lib/query.c:648 lib/rpminstall.c:476
 #, fuzzy, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: branje Fread je bilo neuspe¹no: %s\n"
 
-#: lib/query.c:850
+#: lib/query.c:692
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "poizvedba po datoteki spec. %s je bila neuspe¹na, razèlemba ni mo¾na\n"
 
-#: lib/query.c:874
+#: lib/query.c:716
 #, fuzzy
 msgid "no packages\n"
 msgstr "ni paketov\n"
 
-#: lib/query.c:894
+#: lib/query.c:736
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "skupina %s ne vsebuje nobenega paketa\n"
 
-#: lib/query.c:904
+#: lib/query.c:746
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "noben paket ne pro¾i %s\n"
 
-#: lib/query.c:914
+#: lib/query.c:756
 #, c-format
 msgid "no package requires %s\n"
 msgstr "noben paket ne potrebuje %s\n"
 
-#: lib/query.c:925
+#: lib/query.c:767
 #, c-format
 msgid "no package provides %s\n"
 msgstr "noben paket ne nudi %s\n"
 
-#: lib/query.c:962
+#: lib/query.c:804
 #, c-format
 msgid "file %s: %s\n"
 msgstr "datoteka %s: %s\n"
 
-#: lib/query.c:966
+#: lib/query.c:808
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "datoteka %s ni del nobenega paketa\n"
 
-#: lib/query.c:993
+#: lib/query.c:835
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "neveljavna ¹tevilka paketa: %s\n"
 
-#: lib/query.c:996
+#: lib/query.c:838
 #, fuzzy, c-format
 msgid "package record number: %u\n"
 msgstr "¹tevilka zapisa paketa: %d\n"
 
-#: lib/query.c:1001
+#: lib/query.c:843
 #, fuzzy, c-format
 msgid "record %u could not be read\n"
 msgstr "zapisa %d ni mo¾no prebrati\n"
 
-#: lib/query.c:1012 lib/rpminstall.c:634
+#: lib/query.c:854 lib/rpminstall.c:624
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "paket %s ni name¹èen\n"
 
-#: lib/rpmchecksig.c:50
+#: lib/rpmchecksig.c:49
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s: odpiranje je bilo neuspe¹no: %s\n"
 
-#: lib/rpmchecksig.c:62
+#: lib/rpmchecksig.c:61
 msgid "makeTempFile failed\n"
 msgstr "makeTempFile je bil neuspe¹en\n"
 
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:103
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: pisanje Fwrite je bilo neuspe¹no: %s\n"
 
-#: lib/rpmchecksig.c:164
+#: lib/rpmchecksig.c:163
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr "%s: Podpis RPM v1.0 ni mo¾en\n"
 
-#: lib/rpmchecksig.c:168
+#: lib/rpmchecksig.c:167
 #, 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:214
+#: lib/rpmchecksig.c:213
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: writeLead je bil neuspe¹en: %s\n"
 
-#: lib/rpmchecksig.c:220
+#: lib/rpmchecksig.c:219
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmWriteSignature je bilo neuspe¹no: %s\n"
 
-#: lib/rpmchecksig.c:731
+#: lib/rpmchecksig.c:512
+#, c-format
+msgid "%s: No signature available (v1.0 RPM)\n"
+msgstr "%s: Podpis ni na voljo (RPM v1.0)\n"
+
+#: lib/rpmchecksig.c:707
 msgid "NOT OK"
 msgstr "NI DOBRO"
 
-#: lib/rpmchecksig.c:732 lib/rpmchecksig.c:746
+#: lib/rpmchecksig.c:708 lib/rpmchecksig.c:722
 msgid " (MISSING KEYS:"
 msgstr " (MANJKAJOÈI KLJUÈI:"
 
-#: lib/rpmchecksig.c:734 lib/rpmchecksig.c:748
+#: lib/rpmchecksig.c:710 lib/rpmchecksig.c:724
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:735 lib/rpmchecksig.c:749
+#: lib/rpmchecksig.c:711 lib/rpmchecksig.c:725
 msgid " (UNTRUSTED KEYS:"
 msgstr " (NEPREVERJENI KLJUÈI:"
 
-#: lib/rpmchecksig.c:737 lib/rpmchecksig.c:751
+#: lib/rpmchecksig.c:713 lib/rpmchecksig.c:727
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:745
+#: lib/rpmchecksig.c:721
 msgid "OK"
 msgstr "V REDU"
 
@@ -2603,86 +2608,86 @@ msgstr ""
 msgid "Preparing packages for installation..."
 msgstr "paketi za namestitev niso navedeni"
 
-#: lib/rpminstall.c:274
+#: lib/rpminstall.c:228
+#, fuzzy, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr "zbirko podatkov paketov ni mo¾no odpreti v %s\n"
+
+#: lib/rpminstall.c:285
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "Prena¹anje %s\n"
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:284
+#: lib/rpminstall.c:295
 #, c-format
 msgid " ... as %s\n"
 msgstr " ... kot %s\n"
 
-#: lib/rpminstall.c:288
+#: lib/rpminstall.c:299
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "preskoèeno - %s - prenos neuspe¹en - %s\n"
 
-#: lib/rpminstall.c:370
-#, fuzzy, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr "zbirko podatkov paketov ni mo¾no odpreti v %s\n"
-
-#: lib/rpminstall.c:393
+#: lib/rpminstall.c:388
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr "paketa %s ni mo¾no premakniti\n"
 
-#: lib/rpminstall.c:442
+#: lib/rpminstall.c:437
 #, c-format
 msgid "error reading from file %s\n"
 msgstr "napaka pri branju iz datoteke %s\n"
 
-#: lib/rpminstall.c:448
+#: lib/rpminstall.c:443
 #, 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:460 lib/rpminstall.c:705
+#: lib/rpminstall.c:455 lib/rpminstall.c:694
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr "%s ni mo¾no namestiti\n"
 
-#: lib/rpminstall.c:496
+#: lib/rpminstall.c:491
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "najdeno %d izvornih in %d binarnih paketov\n"
 
-#: lib/rpminstall.c:512
+#: lib/rpminstall.c:507
 msgid "failed dependencies:\n"
 msgstr "neuspe¹ne soodvisnosti:\n"
 
-#: lib/rpminstall.c:533
+#: lib/rpminstall.c:528
 msgid "installing binary packages\n"
 msgstr "name¹èanje binarnih paketov\n"
 
-#: lib/rpminstall.c:554
+#: lib/rpminstall.c:549
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "ni mo¾no odpreti datoteke %s: %s\n"
 
-#: lib/rpminstall.c:621
+#: lib/rpminstall.c:611
 #, c-format
 msgid "cannot open %s/packages.rpm\n"
 msgstr "datoteke %s/packages.rpm ni mo¾no odpreti\n"
 
-#: lib/rpminstall.c:637
+#: lib/rpminstall.c:627
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" doloèa veè paketov\n"
 
-#: lib/rpminstall.c:661
+#: lib/rpminstall.c:651
 msgid "removing these packages would break dependencies:\n"
 msgstr "odstranitev teh paketov bi podrla soodvisnosti:\n"
 
-#: lib/rpminstall.c:691
+#: lib/rpminstall.c:680
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr "ni mo¾no odpreti %s: %s\n"
 
-#: lib/rpminstall.c:697
+#: lib/rpminstall.c:686
 #, c-format
 msgid "Installing %s\n"
 msgstr "Name¹èanje %s\n"
@@ -2963,17 +2968,17 @@ msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 "v paketu manjka tako seznam skupin kot identitet (to se ne sme zgoditi)"
 
-#: lib/verify.c:414
+#: lib/verify.c:417
 #, fuzzy, c-format
 msgid "missing    %s"
 msgstr "manjka     %s\n"
 
-#: lib/verify.c:511
+#: lib/verify.c:514
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr "Nezadovoljene soodvisnosti za %s-%s-%s: "
 
-#: lib/verify.c:556
+#: lib/verify.c:559
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
diff --git a/po/sr.po b/po/sr.po
index 12b196cbf..f3b71230a 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-24 21:17-0400\n"
+"POT-Creation-Date: 2001-10-26 00:15-0400\n"
 "Content-Type: text/plain; charset=\n"
 "Date: 1998-05-02 21:41:47-0400\n"
 
@@ -62,16 +62,16 @@ msgstr ""
 msgid "Building for target %s\n"
 msgstr "gre¹ka potrage za paketom %s\n"
 
-#: rpm2cpio.c:34
+#: rpm2cpio.c:55
 msgid "argument is not an RPM package\n"
 msgstr ""
 
-#: rpm2cpio.c:38
+#: rpm2cpio.c:61
 #, fuzzy
 msgid "error reading header from package\n"
 msgstr "gre¹ka potrage za paketom %s\n"
 
-#: rpm2cpio.c:60
+#: rpm2cpio.c:83
 #, fuzzy, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr "Ne mogu da otvorim datoteku %s: "
@@ -403,44 +403,44 @@ msgstr "--sign se mo¾e koristiti samo kod kreiranja paketa"
 msgid "exec failed\n"
 msgstr "%s: Neuspelo otvaranje\n"
 
-#: rpmqv.c:959
+#: rpmqv.c:963
 msgid "no packages files given for rebuild"
 msgstr "nedosataje paket za rekreiranje"
 
-#: rpmqv.c:1026
+#: rpmqv.c:1038
 msgid "no spec files given for build"
 msgstr "nedostaje specifikacije za kreiranje"
 
-#: rpmqv.c:1028
+#: rpmqv.c:1040
 msgid "no tar files given for build"
 msgstr "nedostaju 'tar' datoteke za kreiranje"
 
-#: rpmqv.c:1047
+#: rpmqv.c:1059
 msgid "no packages given for uninstall"
 msgstr "neodstaje paket za deinstalaciju"
 
-#: rpmqv.c:1058
+#: rpmqv.c:1070
 msgid "no packages given for install"
 msgstr "nedostaje paket za instalaciju"
 
-#: rpmqv.c:1106
+#: rpmqv.c:1118
 msgid "no arguments given for query"
 msgstr "nedostaju argumenti za upit"
 
-#: rpmqv.c:1120
+#: rpmqv.c:1132
 msgid "no arguments given for verify"
 msgstr "nedostaju argumenti za proveru"
 
-#: rpmqv.c:1128
+#: rpmqv.c:1140
 msgid "unexpected arguments to --querytags "
 msgstr "neoèekivani argumenti za --querytags"
 
-#: rpmqv.c:1144
+#: rpmqv.c:1156
 #, fuzzy
 msgid "no arguments given"
 msgstr "nedostaju argumenti za upit"
 
-#: build/build.c:125 build/pack.c:466
+#: build/build.c:125 build/pack.c:487
 #, fuzzy
 msgid "Unable to open temp file.\n"
 msgstr "Ne mogu da otvorim %s za èitanje: %s"
@@ -654,7 +654,7 @@ msgstr "Datoteka nije pronaðena na serveru"
 msgid "Could not open %%files file %s: %s\n"
 msgstr "gre¹ka: ne mogu da otvorim datoteku %s\n"
 
-#: build/files.c:1777 build/pack.c:145
+#: build/files.c:1777 build/pack.c:148
 #, fuzzy, c-format
 msgid "line: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
@@ -729,156 +729,156 @@ msgstr ""
 msgid "Could not canonicalize hostname: %s\n"
 msgstr ""
 
-#: build/pack.c:78
+#: build/pack.c:81
 #, fuzzy, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: build/pack.c:81
+#: build/pack.c:84
 #, fuzzy, c-format
 msgid "create archive failed: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: build/pack.c:103
+#: build/pack.c:106
 #, fuzzy, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr "neuspelo èitanje: %s (%d)"
 
-#: build/pack.c:110
+#: build/pack.c:113
 #, fuzzy, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr "neuspelo èitanje: %s (%d)"
 
-#: build/pack.c:213
+#: build/pack.c:216
 #, fuzzy, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr "gre¹ka: ne mogu da otvorim datoteku %s\n"
 
-#: build/pack.c:220
+#: build/pack.c:223
 #, fuzzy, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr "gre¹ka: ne mogu da otvorim datoteku %s\n"
 
-#: build/pack.c:227
+#: build/pack.c:230
 #, fuzzy, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr "gre¹ka: ne mogu da otvorim datoteku %s\n"
 
-#: build/pack.c:234
+#: build/pack.c:237
 #, fuzzy, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr "gre¹ka: ne mogu da otvorim datoteku %s\n"
 
-#: build/pack.c:242
+#: build/pack.c:245
 #, fuzzy, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr "gre¹ka: ne mogu da otvorim datoteku %s\n"
 
-#: build/pack.c:257
+#: build/pack.c:260
 #, fuzzy, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr "gre¹ka: ne mogu da otvorim datoteku %s\n"
 
-#: build/pack.c:285
+#: build/pack.c:288
 #, fuzzy, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: build/pack.c:295
+#: build/pack.c:298
 #, fuzzy, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr "Neuspelo èitanje %s: %s."
 
-#: build/pack.c:304 build/pack.c:508
+#: build/pack.c:307 build/pack.c:529
 #, fuzzy, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: Neuspeo 'readLead'\n"
 
-#: build/pack.c:320
+#: build/pack.c:341
 #, 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:329
+#: build/pack.c:350
 #, fuzzy, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "gre¹ka kod uzimanja sloga %s iz %s"
 
-#: build/pack.c:454
+#: build/pack.c:475
 #, fuzzy
 msgid "Unable to create immutable header region.\n"
 msgstr "Ne mogu da upi¹em %s"
 
-#: build/pack.c:472
+#: build/pack.c:493
 #, fuzzy
 msgid "Unable to write temp header\n"
 msgstr "Ne mogu da upi¹em %s"
 
-#: build/pack.c:480
+#: build/pack.c:501
 msgid "Bad CSA data\n"
 msgstr ""
 
-#: build/pack.c:515
+#: build/pack.c:536
 #, fuzzy
 msgid "Unable to write final header\n"
 msgstr "Ne mogu da upi¹em %s"
 
-#: build/pack.c:533
+#: build/pack.c:554
 #, fuzzy, c-format
 msgid "Generating signature: %d\n"
 msgstr "napravi PGP potpis"
 
-#: build/pack.c:546
+#: build/pack.c:567
 #, fuzzy
 msgid "Unable to reload signature header.\n"
 msgstr "Ne mogu da upi¹em %s"
 
-#: build/pack.c:554
+#: build/pack.c:575
 #, fuzzy, c-format
 msgid "Could not open %s: %s\n"
 msgstr "neuspelo otvaranje %s\n"
 
-#: build/pack.c:590 lib/psm.c:2149
+#: build/pack.c:611 lib/psm.c:2153
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Ne mogu da upi¹em %s"
 
-#: build/pack.c:605
+#: build/pack.c:626
 #, fuzzy, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "Ne mogu da upi¹em %s"
 
-#: build/pack.c:615
+#: build/pack.c:636
 #, fuzzy, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "Ne mogu da upi¹em %s"
 
-#: build/pack.c:629
+#: build/pack.c:650
 #, fuzzy, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "Ne mogu da upi¹em %s"
 
-#: build/pack.c:639
+#: build/pack.c:660
 #, fuzzy, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "Ne mogu da upi¹em %s"
 
-#: build/pack.c:645
+#: build/pack.c:666
 #, fuzzy, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Ne mogu da upi¹em %s"
 
-#: build/pack.c:670 lib/psm.c:2415
+#: build/pack.c:691 lib/psm.c:2419
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:737
+#: build/pack.c:758
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:754
+#: build/pack.c:775
 #, fuzzy, c-format
 msgid "cannot create %s: %s\n"
 msgstr "Ne mogu da otvorim datoteku %s: "
@@ -1467,60 +1467,60 @@ msgstr ""
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1248 lib/depends.c:1381
+#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1248 lib/depends.c:1381
+#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:1042
+#: lib/depends.c:1044
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:1153
+#: lib/depends.c:1155
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:1247
+#: lib/depends.c:1249
 #, fuzzy, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr "datoteka %s ne pripada nijednom paketu\n"
 
-#: lib/depends.c:1276
+#: lib/depends.c:1278
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1293
+#: lib/depends.c:1295
 #, fuzzy, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "datoteka %s ne pripada nijednom paketu\n"
 
-#: lib/depends.c:1317
+#: lib/depends.c:1319
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1330
+#: lib/depends.c:1332
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1344
+#: lib/depends.c:1346
 #, fuzzy, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr "datoteka %s ne pripada nijednom paketu\n"
 
-#: lib/depends.c:1360
+#: lib/depends.c:1362
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1381
+#: lib/depends.c:1383
 #, fuzzy, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "datoteka %s ne pripada nijednom paketu\n"
@@ -1528,42 +1528,42 @@ msgstr "datoteka %s ne pripada nijednom paketu\n"
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1454
+#: lib/depends.c:1456
 #, 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:1533
+#: lib/depends.c:1535
 #, fuzzy, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "paket %s nije naveden u %s"
 
-#: lib/depends.c:1786
+#: lib/depends.c:1788
 #, 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:1936
+#: lib/depends.c:1938
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1996
+#: lib/depends.c:1998
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2046
+#: lib/depends.c:2048
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:2099
+#: lib/depends.c:2101
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:2129
+#: lib/depends.c:2131
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -1753,17 +1753,47 @@ msgstr "(nepoznat tip)"
 msgid "error creating temporary file %s\n"
 msgstr "gre¹ka kod kreiranja direktorijuma %s: %s"
 
-#: lib/package.c:161
+#: lib/package.c:167 lib/package.c:238
 #, fuzzy
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr "samo paketi sa glavnim brojevima <= 3 su podr¾ani u ovoj verziji RPM-a"
 
-#: lib/package.c:184
+#: lib/package.c:188 lib/package.c:246
 #, fuzzy
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr "samo paketi sa glavnim brojevima <= 3 su podr¾ani u ovoj verziji RPM-a"
 
+#: lib/package.c:224 lib/rpmchecksig.c:158 lib/rpmchecksig.c:506
+#, c-format
+msgid "%s: readLead failed\n"
+msgstr "%s: Neuspeo 'readLead'\n"
+
+#: lib/package.c:230
+#, c-format
+msgid "%s: bad magic\n"
+msgstr ""
+
+#: lib/package.c:254 lib/rpmchecksig.c:176 lib/rpmchecksig.c:522
+#, c-format
+msgid "%s: rpmReadSignature failed\n"
+msgstr "%s: Neuspelo 'rpmReadSignature'\n"
+
+#: lib/package.c:258 lib/rpmchecksig.c:180 lib/rpmchecksig.c:527
+#, c-format
+msgid "%s: No signature available\n"
+msgstr "%s: Potpis nije na raspolaganju\n"
+
+#: lib/package.c:284
+#, fuzzy, c-format
+msgid "%s: headerRead failed\n"
+msgstr "%s: Neuspeo 'readLead'\n"
+
+#: lib/package.c:303 lib/rpmchecksig.c:109 lib/rpmchecksig.c:450
+#, fuzzy, c-format
+msgid "%s: Fread failed: %s\n"
+msgstr "%s: Neuspeo 'readLead'\n"
+
 #: lib/poptI.c:47
 #, fuzzy
 msgid "exclude paths must begin with a /"
@@ -2303,281 +2333,256 @@ msgstr "Ne mogu da otvorim datoteku %s: "
 msgid "cannot write to %%%s %s\n"
 msgstr "Ne mogu da otvorim datoteku %s: "
 
-#: lib/psm.c:1214
+#: lib/psm.c:1217
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1325
+#: lib/psm.c:1330
 #, fuzzy
 msgid "source package contains no .spec file\n"
 msgstr "upit nad paketom koji ima <datoteku>"
 
-#: lib/psm.c:1432
+#: lib/psm.c:1436
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "nemoj izvr¹iti nijednu fazu"
 
-#: lib/psm.c:1600
+#: lib/psm.c:1604
 #, fuzzy, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr "neuspelo izvr¹avanje skripta"
 
-#: lib/psm.c:1607
+#: lib/psm.c:1611
 #, fuzzy, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr "neuspelo izvr¹avanje skripta"
 
-#: lib/psm.c:1954
+#: lib/psm.c:1958
 #, fuzzy, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr "paket %s-%s-%s sadr¾i deljene datoteke\n"
 
-#: lib/psm.c:2071
+#: lib/psm.c:2075
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2186
+#: lib/psm.c:2190
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2195
+#: lib/psm.c:2199
 #, fuzzy, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "grupa %s ne sadr¾i nijedan paket\n"
 
-#: lib/psm.c:2236
+#: lib/psm.c:2240
 #, fuzzy, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "neuspelo otvaranje %s: %s\n"
 
-#: lib/psm.c:2237
+#: lib/psm.c:2241
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2423
+#: lib/psm.c:2427
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: lib/psm.c:2426
+#: lib/psm.c:2430
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "PGP omanuo"
 
-#: lib/query.c:128
+#: lib/query.c:124
 #, fuzzy, c-format
 msgid "incorrect format: %s\n"
 msgstr "gre¹ka u formatu: %s\n"
 
-#: lib/query.c:225
+#: lib/query.c:221
 msgid "(contains no files)"
 msgstr "(nema datoteka)"
 
-#: lib/query.c:286
+#: lib/query.c:282
 msgid "normal        "
 msgstr ""
 
-#: lib/query.c:289
+#: lib/query.c:285
 msgid "replaced      "
 msgstr ""
 
-#: lib/query.c:292
+#: lib/query.c:288
 #, fuzzy
 msgid "not installed "
 msgstr "paket %s nije instaliran\n"
 
-#: lib/query.c:295
+#: lib/query.c:291
 msgid "net shared    "
 msgstr ""
 
-#: lib/query.c:298
+#: lib/query.c:294
 #, fuzzy, c-format
 msgid "(unknown %3d) "
 msgstr "(nepoznat tip)"
 
-#: lib/query.c:303
+#: lib/query.c:299
 msgid "(no state)    "
 msgstr ""
 
-#: lib/query.c:322 lib/query.c:378
+#: lib/query.c:318 lib/query.c:374
 #, fuzzy
 msgid "package has neither file owner or id lists\n"
 msgstr "paket nema imena"
 
-#: lib/query.c:467
+#: lib/query.c:463
 #, fuzzy, c-format
 msgid "can't query %s: %s\n"
 msgstr "gre¹ka: ne mogu da otvorim %s\n"
 
-#: lib/query.c:582 lib/rpmchecksig.c:159 lib/rpmchecksig.c:492
-#, c-format
-msgid "%s: readLead failed\n"
-msgstr "%s: Neuspeo 'readLead'\n"
-
-#: lib/query.c:588 lib/rpmchecksig.c:498
-#, c-format
-msgid "%s: No signature available (v1.0 RPM)\n"
-msgstr "%s: Potpis nije na raspolaganju (RPM v1.0)\n"
-
-#: lib/query.c:597 lib/rpmchecksig.c:177 lib/rpmchecksig.c:508
-#, c-format
-msgid "%s: rpmReadSignature failed\n"
-msgstr "%s: Neuspelo 'rpmReadSignature'\n"
-
-#: lib/query.c:601 lib/rpmchecksig.c:181 lib/rpmchecksig.c:513
-#, c-format
-msgid "%s: No signature available\n"
-msgstr "%s: Potpis nije na raspolaganju\n"
-
-#: lib/query.c:624
-#, fuzzy, c-format
-msgid "%s: headerRead failed\n"
-msgstr "%s: Neuspeo 'readLead'\n"
-
-#: lib/query.c:641 lib/rpmchecksig.c:110 lib/rpmchecksig.c:287
-#, fuzzy, c-format
-msgid "%s: Fread failed: %s\n"
-msgstr "%s: Neuspeo 'readLead'\n"
-
-#: lib/query.c:758 lib/query.c:796 lib/rpminstall.c:324 lib/rpminstall.c:468
-#: lib/rpminstall.c:848
+#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463
+#: lib/rpminstall.c:838
 #, fuzzy, c-format
 msgid "open of %s failed: %s\n"
 msgstr "neuspelo otvaranje %s: %s\n"
 
-#: lib/query.c:774
+#: lib/query.c:616
 #, c-format
 msgid "query of %s failed\n"
 msgstr "upit nad %s neuspeo\n"
 
-#: lib/query.c:780
+#: lib/query.c:622
 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:806 lib/rpminstall.c:481
+#: lib/query.c:648 lib/rpminstall.c:476
 #, fuzzy, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: Neuspeo 'readLead'\n"
 
-#: lib/query.c:850
+#: lib/query.c:692
 #, fuzzy, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "upit nad %s neuspeo\n"
 
-#: lib/query.c:874
+#: lib/query.c:716
 #, fuzzy
 msgid "no packages\n"
 msgstr "upit nad svim paketima"
 
-#: lib/query.c:894
+#: lib/query.c:736
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "grupa %s ne sadr¾i nijedan paket\n"
 
-#: lib/query.c:904
+#: lib/query.c:746
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "nijedan paket ne aktivira %s\n"
 
-#: lib/query.c:914
+#: lib/query.c:756
 #, c-format
 msgid "no package requires %s\n"
 msgstr "nijedan paket ne zahteva %s\n"
 
-#: lib/query.c:925
+#: lib/query.c:767
 #, c-format
 msgid "no package provides %s\n"
 msgstr "nijedan paket ne obezbeðuje %s\n"
 
-#: lib/query.c:962
+#: lib/query.c:804
 #, fuzzy, c-format
 msgid "file %s: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: lib/query.c:966
+#: lib/query.c:808
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "datoteka %s ne pripada nijednom paketu\n"
 
-#: lib/query.c:993
+#: lib/query.c:835
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "pogre¹an broj paketa: %s\n"
 
-#: lib/query.c:996
+#: lib/query.c:838
 #, fuzzy, c-format
 msgid "package record number: %u\n"
 msgstr "pogre¹an broj paketa: %s\n"
 
-#: lib/query.c:1001
+#: lib/query.c:843
 #, fuzzy, c-format
 msgid "record %u could not be read\n"
 msgstr "ne mogu da proèitam slog %d\n"
 
-#: lib/query.c:1012 lib/rpminstall.c:634
+#: lib/query.c:854 lib/rpminstall.c:624
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "paket %s nije instaliran\n"
 
-#: lib/rpmchecksig.c:50
+#: lib/rpmchecksig.c:49
 #, fuzzy, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s: Neuspelo otvaranje\n"
 
-#: lib/rpmchecksig.c:62
+#: lib/rpmchecksig.c:61
 #, fuzzy
 msgid "makeTempFile failed\n"
 msgstr "%s: Neuspelo otvaranje\n"
 
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:103
 #, fuzzy, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: Neuspeo 'readLead'\n"
 
-#: lib/rpmchecksig.c:164
+#: lib/rpmchecksig.c:163
 #, 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:168
+#: lib/rpmchecksig.c:167
 #, 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:214
+#: lib/rpmchecksig.c:213
 #, fuzzy, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: Neuspeo 'readLead'\n"
 
-#: lib/rpmchecksig.c:220
+#: lib/rpmchecksig.c:219
 #, fuzzy, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: Neuspelo 'rpmReadSignature'\n"
 
-#: lib/rpmchecksig.c:731
+#: lib/rpmchecksig.c:512
+#, c-format
+msgid "%s: No signature available (v1.0 RPM)\n"
+msgstr "%s: Potpis nije na raspolaganju (RPM v1.0)\n"
+
+#: lib/rpmchecksig.c:707
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:732 lib/rpmchecksig.c:746
+#: lib/rpmchecksig.c:708 lib/rpmchecksig.c:722
 #, fuzzy
 msgid " (MISSING KEYS:"
 msgstr " (NEDOSTAJUÆI KLJUÈEVI)"
 
-#: lib/rpmchecksig.c:734 lib/rpmchecksig.c:748
+#: lib/rpmchecksig.c:710 lib/rpmchecksig.c:724
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:735 lib/rpmchecksig.c:749
+#: lib/rpmchecksig.c:711 lib/rpmchecksig.c:725
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:737 lib/rpmchecksig.c:751
+#: lib/rpmchecksig.c:713 lib/rpmchecksig.c:727
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:745
+#: lib/rpmchecksig.c:721
 msgid "OK"
 msgstr ""
 
@@ -2590,87 +2595,87 @@ msgstr ""
 msgid "Preparing packages for installation..."
 msgstr "nedostaje paket za instalaciju"
 
-#: lib/rpminstall.c:274
+#: lib/rpminstall.c:228
+#, 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:285
 #, c-format
 msgid "Retrieving %s\n"
 msgstr "Pribavljam %s\n"
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:284
+#: lib/rpminstall.c:295
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:288
+#: lib/rpminstall.c:299
 #, fuzzy, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "gre¹ka: preskaèem %s - neuspelo preno¹enje - %s\n"
 
-#: lib/rpminstall.c:370
-#, 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:393
+#: lib/rpminstall.c:388
 #, fuzzy, c-format
 msgid "package %s is not relocateable\n"
 msgstr "paket %s nije instaliran\n"
 
-#: lib/rpminstall.c:442
+#: lib/rpminstall.c:437
 #, fuzzy, c-format
 msgid "error reading from file %s\n"
 msgstr "gre¹ka kod kreiranja direktorijuma %s: %s"
 
-#: lib/rpminstall.c:448
+#: lib/rpminstall.c:443
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:460 lib/rpminstall.c:705
+#: lib/rpminstall.c:455 lib/rpminstall.c:694
 #, fuzzy, c-format
 msgid "%s cannot be installed\n"
 msgstr "gre¹ka: %s se ne mo¾e instalirati\n"
 
-#: lib/rpminstall.c:496
+#: lib/rpminstall.c:491
 #, fuzzy, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "grupa %s ne sadr¾i nijedan paket\n"
 
-#: lib/rpminstall.c:512
+#: lib/rpminstall.c:507
 msgid "failed dependencies:\n"
 msgstr "lo¹e meðuzavisnosti:\n"
 
-#: lib/rpminstall.c:533
+#: lib/rpminstall.c:528
 #, fuzzy
 msgid "installing binary packages\n"
 msgstr "instaliraj paket"
 
-#: lib/rpminstall.c:554
+#: lib/rpminstall.c:549
 #, fuzzy, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "Ne mogu da otvorim datoteku %s: "
 
-#: lib/rpminstall.c:621
+#: lib/rpminstall.c:611
 #, 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:637
+#: lib/rpminstall.c:627
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" odreðuje vi¹e paketa\n"
 
-#: lib/rpminstall.c:661
+#: lib/rpminstall.c:651
 msgid "removing these packages would break dependencies:\n"
 msgstr "uklanjanje oviha paketa æe naru¹iti zavisnosti:\n"
 
-#: lib/rpminstall.c:691
+#: lib/rpminstall.c:680
 #, fuzzy, c-format
 msgid "cannot open %s: %s\n"
 msgstr "gre¹ka: ne mogu da otvorim %s\n"
 
-#: lib/rpminstall.c:697
+#: lib/rpminstall.c:686
 #, c-format
 msgid "Installing %s\n"
 msgstr "Instaliram %s\n"
@@ -2950,17 +2955,17 @@ msgstr ""
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:414
+#: lib/verify.c:417
 #, fuzzy, c-format
 msgid "missing    %s"
 msgstr "nedostaje { posle %"
 
-#: lib/verify.c:511
+#: lib/verify.c:514
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr "Nezadovoljene meðuzavisnosti za %s-%s-%s: "
 
-#: lib/verify.c:556
+#: lib/verify.c:559
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 7aaa09e87..b5153df00 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-24 21:17-0400\n"
+"POT-Creation-Date: 2001-10-26 00:15-0400\n"
 "PO-Revision-Date: 2001-09-12 14:18+0200\n"
 "Last-Translator: Göran Uddeborg <goeran@uddeborg.pp.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -65,15 +65,15 @@ msgstr "Bygger målplattformar: %s\n"
 msgid "Building for target %s\n"
 msgstr "Bygger för målet %s\n"
 
-#: rpm2cpio.c:34
+#: rpm2cpio.c:55
 msgid "argument is not an RPM package\n"
 msgstr "argumentet är inte ett RPM-paket\n"
 
-#: rpm2cpio.c:38
+#: rpm2cpio.c:61
 msgid "error reading header from package\n"
 msgstr "fel vid läsning av pakethuvud\n"
 
-#: rpm2cpio.c:60
+#: rpm2cpio.c:83
 #, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr "kan inte återöppna lasten: %s\n"
@@ -402,44 +402,44 @@ msgstr "--sign kan enbart användas vid pakettillverkning"
 msgid "exec failed\n"
 msgstr "exec misslyckades\n"
 
-#: rpmqv.c:959
+#: rpmqv.c:963
 msgid "no packages files given for rebuild"
 msgstr "inga paketfiler angivna för omtillverkning"
 
-#: rpmqv.c:1026
+#: rpmqv.c:1038
 msgid "no spec files given for build"
 msgstr "inga specfiler angivna för tillverkning"
 
-#: rpmqv.c:1028
+#: rpmqv.c:1040
 msgid "no tar files given for build"
 msgstr "inga tar-filer angivna för tillverkning"
 
-#: rpmqv.c:1047
+#: rpmqv.c:1059
 msgid "no packages given for uninstall"
 msgstr "inga paket angivna för avinstallation"
 
-#: rpmqv.c:1058
+#: rpmqv.c:1070
 msgid "no packages given for install"
 msgstr "inga paket angivna för installation"
 
-#: rpmqv.c:1106
+#: rpmqv.c:1118
 msgid "no arguments given for query"
 msgstr "inga parametrar angivna för fråga"
 
-#: rpmqv.c:1120
+#: rpmqv.c:1132
 msgid "no arguments given for verify"
 msgstr "inga parametrar angivna för verifiering"
 
-#: rpmqv.c:1128
+#: rpmqv.c:1140
 msgid "unexpected arguments to --querytags "
 msgstr "oväntade argument till --querytags "
 
-#: rpmqv.c:1144
+#: rpmqv.c:1156
 #, fuzzy
 msgid "no arguments given"
 msgstr "inga parametrar angivna för fråga"
 
-#: build/build.c:125 build/pack.c:466
+#: build/build.c:125 build/pack.c:487
 msgid "Unable to open temp file.\n"
 msgstr "Kan inte öppna temporär fil.\n"
 
@@ -650,7 +650,7 @@ msgstr "Hittade ingen fil vid matchningen: %s\n"
 msgid "Could not open %%files file %s: %s\n"
 msgstr "Kunde inte öppna %%files-fil %s: %s\n"
 
-#: build/files.c:1777 build/pack.c:145
+#: build/files.c:1777 build/pack.c:148
 #, c-format
 msgid "line: %s\n"
 msgstr "rad: %s\n"
@@ -725,152 +725,152 @@ msgstr "getGidS: för många gid\n"
 msgid "Could not canonicalize hostname: %s\n"
 msgstr "Kunde inte kanonisera värdnamn: %s\n"
 
-#: build/pack.c:78
+#: build/pack.c:81
 #, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr "skapande av arkiv misslyckades vid fil %s: %s\n"
 
-#: build/pack.c:81
+#: build/pack.c:84
 #, c-format
 msgid "create archive failed: %s\n"
 msgstr "skapande av arkiv misslyckades: %s\n"
 
-#: build/pack.c:103
+#: build/pack.c:106
 #, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr "cpio_copy kunde inte skriva: %s\n"
 
-#: build/pack.c:110
+#: build/pack.c:113
 #, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr "cpio_copy kunde inte läsa: %s\n"
 
-#: build/pack.c:213
+#: build/pack.c:216
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr "Kunde inte öppna PreIn-fil: %s\n"
 
-#: build/pack.c:220
+#: build/pack.c:223
 #, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr "Kunde inte öppna PreUn-fil: %s\n"
 
-#: build/pack.c:227
+#: build/pack.c:230
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr "Kunde inte öppna PostIn-fil: %s\n"
 
-#: build/pack.c:234
+#: build/pack.c:237
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr "Kunde inte öppna PostUn-fil: %s\n"
 
-#: build/pack.c:242
+#: build/pack.c:245
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr "Kunde inte öppna VerifyScript-fil: %s\n"
 
-#: build/pack.c:257
+#: build/pack.c:260
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr "Kunde inte öppna Trigger-skriptfil: %s\n"
 
-#: build/pack.c:285
+#: build/pack.c:288
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "readRPM: öppna %s: %s\n"
 
-#: build/pack.c:295
+#: build/pack.c:298
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr "readRPM: läs %s: %s\n"
 
-#: build/pack.c:304 build/pack.c:508
+#: build/pack.c:307 build/pack.c:529
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: Fseek misslyckades: %s\n"
 
-#: build/pack.c:320
+#: build/pack.c:341
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr "readRPM: %s är inte ett RPM-paket\n"
 
-#: build/pack.c:329
+#: build/pack.c:350
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: läser huvud från %s\n"
 
-#: build/pack.c:454
+#: build/pack.c:475
 msgid "Unable to create immutable header region.\n"
 msgstr "Kan inte skapa oföränderlig huvudregion.\n"
 
-#: build/pack.c:472
+#: build/pack.c:493
 msgid "Unable to write temp header\n"
 msgstr "Kan inte skriva temporärhuvud\n"
 
-#: build/pack.c:480
+#: build/pack.c:501
 msgid "Bad CSA data\n"
 msgstr "Felaktig CSA-data\n"
 
-#: build/pack.c:515
+#: build/pack.c:536
 msgid "Unable to write final header\n"
 msgstr "Kan inte skriva slutligt huvud\n"
 
-#: build/pack.c:533
+#: build/pack.c:554
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "Genererar signatur: %d\n"
 
-#: build/pack.c:546
+#: build/pack.c:567
 msgid "Unable to reload signature header.\n"
 msgstr "Kan inte läsa om signaturhuvud.\n"
 
-#: build/pack.c:554
+#: build/pack.c:575
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr "Kunde inte öppna %s: %s\n"
 
-#: build/pack.c:590 lib/psm.c:2149
+#: build/pack.c:611 lib/psm.c:2153
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Kunde inte skriva paket: %s\n"
 
-#: build/pack.c:605
+#: build/pack.c:626
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "Kan inte läsa signaturen %s: %s\n"
 
-#: build/pack.c:615
+#: build/pack.c:636
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "Kan inte läsa huvud från %s: %s\n"
 
-#: build/pack.c:629
+#: build/pack.c:650
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "Kan inte skriva huvud till %s: %s\n"
 
-#: build/pack.c:639
+#: build/pack.c:660
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "Kan inte läsa last från %s: %s\n"
 
-#: build/pack.c:645
+#: build/pack.c:666
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Kan inte skriva last till %s: %s\n"
 
-#: build/pack.c:670 lib/psm.c:2415
+#: build/pack.c:691 lib/psm.c:2419
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Skrev: %s\n"
 
-#: build/pack.c:737
+#: build/pack.c:758
 #, 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:754
+#: build/pack.c:775
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr "kan inte skapa %s: %s\n"
@@ -1446,60 +1446,60 @@ msgstr ""
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
-#: lib/depends.c:585 lib/depends.c:1248 lib/depends.c:1381
+#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
 msgid "YES"
 msgstr "JA"
 
-#: lib/depends.c:585 lib/depends.c:1248 lib/depends.c:1381
+#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
 msgid "NO "
 msgstr "NEJ "
 
-#: lib/depends.c:1042
+#: lib/depends.c:1044
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr "%s: %-45s JA (lade till filer)\n"
 
-#: lib/depends.c:1153
+#: lib/depends.c:1155
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr "%s: %-45s JA (lade till tillhandahållande)\n"
 
-#: lib/depends.c:1247
+#: lib/depends.c:1249
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr "%s: %-45s %-s (cachad)\n"
 
-#: lib/depends.c:1276
+#: lib/depends.c:1278
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr "%s: %-45s JA (rpmrc tillhandahåller)\n"
 
-#: lib/depends.c:1293
+#: lib/depends.c:1295
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "%s: %-45s JA (rpmlib tillhandahåller)\n"
 
-#: lib/depends.c:1317
+#: lib/depends.c:1319
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr "%s: %-45s JA (db-filer)\n"
 
-#: lib/depends.c:1330
+#: lib/depends.c:1332
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr "%s: %-45s JA (db-tillhandahållande)\n"
 
-#: lib/depends.c:1344
+#: lib/depends.c:1346
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr "%s: %-45s JA (db-paket)\n"
 
-#: lib/depends.c:1360
+#: lib/depends.c:1362
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr "%s: %-45s NEJ\n"
 
-#: lib/depends.c:1381
+#: lib/depends.c:1383
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: (%s, %s) tillagt till beroendecachen.\n"
@@ -1507,43 +1507,43 @@ msgstr "%s: (%s, %s) tillagt till beroendecachen.\n"
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1454
+#: lib/depends.c:1456
 #, 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:1533
+#: lib/depends.c:1535
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "paket %s står i konflikt: %s\n"
 
-#: lib/depends.c:1786
+#: lib/depends.c:1788
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr "tar bort %s-%s-%s \"%s\" från tsort-relationer.\n"
 
 #. Record all relations.
-#: lib/depends.c:1936
+#: lib/depends.c:1938
 msgid "========== recording tsort relations\n"
 msgstr "========== noterar alla relationer\n"
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1996
+#: lib/depends.c:1998
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 "========== tsort:erar paket (ordning, #föregångare, #efterföljare, djup)\n"
 
-#: lib/depends.c:2046
+#: lib/depends.c:2048
 msgid "========== successors only (presentation order)\n"
 msgstr "========== endast efterföljare (presentationsordning)\n"
 
-#: lib/depends.c:2099
+#: lib/depends.c:2101
 msgid "LOOP:\n"
 msgstr "LOOP:\n"
 
-#: lib/depends.c:2129
+#: lib/depends.c:2131
 msgid "========== continuing tsort ...\n"
 msgstr "========== fortsätter med tsort ...\n"
 
@@ -1732,15 +1732,45 @@ msgstr "(okänd typ)"
 msgid "error creating temporary file %s\n"
 msgstr "fel när tämporärfil %s skapades\n"
 
-#: lib/package.c:161
+#: lib/package.c:167 lib/package.c:238
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr "paket med versionsnummer 1 stöds inte av denna version av RPM\n"
 
-#: lib/package.c:184
+#: lib/package.c:188 lib/package.c:246
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr "endast paket med huvudnummer <= 4 stöds av denna version av RPM\n"
 
+#: lib/package.c:224 lib/rpmchecksig.c:158 lib/rpmchecksig.c:506
+#, c-format
+msgid "%s: readLead failed\n"
+msgstr "%s: readLead misslyckades\n"
+
+#: lib/package.c:230
+#, fuzzy, c-format
+msgid "%s: bad magic\n"
+msgstr "Felaktigt magiskt tal"
+
+#: lib/package.c:254 lib/rpmchecksig.c:176 lib/rpmchecksig.c:522
+#, c-format
+msgid "%s: rpmReadSignature failed\n"
+msgstr "%s: rpmReadSignature misslyckades\n"
+
+#: lib/package.c:258 lib/rpmchecksig.c:180 lib/rpmchecksig.c:527
+#, c-format
+msgid "%s: No signature available\n"
+msgstr "%s: Ingen signatur tillgänglig\n"
+
+#: lib/package.c:284
+#, fuzzy, c-format
+msgid "%s: headerRead failed\n"
+msgstr "%s: readLead misslyckades\n"
+
+#: lib/package.c:303 lib/rpmchecksig.c:109 lib/rpmchecksig.c:450
+#, c-format
+msgid "%s: Fread failed: %s\n"
+msgstr "%s: Fread misslyckades: %s\n"
+
 #: lib/poptI.c:47
 msgid "exclude paths must begin with a /"
 msgstr "uteslutna sökvägar måste börja med /"
@@ -2249,276 +2279,251 @@ msgstr "kan inte skapa %%%s %s\n"
 msgid "cannot write to %%%s %s\n"
 msgstr "kan inte skriva till %%%s %s\n"
 
-#: lib/psm.c:1214
+#: lib/psm.c:1217
 msgid "source package expected, binary found\n"
 msgstr "källpaket förväntades, fann binärpaket\n"
 
-#: lib/psm.c:1325
+#: lib/psm.c:1330
 msgid "source package contains no .spec file\n"
 msgstr "källpaket innehåller ingen .spec-fil\n"
 
-#: lib/psm.c:1432
+#: lib/psm.c:1436
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "%s: kör (eventuellt) %s-skript\n"
 
-#: lib/psm.c:1600
+#: lib/psm.c:1604
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 "körning av %s-skript från %s-%s-%s misslyckades, waitpid returnerade %s\n"
 
-#: lib/psm.c:1607
+#: lib/psm.c:1611
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr "körning av %s-skript från %s-%s-%s misslyckades, slutstatus %d\n"
 
-#: lib/psm.c:1954
+#: lib/psm.c:1958
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr "%s: %s-%s-%s har %d filer, test = %d\n"
 
-#: lib/psm.c:2071
+#: lib/psm.c:2075
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr "%s: %s-skript misslyckades (%d), hoppar över %s-%s-%s\n"
 
-#: lib/psm.c:2186
+#: lib/psm.c:2190
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "användare %s finns inte - använder root\n"
 
-#: lib/psm.c:2195
+#: lib/psm.c:2199
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "grupp %s finns inte - använder root\n"
 
-#: lib/psm.c:2236
+#: lib/psm.c:2240
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "uppackning av arkiv misslyckades%s%s: %s\n"
 
-#: lib/psm.c:2237
+#: lib/psm.c:2241
 msgid " on file "
 msgstr " vid fil "
 
-#: lib/psm.c:2423
+#: lib/psm.c:2427
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "%s misslyckades på fil %s: %s\n"
 
-#: lib/psm.c:2426
+#: lib/psm.c:2430
 #, c-format
 msgid "%s failed: %s\n"
 msgstr "%s misslyckades: %s\n"
 
-#: lib/query.c:128
+#: lib/query.c:124
 #, c-format
 msgid "incorrect format: %s\n"
 msgstr "fel format: %s\n"
 
-#: lib/query.c:225
+#: lib/query.c:221
 msgid "(contains no files)"
 msgstr "(innehåller inga filer)"
 
-#: lib/query.c:286
+#: lib/query.c:282
 msgid "normal        "
 msgstr "normal        "
 
-#: lib/query.c:289
+#: lib/query.c:285
 msgid "replaced      "
 msgstr "ersatt        "
 
-#: lib/query.c:292
+#: lib/query.c:288
 msgid "not installed "
 msgstr "oinstallerat  "
 
-#: lib/query.c:295
+#: lib/query.c:291
 msgid "net shared    "
 msgstr "nätdelad      "
 
-#: lib/query.c:298
+#: lib/query.c:294
 #, c-format
 msgid "(unknown %3d) "
 msgstr "(okänd %3d)   "
 
-#: lib/query.c:303
+#: lib/query.c:299
 msgid "(no state)    "
 msgstr "(ej tillstnd) "
 
-#: lib/query.c:322 lib/query.c:378
+#: lib/query.c:318 lib/query.c:374
 msgid "package has neither file owner or id lists\n"
 msgstr "paketet har varken filägare eller id-listor\n"
 
-#: lib/query.c:467
+#: lib/query.c:463
 #, c-format
 msgid "can't query %s: %s\n"
 msgstr "kan inte fråga %s: %s\n"
 
-#: lib/query.c:582 lib/rpmchecksig.c:159 lib/rpmchecksig.c:492
-#, c-format
-msgid "%s: readLead failed\n"
-msgstr "%s: readLead misslyckades\n"
-
-#: lib/query.c:588 lib/rpmchecksig.c:498
-#, c-format
-msgid "%s: No signature available (v1.0 RPM)\n"
-msgstr "%s: Ingen signatur tillgänglig (v1.0 RPM)\n"
-
-#: lib/query.c:597 lib/rpmchecksig.c:177 lib/rpmchecksig.c:508
-#, c-format
-msgid "%s: rpmReadSignature failed\n"
-msgstr "%s: rpmReadSignature misslyckades\n"
-
-#: lib/query.c:601 lib/rpmchecksig.c:181 lib/rpmchecksig.c:513
-#, c-format
-msgid "%s: No signature available\n"
-msgstr "%s: Ingen signatur tillgänglig\n"
-
-#: lib/query.c:624
-#, fuzzy, c-format
-msgid "%s: headerRead failed\n"
-msgstr "%s: readLead misslyckades\n"
-
-#: lib/query.c:641 lib/rpmchecksig.c:110 lib/rpmchecksig.c:287
-#, c-format
-msgid "%s: Fread failed: %s\n"
-msgstr "%s: Fread misslyckades: %s\n"
-
-#: lib/query.c:758 lib/query.c:796 lib/rpminstall.c:324 lib/rpminstall.c:468
-#: lib/rpminstall.c:848
+#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463
+#: lib/rpminstall.c:838
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "misslyckades med att öppna %s: %s\n"
 
-#: lib/query.c:774
+#: lib/query.c:616
 #, c-format
 msgid "query of %s failed\n"
 msgstr "fråga av %s misslyckades\n"
 
-#: lib/query.c:780
+#: lib/query.c:622
 msgid "old format source packages cannot be queried\n"
 msgstr "källpaket i gammalt format går inte att fråga om\n"
 
-#: lib/query.c:806 lib/rpminstall.c:481
+#: lib/query.c:648 lib/rpminstall.c:476
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: läsning av paketlista misslyckades: %s\n"
 
-#: lib/query.c:850
+#: lib/query.c:692
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "fråga av specfil %s misslyckades, kan inte tolka\n"
 
-#: lib/query.c:874
+#: lib/query.c:716
 msgid "no packages\n"
 msgstr "inga paket\n"
 
-#: lib/query.c:894
+#: lib/query.c:736
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "grupp %s innehåller inga paket\n"
 
-#: lib/query.c:904
+#: lib/query.c:746
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "inga paketutlösare %s\n"
 
-#: lib/query.c:914
+#: lib/query.c:756
 #, c-format
 msgid "no package requires %s\n"
 msgstr "inget paket behöver %s\n"
 
-#: lib/query.c:925
+#: lib/query.c:767
 #, c-format
 msgid "no package provides %s\n"
 msgstr "inget paket tillhandahåller %s\n"
 
-#: lib/query.c:962
+#: lib/query.c:804
 #, c-format
 msgid "file %s: %s\n"
 msgstr "fil %s: %s\n"
 
-#: lib/query.c:966
+#: lib/query.c:808
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "filen %s tillhör inget paket\n"
 
-#: lib/query.c:993
+#: lib/query.c:835
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "felaktigt paketnummer: %s\n"
 
-#: lib/query.c:996
+#: lib/query.c:838
 #, c-format
 msgid "package record number: %u\n"
 msgstr "paketpost nummer: %u\n"
 
-#: lib/query.c:1001
+#: lib/query.c:843
 #, c-format
 msgid "record %u could not be read\n"
 msgstr "post %u kunde inte läsas\n"
 
-#: lib/query.c:1012 lib/rpminstall.c:634
+#: lib/query.c:854 lib/rpminstall.c:624
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "paket %s är inte installerat\n"
 
-#: lib/rpmchecksig.c:50
+#: lib/rpmchecksig.c:49
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s: open misslyckades: %s\n"
 
-#: lib/rpmchecksig.c:62
+#: lib/rpmchecksig.c:61
 msgid "makeTempFile failed\n"
 msgstr "makeTempFile misslyckades\n"
 
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:103
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: Fwrite misslyckades: %s\n"
 
-#: lib/rpmchecksig.c:164
+#: lib/rpmchecksig.c:163
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr "%s: Kan inte signera v1.0 RPM\n"
 
-#: lib/rpmchecksig.c:168
+#: lib/rpmchecksig.c:167
 #, 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:214
+#: lib/rpmchecksig.c:213
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: writeLead misslyckades: %s\n"
 
-#: lib/rpmchecksig.c:220
+#: lib/rpmchecksig.c:219
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmWriteSignature misslyckades: %s\n"
 
-#: lib/rpmchecksig.c:731
+#: lib/rpmchecksig.c:512
+#, c-format
+msgid "%s: No signature available (v1.0 RPM)\n"
+msgstr "%s: Ingen signatur tillgänglig (v1.0 RPM)\n"
+
+#: lib/rpmchecksig.c:707
 msgid "NOT OK"
 msgstr "EJ OK"
 
-#: lib/rpmchecksig.c:732 lib/rpmchecksig.c:746
+#: lib/rpmchecksig.c:708 lib/rpmchecksig.c:722
 msgid " (MISSING KEYS:"
 msgstr " (SAKNADE NYCKLAR:"
 
-#: lib/rpmchecksig.c:734 lib/rpmchecksig.c:748
+#: lib/rpmchecksig.c:710 lib/rpmchecksig.c:724
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:735 lib/rpmchecksig.c:749
+#: lib/rpmchecksig.c:711 lib/rpmchecksig.c:725
 msgid " (UNTRUSTED KEYS:"
 msgstr " (EJ BETRODDA NYCKLAR:"
 
-#: lib/rpmchecksig.c:737 lib/rpmchecksig.c:751
+#: lib/rpmchecksig.c:713 lib/rpmchecksig.c:727
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:745
+#: lib/rpmchecksig.c:721
 msgid "OK"
 msgstr "OK"
 
@@ -2530,86 +2535,86 @@ msgstr "Förbereder..."
 msgid "Preparing packages for installation..."
 msgstr "Förbereder paket för installation ..."
 
-#: lib/rpminstall.c:274
+#: lib/rpminstall.c:228
+#, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr "kan inte öppna paketdatabas i %s\n"
+
+#: lib/rpminstall.c:285
 #, 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:284
+#: lib/rpminstall.c:295
 #, c-format
 msgid " ... as %s\n"
 msgstr " ... som %s\n"
 
-#: lib/rpminstall.c:288
+#: lib/rpminstall.c:299
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "hoppar över %s - överföring misslyckades - %s\n"
 
-#: lib/rpminstall.c:370
-#, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr "kan inte öppna paketdatabas i %s\n"
-
-#: lib/rpminstall.c:393
+#: lib/rpminstall.c:388
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr "paket %s är inte relokerbart\n"
 
-#: lib/rpminstall.c:442
+#: lib/rpminstall.c:437
 #, c-format
 msgid "error reading from file %s\n"
 msgstr "fel vid läsning från fil %s\n"
 
-#: lib/rpminstall.c:448
+#: lib/rpminstall.c:443
 #, 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:460 lib/rpminstall.c:705
+#: lib/rpminstall.c:455 lib/rpminstall.c:694
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr "%s kan inte installeras\n"
 
-#: lib/rpminstall.c:496
+#: lib/rpminstall.c:491
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "hittade %d käll- och %d binärpaket\n"
 
-#: lib/rpminstall.c:512
+#: lib/rpminstall.c:507
 msgid "failed dependencies:\n"
 msgstr "ouppfyllda beroenden:\n"
 
-#: lib/rpminstall.c:533
+#: lib/rpminstall.c:528
 msgid "installing binary packages\n"
 msgstr "installerar binärpaket\n"
 
-#: lib/rpminstall.c:554
+#: lib/rpminstall.c:549
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "kan inte öppna filen %s: %s\n"
 
-#: lib/rpminstall.c:621
+#: lib/rpminstall.c:611
 #, c-format
 msgid "cannot open %s/packages.rpm\n"
 msgstr "kan inte öppna %s/packages.rpm\n"
 
-#: lib/rpminstall.c:637
+#: lib/rpminstall.c:627
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" anger flera paket\n"
 
-#: lib/rpminstall.c:661
+#: lib/rpminstall.c:651
 msgid "removing these packages would break dependencies:\n"
 msgstr "att ta bort dessa paket skulle göra sönder beroenden:\n"
 
-#: lib/rpminstall.c:691
+#: lib/rpminstall.c:680
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr "kan inte öppna %s: %s\n"
 
-#: lib/rpminstall.c:697
+#: lib/rpminstall.c:686
 #, c-format
 msgid "Installing %s\n"
 msgstr "Installerar %s\n"
@@ -2883,17 +2888,17 @@ msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 "paketet saknar både gruppnamn och id-listor (detta borde aldrig inträffa)\n"
 
-#: lib/verify.c:414
+#: lib/verify.c:417
 #, c-format
 msgid "missing    %s"
 msgstr "saknas     %s"
 
-#: lib/verify.c:511
+#: lib/verify.c:514
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr "Ouppfyllda beroenden för %s-%s-%s: "
 
-#: lib/verify.c:556
+#: lib/verify.c:559
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr "%s-%s-%s: kontrollsumma för oföränderlig huvudregion misslyckades\n"
diff --git a/po/tr.po b/po/tr.po
index 399298c44..7ac54f144 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-24 21:17-0400\n"
+"POT-Creation-Date: 2001-10-26 00:15-0400\n"
 "PO-Revision-Date: 2001-07-05 08:02+300\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -66,15 +66,15 @@ msgstr "Hedef platformlar derleniyor: %s\n"
 msgid "Building for target %s\n"
 msgstr "%s için derleniyor\n"
 
-#: rpm2cpio.c:34
+#: rpm2cpio.c:55
 msgid "argument is not an RPM package\n"
 msgstr "argüman bir RPM paketi deðil\n"
 
-#: rpm2cpio.c:38
+#: rpm2cpio.c:61
 msgid "error reading header from package\n"
 msgstr "paketten baþlýk okunmasý sýrasýnda hata oluþtu\n"
 
-#: rpm2cpio.c:60
+#: rpm2cpio.c:83
 #, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr "payload %s tekrar açýlamýyor\n"
@@ -409,44 +409,44 @@ msgstr "--sign sadece paket oluþturulurken kullanýlabilir"
 msgid "exec failed\n"
 msgstr "icra baþarýsýz\n"
 
-#: rpmqv.c:959
+#: rpmqv.c:963
 msgid "no packages files given for rebuild"
 msgstr "yeniden oluþturmak için paket dosyalarý belirtilmemiþ"
 
-#: rpmqv.c:1026
+#: rpmqv.c:1038
 msgid "no spec files given for build"
 msgstr "oluþturma için gerekli spec dosyasý belirtilmemiþ"
 
-#: rpmqv.c:1028
+#: rpmqv.c:1040
 msgid "no tar files given for build"
 msgstr "oluþturma için gereken tar dosyalarý belirtilmemiþ"
 
-#: rpmqv.c:1047
+#: rpmqv.c:1059
 msgid "no packages given for uninstall"
 msgstr "sistemden silinecek paket(ler) belirtilmedi"
 
-#: rpmqv.c:1058
+#: rpmqv.c:1070
 msgid "no packages given for install"
 msgstr "yüklenecek paket(ler) belirtilmedi"
 
-#: rpmqv.c:1106
+#: rpmqv.c:1118
 msgid "no arguments given for query"
 msgstr "sorgulama için hiç argüman belirtilmedi"
 
-#: rpmqv.c:1120
+#: rpmqv.c:1132
 msgid "no arguments given for verify"
 msgstr "denetleme için hiç argüman belirtilmedi"
 
-#: rpmqv.c:1128
+#: rpmqv.c:1140
 msgid "unexpected arguments to --querytags "
 msgstr "--querytags ile beklenmeyen girdiler"
 
-#: rpmqv.c:1144
+#: rpmqv.c:1156
 #, fuzzy
 msgid "no arguments given"
 msgstr "sorgulama için hiç argüman belirtilmedi"
 
-#: build/build.c:125 build/pack.c:466
+#: build/build.c:125 build/pack.c:487
 msgid "Unable to open temp file.\n"
 msgstr "Geçici dosya açýlamadý.\n"
 
@@ -657,7 +657,7 @@ msgstr "Dosya glob tarafýndan bulunamadý: %s\n"
 msgid "Could not open %%files file %s: %s\n"
 msgstr "%%files dosya %s dosyasýnda açýlamadý: %s\n"
 
-#: build/files.c:1777 build/pack.c:145
+#: build/files.c:1777 build/pack.c:148
 #, c-format
 msgid "line: %s\n"
 msgstr "satýr: %s\n"
@@ -732,156 +732,156 @@ msgstr "getGidS: çok fazla grup-kimliði\n"
 msgid "Could not canonicalize hostname: %s\n"
 msgstr "Böyle bir makina yok: %s\n"
 
-#: build/pack.c:78
+#: build/pack.c:81
 #, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr "%s dosyasýnda arþiv oluþturulamadý: %s\n"
 
-#: build/pack.c:81
+#: build/pack.c:84
 #, c-format
 msgid "create archive failed: %s\n"
 msgstr "arþiv oluþturulamadý: %s\n"
 
-#: build/pack.c:103
+#: build/pack.c:106
 #, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr "cpio_copy yazma hatasý:%s\n"
 
-#: build/pack.c:110
+#: build/pack.c:113
 #, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr "cpio_copy okuma hatasý: %s\n"
 
-#: build/pack.c:213
+#: build/pack.c:216
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr "PreIn dosyasý açýlamadý: %s\n"
 
-#: build/pack.c:220
+#: build/pack.c:223
 #, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr "PreUn dosyasý açýlamadý: %s\n"
 
-#: build/pack.c:227
+#: build/pack.c:230
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr "PostIn dosyasý açýlamadý: %s\n"
 
-#: build/pack.c:234
+#: build/pack.c:237
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr "PostUn dosyasý açýlamadý: %s\n"
 
-#: build/pack.c:242
+#: build/pack.c:245
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr "VerifyScript dosyasý açýlamadý: %s\n"
 
-#: build/pack.c:257
+#: build/pack.c:260
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr "Trigger betik dosyasý açýlamadý: %s\n"
 
-#: build/pack.c:285
+#: build/pack.c:288
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr "readRPM: %s açýlýrken: %s\n"
 
-#: build/pack.c:295
+#: build/pack.c:298
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr "readRPM: %s okunurken: %s\n"
 
-#: build/pack.c:304 build/pack.c:508
+#: build/pack.c:307 build/pack.c:529
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: Fseek baþarýsýz: %s\n"
 
-#: build/pack.c:320
+#: build/pack.c:341
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr "readRPM: %s bir RPM paketi deðil\n"
 
-#: build/pack.c:329
+#: build/pack.c:350
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: %s baþlýðý okunuyor\n"
 
-#: build/pack.c:454
+#: build/pack.c:475
 #, fuzzy
 msgid "Unable to create immutable header region.\n"
 msgstr "%s'den baþlýk okunamadý: %s\n"
 
-#: build/pack.c:472
+#: build/pack.c:493
 #, fuzzy
 msgid "Unable to write temp header\n"
 msgstr "%s'e baþlýk yazýlamadý: %s\n"
 
-#: build/pack.c:480
+#: build/pack.c:501
 msgid "Bad CSA data\n"
 msgstr "CSA verisi geçersiz\n"
 
-#: build/pack.c:515
+#: build/pack.c:536
 #, fuzzy
 msgid "Unable to write final header\n"
 msgstr "%s'e baþlýk yazýlamadý: %s\n"
 
-#: build/pack.c:533
+#: build/pack.c:554
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "Ýmza üretiliyor: %d\n"
 
-#: build/pack.c:546
+#: build/pack.c:567
 #, fuzzy
 msgid "Unable to reload signature header.\n"
 msgstr "%s'den baþlýk okunamadý: %s\n"
 
-#: build/pack.c:554
+#: build/pack.c:575
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr "%s açýlamadý: %s\n"
 
-#: build/pack.c:590 lib/psm.c:2149
+#: build/pack.c:611 lib/psm.c:2153
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "paket yazýlamadý: %s\n"
 
-#: build/pack.c:605
+#: build/pack.c:626
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "sigtarget %s açýlamadý: %s\n"
 
-#: build/pack.c:615
+#: build/pack.c:636
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "%s'den baþlýk okunamadý: %s\n"
 
-#: build/pack.c:629
+#: build/pack.c:650
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "%s'e baþlýk yazýlamadý: %s\n"
 
-#: build/pack.c:639
+#: build/pack.c:660
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "%s'den payload okunamadý: %s\n"
 
-#: build/pack.c:645
+#: build/pack.c:666
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "%s'e payload yazýlamadý: %s\n"
 
-#: build/pack.c:670 lib/psm.c:2415
+#: build/pack.c:691 lib/psm.c:2419
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Yazýldý: %s\n"
 
-#: build/pack.c:737
+#: build/pack.c:758
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr "%s paket dosyasý için çýktý dosya adý üretilemedi: %s\n"
 
-#: build/pack.c:754
+#: build/pack.c:775
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr "%s dosyasý oluþturulamýyor: %s\n"
@@ -1466,60 +1466,60 @@ msgstr ""
 msgid "  %s    A %s\tB %s\n"
 msgstr "  %s    A %s\tB %s\n"
 
-#: lib/depends.c:585 lib/depends.c:1248 lib/depends.c:1381
+#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
 msgid "YES"
 msgstr "EVET"
 
-#: lib/depends.c:585 lib/depends.c:1248 lib/depends.c:1381
+#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
 msgid "NO "
 msgstr "HAYIR "
 
-#: lib/depends.c:1042
+#: lib/depends.c:1044
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr "%s: %-45s EVET (dosyalar eklendi)\n"
 
-#: lib/depends.c:1153
+#: lib/depends.c:1155
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr "%s: %-45s EVET (önlem eklendi)\n"
 
-#: lib/depends.c:1247
+#: lib/depends.c:1249
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr "%s: %-45s %-s (arabellekli)\n"
 
-#: lib/depends.c:1276
+#: lib/depends.c:1278
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr "%s: %-45s EVET (rpmrc saðlar)\n"
 
-#: lib/depends.c:1293
+#: lib/depends.c:1295
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr "%s: %-45s EVET (rpmlib saðlar)\n"
 
-#: lib/depends.c:1317
+#: lib/depends.c:1319
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr "%s: %-45s EVET (db dosyalarý)\n"
 
-#: lib/depends.c:1330
+#: lib/depends.c:1332
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr "%s: %-45s EVET (db saðlar)\n"
 
-#: lib/depends.c:1344
+#: lib/depends.c:1346
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr "%s: %-45s EVET (db paketi)\n"
 
-#: lib/depends.c:1360
+#: lib/depends.c:1362
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr "%s: %-45s HAYIR\n"
 
-#: lib/depends.c:1381
+#: lib/depends.c:1383
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr "%s: (%s, %s) Baðýmlýlar alanýna eklendi.\n"
@@ -1527,43 +1527,43 @@ msgstr "%s: (%s, %s) Baðýmlýlar alanýna eklendi.\n"
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1454
+#: lib/depends.c:1456
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr "paket %s-%s-%s gereksinimi tatmin edici deðil: %s\n"
 
 #. conflicts exist.
-#: lib/depends.c:1533
+#: lib/depends.c:1535
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr "%s paketi çeliþiyor: %s\n"
 
-#: lib/depends.c:1786
+#: lib/depends.c:1788
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr "tsort baðýntýlarýndan %s-%s-%s \"%s\" kaldýrýlýyor\n"
 
 #. Record all relations.
-#: lib/depends.c:1936
+#: lib/depends.c:1938
 msgid "========== recording tsort relations\n"
 msgstr "========== tsort baðýntýlarý kaydediliyor\n"
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1996
+#: lib/depends.c:1998
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 "========== paketler tsort'lanýyor (sýra, #öncüller, #ardýllar, derinlik)\n"
 
-#: lib/depends.c:2046
+#: lib/depends.c:2048
 msgid "========== successors only (presentation order)\n"
 msgstr "========== sadece ardýllar (sunum sýrasý)\n"
 
-#: lib/depends.c:2099
+#: lib/depends.c:2101
 msgid "LOOP:\n"
 msgstr "ÇEVRÝM:\n"
 
-#: lib/depends.c:2129
+#: lib/depends.c:2131
 msgid "========== continuing tsort ...\n"
 msgstr "========== tsort sürüyor ...\n"
 
@@ -1752,17 +1752,47 @@ msgstr "(bilinmeyen tür)"
 msgid "error creating temporary file %s\n"
 msgstr "%s geçici dosyasý oluþturulurken hata\n"
 
-#: lib/package.c:161
+#: lib/package.c:167 lib/package.c:238
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr "RPM'nin bu sürümünde paket sürümü 1 desteklenmiyor\n"
 
-#: lib/package.c:184
+#: lib/package.c:188 lib/package.c:246
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 "RPM'nin bu sürümünde sadece ilk sürüm rakamý <= 4 olan paketler "
 "destekleniyor\n"
 
+#: lib/package.c:224 lib/rpmchecksig.c:158 lib/rpmchecksig.c:506
+#, c-format
+msgid "%s: readLead failed\n"
+msgstr "%s: readLead baþarýsýz\n"
+
+#: lib/package.c:230
+#, fuzzy, c-format
+msgid "%s: bad magic\n"
+msgstr "Magic hatalý"
+
+#: lib/package.c:254 lib/rpmchecksig.c:176 lib/rpmchecksig.c:522
+#, c-format
+msgid "%s: rpmReadSignature failed\n"
+msgstr "%s: rpmReadSignature baþarýsýz\n"
+
+#: lib/package.c:258 lib/rpmchecksig.c:180 lib/rpmchecksig.c:527
+#, c-format
+msgid "%s: No signature available\n"
+msgstr "%s: Ýmza bulundurmuyor\n"
+
+#: lib/package.c:284
+#, fuzzy, c-format
+msgid "%s: headerRead failed\n"
+msgstr "%s: readLead baþarýsýz\n"
+
+#: lib/package.c:303 lib/rpmchecksig.c:109 lib/rpmchecksig.c:450
+#, c-format
+msgid "%s: Fread failed: %s\n"
+msgstr "%s: Fread baþarýsýz: %s\n"
+
 #: lib/poptI.c:47
 msgid "exclude paths must begin with a /"
 msgstr "dýþlanan dosya yolu / ile baþlamalý"
@@ -2273,275 +2303,250 @@ msgstr "%%%s dosyasý oluþturulamýyor: %s\n"
 msgid "cannot write to %%%s %s\n"
 msgstr "%%%s dosyasýna yazýlamaz %s\n"
 
-#: lib/psm.c:1214
+#: lib/psm.c:1217
 msgid "source package expected, binary found\n"
 msgstr "kaynak paketi gerekirken çalýþtýrýlabilir paketi bulundu\n"
 
-#: lib/psm.c:1325
+#: lib/psm.c:1330
 msgid "source package contains no .spec file\n"
 msgstr "kaynak paketi .spec dosyasý içermiyor\n"
 
-#: lib/psm.c:1432
+#: lib/psm.c:1436
 #, fuzzy, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr "%s: %s betiði çalýþtýrýlýyor (varsa)\n"
 
-#: lib/psm.c:1600
+#: lib/psm.c:1604
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr "%s betiðinin %s-%s-%s'den icrasý baþarýsýz, waitpid sonucu %s\n"
 
-#: lib/psm.c:1607
+#: lib/psm.c:1611
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr "%s betiðinin %s-%s-%s'den icrasý baþarýsýz, çýkýþta durum %d\n"
 
-#: lib/psm.c:1954
+#: lib/psm.c:1958
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr "%s: %s-%s-%s %d dosya içeriyor, test = %d\n"
 
-#: lib/psm.c:2071
+#: lib/psm.c:2075
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr "%s: %s betiði baþarýsýz (%d), %s-%s-%s atlanýyor\n"
 
-#: lib/psm.c:2186
+#: lib/psm.c:2190
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr "kullanýcý %s yok - root kullanýlacak\n"
 
-#: lib/psm.c:2195
+#: lib/psm.c:2199
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr "grup %s yok - root kullanýlacak\n"
 
-#: lib/psm.c:2236
+#: lib/psm.c:2240
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr "arþiv paketi açýlýrken baþarýsýz%s%s: %s\n"
 
-#: lib/psm.c:2237
+#: lib/psm.c:2241
 msgid " on file "
 msgstr " dosyada "
 
-#: lib/psm.c:2423
+#: lib/psm.c:2427
 #, fuzzy, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr "%s açýlamadý: %s\n"
 
-#: lib/psm.c:2426
+#: lib/psm.c:2430
 #, fuzzy, c-format
 msgid "%s failed: %s\n"
 msgstr "%s baþarýsýz\n"
 
-#: lib/query.c:128
+#: lib/query.c:124
 #, c-format
 msgid "incorrect format: %s\n"
 msgstr "biçem yanlýþ: %s\n"
 
-#: lib/query.c:225
+#: lib/query.c:221
 msgid "(contains no files)"
 msgstr "(hiç dosya içermiyor)"
 
-#: lib/query.c:286
+#: lib/query.c:282
 msgid "normal        "
 msgstr "normal        "
 
-#: lib/query.c:289
+#: lib/query.c:285
 msgid "replaced      "
 msgstr "yerine        "
 
-#: lib/query.c:292
+#: lib/query.c:288
 msgid "not installed "
 msgstr "yüklenmedi "
 
-#: lib/query.c:295
+#: lib/query.c:291
 msgid "net shared    "
 msgstr "að paylaþýmlý "
 
-#: lib/query.c:298
+#: lib/query.c:294
 #, c-format
 msgid "(unknown %3d) "
 msgstr "(bilinmeyen %3d)"
 
-#: lib/query.c:303
+#: lib/query.c:299
 msgid "(no state)    "
 msgstr "(durumsuz)    "
 
-#: lib/query.c:322 lib/query.c:378
+#: lib/query.c:318 lib/query.c:374
 msgid "package has neither file owner or id lists\n"
 msgstr "paket ne dosya sahibi ne de kimlik listesi içeriyor\n"
 
-#: lib/query.c:467
+#: lib/query.c:463
 #, c-format
 msgid "can't query %s: %s\n"
 msgstr "%s sorgulanamýyor: %s\n"
 
-#: lib/query.c:582 lib/rpmchecksig.c:159 lib/rpmchecksig.c:492
-#, c-format
-msgid "%s: readLead failed\n"
-msgstr "%s: readLead baþarýsýz\n"
-
-#: lib/query.c:588 lib/rpmchecksig.c:498
-#, c-format
-msgid "%s: No signature available (v1.0 RPM)\n"
-msgstr "%s: Ýmza bulundurmuyor (v1.0 RPM)\n"
-
-#: lib/query.c:597 lib/rpmchecksig.c:177 lib/rpmchecksig.c:508
-#, c-format
-msgid "%s: rpmReadSignature failed\n"
-msgstr "%s: rpmReadSignature baþarýsýz\n"
-
-#: lib/query.c:601 lib/rpmchecksig.c:181 lib/rpmchecksig.c:513
-#, c-format
-msgid "%s: No signature available\n"
-msgstr "%s: Ýmza bulundurmuyor\n"
-
-#: lib/query.c:624
-#, fuzzy, c-format
-msgid "%s: headerRead failed\n"
-msgstr "%s: readLead baþarýsýz\n"
-
-#: lib/query.c:641 lib/rpmchecksig.c:110 lib/rpmchecksig.c:287
-#, c-format
-msgid "%s: Fread failed: %s\n"
-msgstr "%s: Fread baþarýsýz: %s\n"
-
-#: lib/query.c:758 lib/query.c:796 lib/rpminstall.c:324 lib/rpminstall.c:468
-#: lib/rpminstall.c:848
+#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463
+#: lib/rpminstall.c:838
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "%s açýlamadý: %s\n"
 
-#: lib/query.c:774
+#: lib/query.c:616
 #, c-format
 msgid "query of %s failed\n"
 msgstr "%s 'nin sorgulamasý baþarýsýzlýkla sonuçlandý\n"
 
-#: lib/query.c:780
+#: lib/query.c:622
 msgid "old format source packages cannot be queried\n"
 msgstr "eski biçem kaynak paketleri sorgulanamaz\n"
 
-#: lib/query.c:806 lib/rpminstall.c:481
+#: lib/query.c:648 lib/rpminstall.c:476
 #, fuzzy, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: bildirge okuma baþarýsýz: %s\n"
 
-#: lib/query.c:850
+#: lib/query.c:692
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "%s spec dosyasýnýn sorgulanmasý baþarýsýz, çözümlenemiyor\n"
 
-#: lib/query.c:874
+#: lib/query.c:716
 msgid "no packages\n"
 msgstr "paket yok\n"
 
-#: lib/query.c:894
+#: lib/query.c:736
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "%s grubu hiç paket içermiyor\n"
 
-#: lib/query.c:904
+#: lib/query.c:746
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "%s tetikleyen paket yok\n"
 
-#: lib/query.c:914
+#: lib/query.c:756
 #, c-format
 msgid "no package requires %s\n"
 msgstr "%s gerektiren paket yok\n"
 
-#: lib/query.c:925
+#: lib/query.c:767
 #, c-format
 msgid "no package provides %s\n"
 msgstr "%s saðlayan paket yok\n"
 
-#: lib/query.c:962
+#: lib/query.c:804
 #, c-format
 msgid "file %s: %s\n"
 msgstr "dosya %s: %s\n"
 
-#: lib/query.c:966
+#: lib/query.c:808
 #, 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:993
+#: lib/query.c:835
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "geçersiz paket numarasý: %s\n"
 
-#: lib/query.c:996
+#: lib/query.c:838
 #, c-format
 msgid "package record number: %u\n"
 msgstr "paket kayýt numarasý: %u\n"
 
-#: lib/query.c:1001
+#: lib/query.c:843
 #, c-format
 msgid "record %u could not be read\n"
 msgstr "%u. kayýt okunamadý\n"
 
-#: lib/query.c:1012 lib/rpminstall.c:634
+#: lib/query.c:854 lib/rpminstall.c:624
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "%s paketi kurulu deðil\n"
 
-#: lib/rpmchecksig.c:50
+#: lib/rpmchecksig.c:49
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s: açýlamadý: %s\n"
 
-#: lib/rpmchecksig.c:62
+#: lib/rpmchecksig.c:61
 msgid "makeTempFile failed\n"
 msgstr "makeTempFile baþarýsýz\n"
 
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:103
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: Fwrite baþarýsýz: %s\n"
 
-#: lib/rpmchecksig.c:164
+#: lib/rpmchecksig.c:163
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr "%s: v1.0 RPM (eski sürüm) imzalanamaz\n"
 
-#: lib/rpmchecksig.c:168
+#: lib/rpmchecksig.c:167
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr "%s: v2.0 RPM (eski sürüm) yeniden imzalanamaz\n"
 
-#: lib/rpmchecksig.c:214
+#: lib/rpmchecksig.c:213
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: writeLead baþarýsýz: %s\n"
 
-#: lib/rpmchecksig.c:220
+#: lib/rpmchecksig.c:219
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmWriteSignature baþarýsýz: %s\n"
 
-#: lib/rpmchecksig.c:731
+#: lib/rpmchecksig.c:512
+#, c-format
+msgid "%s: No signature available (v1.0 RPM)\n"
+msgstr "%s: Ýmza bulundurmuyor (v1.0 RPM)\n"
+
+#: lib/rpmchecksig.c:707
 msgid "NOT OK"
 msgstr "TAMAM DEÐÝL"
 
-#: lib/rpmchecksig.c:732 lib/rpmchecksig.c:746
+#: lib/rpmchecksig.c:708 lib/rpmchecksig.c:722
 msgid " (MISSING KEYS:"
 msgstr " (EKSÝK ANAHTARLAR:"
 
-#: lib/rpmchecksig.c:734 lib/rpmchecksig.c:748
+#: lib/rpmchecksig.c:710 lib/rpmchecksig.c:724
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:735 lib/rpmchecksig.c:749
+#: lib/rpmchecksig.c:711 lib/rpmchecksig.c:725
 msgid " (UNTRUSTED KEYS:"
 msgstr " (GÜVENCESÝZ ANAHTARLAR:"
 
-#: lib/rpmchecksig.c:737 lib/rpmchecksig.c:751
+#: lib/rpmchecksig.c:713 lib/rpmchecksig.c:727
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:745
+#: lib/rpmchecksig.c:721
 msgid "OK"
 msgstr "Tamam"
 
@@ -2553,86 +2558,86 @@ msgstr "Hazýrlanýyor..."
 msgid "Preparing packages for installation..."
 msgstr "Kurulacak paketler hazýrlanýyor..."
 
-#: lib/rpminstall.c:274
+#: lib/rpminstall.c:228
+#, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr "%s de Paket veritabaný açýlamadý\n"
+
+#: lib/rpminstall.c:285
 #, 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:284
+#: lib/rpminstall.c:295
 #, c-format
 msgid " ... as %s\n"
 msgstr "... %s olarak\n"
 
-#: lib/rpminstall.c:288
+#: lib/rpminstall.c:299
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr "%s atlanýyor - aktarým baþarýsýz - %s\n"
 
-#: lib/rpminstall.c:370
-#, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr "%s de Paket veritabaný açýlamadý\n"
-
-#: lib/rpminstall.c:393
+#: lib/rpminstall.c:388
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr "%s paketi yeniden konumlandýrýlamaz\n"
 
-#: lib/rpminstall.c:442
+#: lib/rpminstall.c:437
 #, c-format
 msgid "error reading from file %s\n"
 msgstr "%s dosyasýndan okuma hatalý\n"
 
-#: lib/rpminstall.c:448
+#: lib/rpminstall.c:443
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr "%s dosyasý RPM'nin daha yeni bir sürümünü gerektiriyor\n"
 
-#: lib/rpminstall.c:460 lib/rpminstall.c:705
+#: lib/rpminstall.c:455 lib/rpminstall.c:694
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr "%s yüklenemedi\n"
 
-#: lib/rpminstall.c:496
+#: lib/rpminstall.c:491
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr "%d kaynak ve %d icra edilebilir paketi bulundu\n"
 
-#: lib/rpminstall.c:512
+#: lib/rpminstall.c:507
 msgid "failed dependencies:\n"
 msgstr "baðýmlýlýklarda hata; gerekli paketler:\n"
 
-#: lib/rpminstall.c:533
+#: lib/rpminstall.c:528
 msgid "installing binary packages\n"
 msgstr "icra edilebilir paketleri kuruluyor\n"
 
-#: lib/rpminstall.c:554
+#: lib/rpminstall.c:549
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr "%s dosyasý açýlamadý: %s\n"
 
-#: lib/rpminstall.c:621
+#: lib/rpminstall.c:611
 #, c-format
 msgid "cannot open %s/packages.rpm\n"
 msgstr "%s/packages.rpm açýlamýyor\n"
 
-#: lib/rpminstall.c:637
+#: lib/rpminstall.c:627
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr "\"%s\" birden fazla paketi tanýmlýyor\n"
 
-#: lib/rpminstall.c:661
+#: lib/rpminstall.c:651
 msgid "removing these packages would break dependencies:\n"
 msgstr "bu paketin silinmesi aþaðýdakilerin baðýmlýlýklarýný etkileyecektir:\n"
 
-#: lib/rpminstall.c:691
+#: lib/rpminstall.c:680
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr "%s açýlamadý: %s\n"
 
-#: lib/rpminstall.c:697
+#: lib/rpminstall.c:686
 #, c-format
 msgid "Installing %s\n"
 msgstr "%s kuruluyor\n"
@@ -2904,17 +2909,17 @@ msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 "paket hem grup ismi hem de kimlik listelerinden yoksun (bu hiç iyi deðil)\n"
 
-#: lib/verify.c:414
+#: lib/verify.c:417
 #, c-format
 msgid "missing    %s"
 msgstr "eksik      %s"
 
-#: lib/verify.c:511
+#: lib/verify.c:514
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr "%s-%s-%s için tatmin edici olmayan baðýmlýlýklar: "
 
-#: lib/verify.c:556
+#: lib/verify.c:559
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr "%s-%s-%s: deðiþmez baþlýk alaný özet denetimi baþarýsýz\n"
diff --git a/po/uk.po b/po/uk.po
index ce4f15bfb..285b4d05b 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-24 21:17-0400\n"
+"POT-Creation-Date: 2001-10-26 00:15-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"
@@ -70,15 +70,15 @@ msgstr ""
 msgid "Building for target %s\n"
 msgstr ""
 
-#: rpm2cpio.c:34
+#: rpm2cpio.c:55
 msgid "argument is not an RPM package\n"
 msgstr ""
 
-#: rpm2cpio.c:38
+#: rpm2cpio.c:61
 msgid "error reading header from package\n"
 msgstr ""
 
-#: rpm2cpio.c:60
+#: rpm2cpio.c:83
 #, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr ""
@@ -397,43 +397,43 @@ msgstr ""
 msgid "exec failed\n"
 msgstr ""
 
-#: rpmqv.c:959
+#: rpmqv.c:963
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1026
+#: rpmqv.c:1038
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1028
+#: rpmqv.c:1040
 msgid "no tar files given for build"
 msgstr ""
 
-#: rpmqv.c:1047
+#: rpmqv.c:1059
 msgid "no packages given for uninstall"
 msgstr ""
 
-#: rpmqv.c:1058
+#: rpmqv.c:1070
 msgid "no packages given for install"
 msgstr ""
 
-#: rpmqv.c:1106
+#: rpmqv.c:1118
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpmqv.c:1120
+#: rpmqv.c:1132
 msgid "no arguments given for verify"
 msgstr ""
 
-#: rpmqv.c:1128
+#: rpmqv.c:1140
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpmqv.c:1144
+#: rpmqv.c:1156
 msgid "no arguments given"
 msgstr ""
 
-#: build/build.c:125 build/pack.c:466
+#: build/build.c:125 build/pack.c:487
 msgid "Unable to open temp file.\n"
 msgstr ""
 
@@ -641,7 +641,7 @@ msgstr ""
 msgid "Could not open %%files file %s: %s\n"
 msgstr ""
 
-#: build/files.c:1777 build/pack.c:145
+#: build/files.c:1777 build/pack.c:148
 #, c-format
 msgid "line: %s\n"
 msgstr ""
@@ -716,152 +716,152 @@ msgstr ""
 msgid "Could not canonicalize hostname: %s\n"
 msgstr ""
 
-#: build/pack.c:78
+#: build/pack.c:81
 #, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr ""
 
-#: build/pack.c:81
+#: build/pack.c:84
 #, c-format
 msgid "create archive failed: %s\n"
 msgstr ""
 
-#: build/pack.c:103
+#: build/pack.c:106
 #, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr ""
 
-#: build/pack.c:110
+#: build/pack.c:113
 #, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr ""
 
-#: build/pack.c:213
+#: build/pack.c:216
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr ""
 
-#: build/pack.c:220
+#: build/pack.c:223
 #, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr ""
 
-#: build/pack.c:227
+#: build/pack.c:230
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr ""
 
-#: build/pack.c:234
+#: build/pack.c:237
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr ""
 
-#: build/pack.c:242
+#: build/pack.c:245
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr ""
 
-#: build/pack.c:257
+#: build/pack.c:260
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr ""
 
-#: build/pack.c:285
+#: build/pack.c:288
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:295
+#: build/pack.c:298
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr ""
 
-#: build/pack.c:304 build/pack.c:508
+#: build/pack.c:307 build/pack.c:529
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr ""
 
-#: build/pack.c:320
+#: build/pack.c:341
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr ""
 
-#: build/pack.c:329
+#: build/pack.c:350
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:454
+#: build/pack.c:475
 msgid "Unable to create immutable header region.\n"
 msgstr ""
 
-#: build/pack.c:472
+#: build/pack.c:493
 msgid "Unable to write temp header\n"
 msgstr ""
 
-#: build/pack.c:480
+#: build/pack.c:501
 msgid "Bad CSA data\n"
 msgstr ""
 
-#: build/pack.c:515
+#: build/pack.c:536
 msgid "Unable to write final header\n"
 msgstr ""
 
-#: build/pack.c:533
+#: build/pack.c:554
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr ""
 
-#: build/pack.c:546
+#: build/pack.c:567
 msgid "Unable to reload signature header.\n"
 msgstr ""
 
-#: build/pack.c:554
+#: build/pack.c:575
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:590 lib/psm.c:2149
+#: build/pack.c:611 lib/psm.c:2153
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
 
-#: build/pack.c:605
+#: build/pack.c:626
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr ""
 
-#: build/pack.c:615
+#: build/pack.c:636
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr ""
 
-#: build/pack.c:629
+#: build/pack.c:650
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:639
+#: build/pack.c:660
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr ""
 
-#: build/pack.c:645
+#: build/pack.c:666
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:670 lib/psm.c:2415
+#: build/pack.c:691 lib/psm.c:2419
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:737
+#: build/pack.c:758
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:754
+#: build/pack.c:775
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr ""
@@ -1428,60 +1428,60 @@ msgstr ""
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1248 lib/depends.c:1381
+#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1248 lib/depends.c:1381
+#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:1042
+#: lib/depends.c:1044
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:1153
+#: lib/depends.c:1155
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:1247
+#: lib/depends.c:1249
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1276
+#: lib/depends.c:1278
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1293
+#: lib/depends.c:1295
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:1317
+#: lib/depends.c:1319
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1330
+#: lib/depends.c:1332
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1344
+#: lib/depends.c:1346
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:1360
+#: lib/depends.c:1362
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1381
+#: lib/depends.c:1383
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
@@ -1489,42 +1489,42 @@ msgstr ""
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1454
+#: lib/depends.c:1456
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1533
+#: lib/depends.c:1535
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1786
+#: lib/depends.c:1788
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1936
+#: lib/depends.c:1938
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1996
+#: lib/depends.c:1998
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2046
+#: lib/depends.c:2048
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:2099
+#: lib/depends.c:2101
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:2129
+#: lib/depends.c:2131
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -1710,15 +1710,45 @@ msgstr ""
 msgid "error creating temporary file %s\n"
 msgstr ""
 
-#: lib/package.c:161
+#: lib/package.c:167 lib/package.c:238
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:184
+#: lib/package.c:188 lib/package.c:246
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 
+#: lib/package.c:224 lib/rpmchecksig.c:158 lib/rpmchecksig.c:506
+#, c-format
+msgid "%s: readLead failed\n"
+msgstr ""
+
+#: lib/package.c:230
+#, c-format
+msgid "%s: bad magic\n"
+msgstr ""
+
+#: lib/package.c:254 lib/rpmchecksig.c:176 lib/rpmchecksig.c:522
+#, c-format
+msgid "%s: rpmReadSignature failed\n"
+msgstr ""
+
+#: lib/package.c:258 lib/rpmchecksig.c:180 lib/rpmchecksig.c:527
+#, c-format
+msgid "%s: No signature available\n"
+msgstr ""
+
+#: lib/package.c:284
+#, c-format
+msgid "%s: headerRead failed\n"
+msgstr ""
+
+#: lib/package.c:303 lib/rpmchecksig.c:109 lib/rpmchecksig.c:450
+#, c-format
+msgid "%s: Fread failed: %s\n"
+msgstr ""
+
 #: lib/poptI.c:47
 msgid "exclude paths must begin with a /"
 msgstr ""
@@ -2211,275 +2241,250 @@ msgstr ""
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1214
+#: lib/psm.c:1217
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1325
+#: lib/psm.c:1330
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1432
+#: lib/psm.c:1436
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1600
+#: lib/psm.c:1604
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1607
+#: lib/psm.c:1611
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1954
+#: lib/psm.c:1958
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2071
+#: lib/psm.c:2075
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2186
+#: lib/psm.c:2190
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2195
+#: lib/psm.c:2199
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2236
+#: lib/psm.c:2240
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2237
+#: lib/psm.c:2241
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2423
+#: lib/psm.c:2427
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2426
+#: lib/psm.c:2430
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:128
+#: lib/query.c:124
 #, c-format
 msgid "incorrect format: %s\n"
 msgstr ""
 
-#: lib/query.c:225
+#: lib/query.c:221
 msgid "(contains no files)"
 msgstr ""
 
-#: lib/query.c:286
+#: lib/query.c:282
 msgid "normal        "
 msgstr ""
 
-#: lib/query.c:289
+#: lib/query.c:285
 msgid "replaced      "
 msgstr ""
 
-#: lib/query.c:292
+#: lib/query.c:288
 msgid "not installed "
 msgstr ""
 
-#: lib/query.c:295
+#: lib/query.c:291
 msgid "net shared    "
 msgstr ""
 
-#: lib/query.c:298
+#: lib/query.c:294
 #, c-format
 msgid "(unknown %3d) "
 msgstr ""
 
-#: lib/query.c:303
+#: lib/query.c:299
 msgid "(no state)    "
 msgstr ""
 
-#: lib/query.c:322 lib/query.c:378
+#: lib/query.c:318 lib/query.c:374
 msgid "package has neither file owner or id lists\n"
 msgstr ""
 
-#: lib/query.c:467
+#: lib/query.c:463
 #, c-format
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:582 lib/rpmchecksig.c:159 lib/rpmchecksig.c:492
-#, c-format
-msgid "%s: readLead failed\n"
-msgstr ""
-
-#: lib/query.c:588 lib/rpmchecksig.c:498
-#, c-format
-msgid "%s: No signature available (v1.0 RPM)\n"
-msgstr ""
-
-#: lib/query.c:597 lib/rpmchecksig.c:177 lib/rpmchecksig.c:508
-#, c-format
-msgid "%s: rpmReadSignature failed\n"
-msgstr ""
-
-#: lib/query.c:601 lib/rpmchecksig.c:181 lib/rpmchecksig.c:513
-#, c-format
-msgid "%s: No signature available\n"
-msgstr ""
-
-#: lib/query.c:624
-#, c-format
-msgid "%s: headerRead failed\n"
-msgstr ""
-
-#: lib/query.c:641 lib/rpmchecksig.c:110 lib/rpmchecksig.c:287
-#, c-format
-msgid "%s: Fread failed: %s\n"
-msgstr ""
-
-#: lib/query.c:758 lib/query.c:796 lib/rpminstall.c:324 lib/rpminstall.c:468
-#: lib/rpminstall.c:848
+#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463
+#: lib/rpminstall.c:838
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:774
+#: lib/query.c:616
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:780
+#: lib/query.c:622
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:806 lib/rpminstall.c:481
+#: lib/query.c:648 lib/rpminstall.c:476
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr ""
 
-#: lib/query.c:850
+#: lib/query.c:692
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:874
+#: lib/query.c:716
 msgid "no packages\n"
 msgstr ""
 
-#: lib/query.c:894
+#: lib/query.c:736
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:904
+#: lib/query.c:746
 #, c-format
 msgid "no package triggers %s\n"
 msgstr ""
 
-#: lib/query.c:914
+#: lib/query.c:756
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:925
+#: lib/query.c:767
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:962
+#: lib/query.c:804
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:966
+#: lib/query.c:808
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:993
+#: lib/query.c:835
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:996
+#: lib/query.c:838
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:1001
+#: lib/query.c:843
 #, c-format
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:1012 lib/rpminstall.c:634
+#: lib/query.c:854 lib/rpminstall.c:624
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:50
+#: lib/rpmchecksig.c:49
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:62
+#: lib/rpmchecksig.c:61
 msgid "makeTempFile failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:103
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:164
+#: lib/rpmchecksig.c:163
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:168
+#: lib/rpmchecksig.c:167
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:214
+#: lib/rpmchecksig.c:213
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:220
+#: lib/rpmchecksig.c:219
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:731
+#: lib/rpmchecksig.c:512
+#, c-format
+msgid "%s: No signature available (v1.0 RPM)\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:707
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:732 lib/rpmchecksig.c:746
+#: lib/rpmchecksig.c:708 lib/rpmchecksig.c:722
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:734 lib/rpmchecksig.c:748
+#: lib/rpmchecksig.c:710 lib/rpmchecksig.c:724
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:735 lib/rpmchecksig.c:749
+#: lib/rpmchecksig.c:711 lib/rpmchecksig.c:725
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:737 lib/rpmchecksig.c:751
+#: lib/rpmchecksig.c:713 lib/rpmchecksig.c:727
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:745
+#: lib/rpmchecksig.c:721
 msgid "OK"
 msgstr ""
 
@@ -2491,86 +2496,86 @@ msgstr ""
 msgid "Preparing packages for installation..."
 msgstr ""
 
-#: lib/rpminstall.c:274
+#: lib/rpminstall.c:228
+#, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr ""
+
+#: lib/rpminstall.c:285
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:284
+#: lib/rpminstall.c:295
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:288
+#: lib/rpminstall.c:299
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:370
-#, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr ""
-
-#: lib/rpminstall.c:393
+#: lib/rpminstall.c:388
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:442
+#: lib/rpminstall.c:437
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:448
+#: lib/rpminstall.c:443
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:460 lib/rpminstall.c:705
+#: lib/rpminstall.c:455 lib/rpminstall.c:694
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:496
+#: lib/rpminstall.c:491
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:512
+#: lib/rpminstall.c:507
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:533
+#: lib/rpminstall.c:528
 msgid "installing binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:554
+#: lib/rpminstall.c:549
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:621
+#: lib/rpminstall.c:611
 #, c-format
 msgid "cannot open %s/packages.rpm\n"
 msgstr ""
 
-#: lib/rpminstall.c:637
+#: lib/rpminstall.c:627
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:661
+#: lib/rpminstall.c:651
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:691
+#: lib/rpminstall.c:680
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:697
+#: lib/rpminstall.c:686
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
@@ -2836,17 +2841,17 @@ msgstr ""
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:414
+#: lib/verify.c:417
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:511
+#: lib/verify.c:514
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
 
-#: lib/verify.c:556
+#: lib/verify.c:559
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
diff --git a/po/wa.po b/po/wa.po
index ce4f15bfb..285b4d05b 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-24 21:17-0400\n"
+"POT-Creation-Date: 2001-10-26 00:15-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"
@@ -70,15 +70,15 @@ msgstr ""
 msgid "Building for target %s\n"
 msgstr ""
 
-#: rpm2cpio.c:34
+#: rpm2cpio.c:55
 msgid "argument is not an RPM package\n"
 msgstr ""
 
-#: rpm2cpio.c:38
+#: rpm2cpio.c:61
 msgid "error reading header from package\n"
 msgstr ""
 
-#: rpm2cpio.c:60
+#: rpm2cpio.c:83
 #, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr ""
@@ -397,43 +397,43 @@ msgstr ""
 msgid "exec failed\n"
 msgstr ""
 
-#: rpmqv.c:959
+#: rpmqv.c:963
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1026
+#: rpmqv.c:1038
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1028
+#: rpmqv.c:1040
 msgid "no tar files given for build"
 msgstr ""
 
-#: rpmqv.c:1047
+#: rpmqv.c:1059
 msgid "no packages given for uninstall"
 msgstr ""
 
-#: rpmqv.c:1058
+#: rpmqv.c:1070
 msgid "no packages given for install"
 msgstr ""
 
-#: rpmqv.c:1106
+#: rpmqv.c:1118
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpmqv.c:1120
+#: rpmqv.c:1132
 msgid "no arguments given for verify"
 msgstr ""
 
-#: rpmqv.c:1128
+#: rpmqv.c:1140
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpmqv.c:1144
+#: rpmqv.c:1156
 msgid "no arguments given"
 msgstr ""
 
-#: build/build.c:125 build/pack.c:466
+#: build/build.c:125 build/pack.c:487
 msgid "Unable to open temp file.\n"
 msgstr ""
 
@@ -641,7 +641,7 @@ msgstr ""
 msgid "Could not open %%files file %s: %s\n"
 msgstr ""
 
-#: build/files.c:1777 build/pack.c:145
+#: build/files.c:1777 build/pack.c:148
 #, c-format
 msgid "line: %s\n"
 msgstr ""
@@ -716,152 +716,152 @@ msgstr ""
 msgid "Could not canonicalize hostname: %s\n"
 msgstr ""
 
-#: build/pack.c:78
+#: build/pack.c:81
 #, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr ""
 
-#: build/pack.c:81
+#: build/pack.c:84
 #, c-format
 msgid "create archive failed: %s\n"
 msgstr ""
 
-#: build/pack.c:103
+#: build/pack.c:106
 #, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr ""
 
-#: build/pack.c:110
+#: build/pack.c:113
 #, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr ""
 
-#: build/pack.c:213
+#: build/pack.c:216
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr ""
 
-#: build/pack.c:220
+#: build/pack.c:223
 #, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr ""
 
-#: build/pack.c:227
+#: build/pack.c:230
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr ""
 
-#: build/pack.c:234
+#: build/pack.c:237
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr ""
 
-#: build/pack.c:242
+#: build/pack.c:245
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr ""
 
-#: build/pack.c:257
+#: build/pack.c:260
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr ""
 
-#: build/pack.c:285
+#: build/pack.c:288
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:295
+#: build/pack.c:298
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr ""
 
-#: build/pack.c:304 build/pack.c:508
+#: build/pack.c:307 build/pack.c:529
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr ""
 
-#: build/pack.c:320
+#: build/pack.c:341
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr ""
 
-#: build/pack.c:329
+#: build/pack.c:350
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:454
+#: build/pack.c:475
 msgid "Unable to create immutable header region.\n"
 msgstr ""
 
-#: build/pack.c:472
+#: build/pack.c:493
 msgid "Unable to write temp header\n"
 msgstr ""
 
-#: build/pack.c:480
+#: build/pack.c:501
 msgid "Bad CSA data\n"
 msgstr ""
 
-#: build/pack.c:515
+#: build/pack.c:536
 msgid "Unable to write final header\n"
 msgstr ""
 
-#: build/pack.c:533
+#: build/pack.c:554
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr ""
 
-#: build/pack.c:546
+#: build/pack.c:567
 msgid "Unable to reload signature header.\n"
 msgstr ""
 
-#: build/pack.c:554
+#: build/pack.c:575
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:590 lib/psm.c:2149
+#: build/pack.c:611 lib/psm.c:2153
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
 
-#: build/pack.c:605
+#: build/pack.c:626
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr ""
 
-#: build/pack.c:615
+#: build/pack.c:636
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr ""
 
-#: build/pack.c:629
+#: build/pack.c:650
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:639
+#: build/pack.c:660
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr ""
 
-#: build/pack.c:645
+#: build/pack.c:666
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:670 lib/psm.c:2415
+#: build/pack.c:691 lib/psm.c:2419
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:737
+#: build/pack.c:758
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:754
+#: build/pack.c:775
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr ""
@@ -1428,60 +1428,60 @@ msgstr ""
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1248 lib/depends.c:1381
+#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1248 lib/depends.c:1381
+#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:1042
+#: lib/depends.c:1044
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:1153
+#: lib/depends.c:1155
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:1247
+#: lib/depends.c:1249
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1276
+#: lib/depends.c:1278
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1293
+#: lib/depends.c:1295
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:1317
+#: lib/depends.c:1319
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1330
+#: lib/depends.c:1332
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1344
+#: lib/depends.c:1346
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:1360
+#: lib/depends.c:1362
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1381
+#: lib/depends.c:1383
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
@@ -1489,42 +1489,42 @@ msgstr ""
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1454
+#: lib/depends.c:1456
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1533
+#: lib/depends.c:1535
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1786
+#: lib/depends.c:1788
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1936
+#: lib/depends.c:1938
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1996
+#: lib/depends.c:1998
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2046
+#: lib/depends.c:2048
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:2099
+#: lib/depends.c:2101
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:2129
+#: lib/depends.c:2131
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -1710,15 +1710,45 @@ msgstr ""
 msgid "error creating temporary file %s\n"
 msgstr ""
 
-#: lib/package.c:161
+#: lib/package.c:167 lib/package.c:238
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:184
+#: lib/package.c:188 lib/package.c:246
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 
+#: lib/package.c:224 lib/rpmchecksig.c:158 lib/rpmchecksig.c:506
+#, c-format
+msgid "%s: readLead failed\n"
+msgstr ""
+
+#: lib/package.c:230
+#, c-format
+msgid "%s: bad magic\n"
+msgstr ""
+
+#: lib/package.c:254 lib/rpmchecksig.c:176 lib/rpmchecksig.c:522
+#, c-format
+msgid "%s: rpmReadSignature failed\n"
+msgstr ""
+
+#: lib/package.c:258 lib/rpmchecksig.c:180 lib/rpmchecksig.c:527
+#, c-format
+msgid "%s: No signature available\n"
+msgstr ""
+
+#: lib/package.c:284
+#, c-format
+msgid "%s: headerRead failed\n"
+msgstr ""
+
+#: lib/package.c:303 lib/rpmchecksig.c:109 lib/rpmchecksig.c:450
+#, c-format
+msgid "%s: Fread failed: %s\n"
+msgstr ""
+
 #: lib/poptI.c:47
 msgid "exclude paths must begin with a /"
 msgstr ""
@@ -2211,275 +2241,250 @@ msgstr ""
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1214
+#: lib/psm.c:1217
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1325
+#: lib/psm.c:1330
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1432
+#: lib/psm.c:1436
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1600
+#: lib/psm.c:1604
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1607
+#: lib/psm.c:1611
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1954
+#: lib/psm.c:1958
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2071
+#: lib/psm.c:2075
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2186
+#: lib/psm.c:2190
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2195
+#: lib/psm.c:2199
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2236
+#: lib/psm.c:2240
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2237
+#: lib/psm.c:2241
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2423
+#: lib/psm.c:2427
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2426
+#: lib/psm.c:2430
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:128
+#: lib/query.c:124
 #, c-format
 msgid "incorrect format: %s\n"
 msgstr ""
 
-#: lib/query.c:225
+#: lib/query.c:221
 msgid "(contains no files)"
 msgstr ""
 
-#: lib/query.c:286
+#: lib/query.c:282
 msgid "normal        "
 msgstr ""
 
-#: lib/query.c:289
+#: lib/query.c:285
 msgid "replaced      "
 msgstr ""
 
-#: lib/query.c:292
+#: lib/query.c:288
 msgid "not installed "
 msgstr ""
 
-#: lib/query.c:295
+#: lib/query.c:291
 msgid "net shared    "
 msgstr ""
 
-#: lib/query.c:298
+#: lib/query.c:294
 #, c-format
 msgid "(unknown %3d) "
 msgstr ""
 
-#: lib/query.c:303
+#: lib/query.c:299
 msgid "(no state)    "
 msgstr ""
 
-#: lib/query.c:322 lib/query.c:378
+#: lib/query.c:318 lib/query.c:374
 msgid "package has neither file owner or id lists\n"
 msgstr ""
 
-#: lib/query.c:467
+#: lib/query.c:463
 #, c-format
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:582 lib/rpmchecksig.c:159 lib/rpmchecksig.c:492
-#, c-format
-msgid "%s: readLead failed\n"
-msgstr ""
-
-#: lib/query.c:588 lib/rpmchecksig.c:498
-#, c-format
-msgid "%s: No signature available (v1.0 RPM)\n"
-msgstr ""
-
-#: lib/query.c:597 lib/rpmchecksig.c:177 lib/rpmchecksig.c:508
-#, c-format
-msgid "%s: rpmReadSignature failed\n"
-msgstr ""
-
-#: lib/query.c:601 lib/rpmchecksig.c:181 lib/rpmchecksig.c:513
-#, c-format
-msgid "%s: No signature available\n"
-msgstr ""
-
-#: lib/query.c:624
-#, c-format
-msgid "%s: headerRead failed\n"
-msgstr ""
-
-#: lib/query.c:641 lib/rpmchecksig.c:110 lib/rpmchecksig.c:287
-#, c-format
-msgid "%s: Fread failed: %s\n"
-msgstr ""
-
-#: lib/query.c:758 lib/query.c:796 lib/rpminstall.c:324 lib/rpminstall.c:468
-#: lib/rpminstall.c:848
+#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463
+#: lib/rpminstall.c:838
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:774
+#: lib/query.c:616
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:780
+#: lib/query.c:622
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:806 lib/rpminstall.c:481
+#: lib/query.c:648 lib/rpminstall.c:476
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr ""
 
-#: lib/query.c:850
+#: lib/query.c:692
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:874
+#: lib/query.c:716
 msgid "no packages\n"
 msgstr ""
 
-#: lib/query.c:894
+#: lib/query.c:736
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:904
+#: lib/query.c:746
 #, c-format
 msgid "no package triggers %s\n"
 msgstr ""
 
-#: lib/query.c:914
+#: lib/query.c:756
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:925
+#: lib/query.c:767
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:962
+#: lib/query.c:804
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:966
+#: lib/query.c:808
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:993
+#: lib/query.c:835
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:996
+#: lib/query.c:838
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:1001
+#: lib/query.c:843
 #, c-format
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:1012 lib/rpminstall.c:634
+#: lib/query.c:854 lib/rpminstall.c:624
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:50
+#: lib/rpmchecksig.c:49
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:62
+#: lib/rpmchecksig.c:61
 msgid "makeTempFile failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:103
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:164
+#: lib/rpmchecksig.c:163
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:168
+#: lib/rpmchecksig.c:167
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:214
+#: lib/rpmchecksig.c:213
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:220
+#: lib/rpmchecksig.c:219
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:731
+#: lib/rpmchecksig.c:512
+#, c-format
+msgid "%s: No signature available (v1.0 RPM)\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:707
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:732 lib/rpmchecksig.c:746
+#: lib/rpmchecksig.c:708 lib/rpmchecksig.c:722
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:734 lib/rpmchecksig.c:748
+#: lib/rpmchecksig.c:710 lib/rpmchecksig.c:724
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:735 lib/rpmchecksig.c:749
+#: lib/rpmchecksig.c:711 lib/rpmchecksig.c:725
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:737 lib/rpmchecksig.c:751
+#: lib/rpmchecksig.c:713 lib/rpmchecksig.c:727
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:745
+#: lib/rpmchecksig.c:721
 msgid "OK"
 msgstr ""
 
@@ -2491,86 +2496,86 @@ msgstr ""
 msgid "Preparing packages for installation..."
 msgstr ""
 
-#: lib/rpminstall.c:274
+#: lib/rpminstall.c:228
+#, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr ""
+
+#: lib/rpminstall.c:285
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:284
+#: lib/rpminstall.c:295
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:288
+#: lib/rpminstall.c:299
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:370
-#, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr ""
-
-#: lib/rpminstall.c:393
+#: lib/rpminstall.c:388
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:442
+#: lib/rpminstall.c:437
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:448
+#: lib/rpminstall.c:443
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:460 lib/rpminstall.c:705
+#: lib/rpminstall.c:455 lib/rpminstall.c:694
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:496
+#: lib/rpminstall.c:491
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:512
+#: lib/rpminstall.c:507
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:533
+#: lib/rpminstall.c:528
 msgid "installing binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:554
+#: lib/rpminstall.c:549
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:621
+#: lib/rpminstall.c:611
 #, c-format
 msgid "cannot open %s/packages.rpm\n"
 msgstr ""
 
-#: lib/rpminstall.c:637
+#: lib/rpminstall.c:627
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:661
+#: lib/rpminstall.c:651
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:691
+#: lib/rpminstall.c:680
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:697
+#: lib/rpminstall.c:686
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
@@ -2836,17 +2841,17 @@ msgstr ""
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:414
+#: lib/verify.c:417
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:511
+#: lib/verify.c:514
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
 
-#: lib/verify.c:556
+#: lib/verify.c:559
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
diff --git a/po/zh.po b/po/zh.po
index ce4f15bfb..285b4d05b 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-24 21:17-0400\n"
+"POT-Creation-Date: 2001-10-26 00:15-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"
@@ -70,15 +70,15 @@ msgstr ""
 msgid "Building for target %s\n"
 msgstr ""
 
-#: rpm2cpio.c:34
+#: rpm2cpio.c:55
 msgid "argument is not an RPM package\n"
 msgstr ""
 
-#: rpm2cpio.c:38
+#: rpm2cpio.c:61
 msgid "error reading header from package\n"
 msgstr ""
 
-#: rpm2cpio.c:60
+#: rpm2cpio.c:83
 #, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr ""
@@ -397,43 +397,43 @@ msgstr ""
 msgid "exec failed\n"
 msgstr ""
 
-#: rpmqv.c:959
+#: rpmqv.c:963
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1026
+#: rpmqv.c:1038
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1028
+#: rpmqv.c:1040
 msgid "no tar files given for build"
 msgstr ""
 
-#: rpmqv.c:1047
+#: rpmqv.c:1059
 msgid "no packages given for uninstall"
 msgstr ""
 
-#: rpmqv.c:1058
+#: rpmqv.c:1070
 msgid "no packages given for install"
 msgstr ""
 
-#: rpmqv.c:1106
+#: rpmqv.c:1118
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpmqv.c:1120
+#: rpmqv.c:1132
 msgid "no arguments given for verify"
 msgstr ""
 
-#: rpmqv.c:1128
+#: rpmqv.c:1140
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpmqv.c:1144
+#: rpmqv.c:1156
 msgid "no arguments given"
 msgstr ""
 
-#: build/build.c:125 build/pack.c:466
+#: build/build.c:125 build/pack.c:487
 msgid "Unable to open temp file.\n"
 msgstr ""
 
@@ -641,7 +641,7 @@ msgstr ""
 msgid "Could not open %%files file %s: %s\n"
 msgstr ""
 
-#: build/files.c:1777 build/pack.c:145
+#: build/files.c:1777 build/pack.c:148
 #, c-format
 msgid "line: %s\n"
 msgstr ""
@@ -716,152 +716,152 @@ msgstr ""
 msgid "Could not canonicalize hostname: %s\n"
 msgstr ""
 
-#: build/pack.c:78
+#: build/pack.c:81
 #, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr ""
 
-#: build/pack.c:81
+#: build/pack.c:84
 #, c-format
 msgid "create archive failed: %s\n"
 msgstr ""
 
-#: build/pack.c:103
+#: build/pack.c:106
 #, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr ""
 
-#: build/pack.c:110
+#: build/pack.c:113
 #, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr ""
 
-#: build/pack.c:213
+#: build/pack.c:216
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr ""
 
-#: build/pack.c:220
+#: build/pack.c:223
 #, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr ""
 
-#: build/pack.c:227
+#: build/pack.c:230
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr ""
 
-#: build/pack.c:234
+#: build/pack.c:237
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr ""
 
-#: build/pack.c:242
+#: build/pack.c:245
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr ""
 
-#: build/pack.c:257
+#: build/pack.c:260
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr ""
 
-#: build/pack.c:285
+#: build/pack.c:288
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:295
+#: build/pack.c:298
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr ""
 
-#: build/pack.c:304 build/pack.c:508
+#: build/pack.c:307 build/pack.c:529
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr ""
 
-#: build/pack.c:320
+#: build/pack.c:341
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr ""
 
-#: build/pack.c:329
+#: build/pack.c:350
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:454
+#: build/pack.c:475
 msgid "Unable to create immutable header region.\n"
 msgstr ""
 
-#: build/pack.c:472
+#: build/pack.c:493
 msgid "Unable to write temp header\n"
 msgstr ""
 
-#: build/pack.c:480
+#: build/pack.c:501
 msgid "Bad CSA data\n"
 msgstr ""
 
-#: build/pack.c:515
+#: build/pack.c:536
 msgid "Unable to write final header\n"
 msgstr ""
 
-#: build/pack.c:533
+#: build/pack.c:554
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr ""
 
-#: build/pack.c:546
+#: build/pack.c:567
 msgid "Unable to reload signature header.\n"
 msgstr ""
 
-#: build/pack.c:554
+#: build/pack.c:575
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:590 lib/psm.c:2149
+#: build/pack.c:611 lib/psm.c:2153
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
 
-#: build/pack.c:605
+#: build/pack.c:626
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr ""
 
-#: build/pack.c:615
+#: build/pack.c:636
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr ""
 
-#: build/pack.c:629
+#: build/pack.c:650
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:639
+#: build/pack.c:660
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr ""
 
-#: build/pack.c:645
+#: build/pack.c:666
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:670 lib/psm.c:2415
+#: build/pack.c:691 lib/psm.c:2419
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:737
+#: build/pack.c:758
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:754
+#: build/pack.c:775
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr ""
@@ -1428,60 +1428,60 @@ msgstr ""
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1248 lib/depends.c:1381
+#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1248 lib/depends.c:1381
+#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:1042
+#: lib/depends.c:1044
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:1153
+#: lib/depends.c:1155
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:1247
+#: lib/depends.c:1249
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1276
+#: lib/depends.c:1278
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1293
+#: lib/depends.c:1295
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:1317
+#: lib/depends.c:1319
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1330
+#: lib/depends.c:1332
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1344
+#: lib/depends.c:1346
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:1360
+#: lib/depends.c:1362
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1381
+#: lib/depends.c:1383
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
@@ -1489,42 +1489,42 @@ msgstr ""
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1454
+#: lib/depends.c:1456
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1533
+#: lib/depends.c:1535
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1786
+#: lib/depends.c:1788
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1936
+#: lib/depends.c:1938
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1996
+#: lib/depends.c:1998
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2046
+#: lib/depends.c:2048
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:2099
+#: lib/depends.c:2101
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:2129
+#: lib/depends.c:2131
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -1710,15 +1710,45 @@ msgstr ""
 msgid "error creating temporary file %s\n"
 msgstr ""
 
-#: lib/package.c:161
+#: lib/package.c:167 lib/package.c:238
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:184
+#: lib/package.c:188 lib/package.c:246
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 
+#: lib/package.c:224 lib/rpmchecksig.c:158 lib/rpmchecksig.c:506
+#, c-format
+msgid "%s: readLead failed\n"
+msgstr ""
+
+#: lib/package.c:230
+#, c-format
+msgid "%s: bad magic\n"
+msgstr ""
+
+#: lib/package.c:254 lib/rpmchecksig.c:176 lib/rpmchecksig.c:522
+#, c-format
+msgid "%s: rpmReadSignature failed\n"
+msgstr ""
+
+#: lib/package.c:258 lib/rpmchecksig.c:180 lib/rpmchecksig.c:527
+#, c-format
+msgid "%s: No signature available\n"
+msgstr ""
+
+#: lib/package.c:284
+#, c-format
+msgid "%s: headerRead failed\n"
+msgstr ""
+
+#: lib/package.c:303 lib/rpmchecksig.c:109 lib/rpmchecksig.c:450
+#, c-format
+msgid "%s: Fread failed: %s\n"
+msgstr ""
+
 #: lib/poptI.c:47
 msgid "exclude paths must begin with a /"
 msgstr ""
@@ -2211,275 +2241,250 @@ msgstr ""
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1214
+#: lib/psm.c:1217
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1325
+#: lib/psm.c:1330
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1432
+#: lib/psm.c:1436
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1600
+#: lib/psm.c:1604
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1607
+#: lib/psm.c:1611
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1954
+#: lib/psm.c:1958
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2071
+#: lib/psm.c:2075
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2186
+#: lib/psm.c:2190
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2195
+#: lib/psm.c:2199
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2236
+#: lib/psm.c:2240
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2237
+#: lib/psm.c:2241
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2423
+#: lib/psm.c:2427
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2426
+#: lib/psm.c:2430
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:128
+#: lib/query.c:124
 #, c-format
 msgid "incorrect format: %s\n"
 msgstr ""
 
-#: lib/query.c:225
+#: lib/query.c:221
 msgid "(contains no files)"
 msgstr ""
 
-#: lib/query.c:286
+#: lib/query.c:282
 msgid "normal        "
 msgstr ""
 
-#: lib/query.c:289
+#: lib/query.c:285
 msgid "replaced      "
 msgstr ""
 
-#: lib/query.c:292
+#: lib/query.c:288
 msgid "not installed "
 msgstr ""
 
-#: lib/query.c:295
+#: lib/query.c:291
 msgid "net shared    "
 msgstr ""
 
-#: lib/query.c:298
+#: lib/query.c:294
 #, c-format
 msgid "(unknown %3d) "
 msgstr ""
 
-#: lib/query.c:303
+#: lib/query.c:299
 msgid "(no state)    "
 msgstr ""
 
-#: lib/query.c:322 lib/query.c:378
+#: lib/query.c:318 lib/query.c:374
 msgid "package has neither file owner or id lists\n"
 msgstr ""
 
-#: lib/query.c:467
+#: lib/query.c:463
 #, c-format
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:582 lib/rpmchecksig.c:159 lib/rpmchecksig.c:492
-#, c-format
-msgid "%s: readLead failed\n"
-msgstr ""
-
-#: lib/query.c:588 lib/rpmchecksig.c:498
-#, c-format
-msgid "%s: No signature available (v1.0 RPM)\n"
-msgstr ""
-
-#: lib/query.c:597 lib/rpmchecksig.c:177 lib/rpmchecksig.c:508
-#, c-format
-msgid "%s: rpmReadSignature failed\n"
-msgstr ""
-
-#: lib/query.c:601 lib/rpmchecksig.c:181 lib/rpmchecksig.c:513
-#, c-format
-msgid "%s: No signature available\n"
-msgstr ""
-
-#: lib/query.c:624
-#, c-format
-msgid "%s: headerRead failed\n"
-msgstr ""
-
-#: lib/query.c:641 lib/rpmchecksig.c:110 lib/rpmchecksig.c:287
-#, c-format
-msgid "%s: Fread failed: %s\n"
-msgstr ""
-
-#: lib/query.c:758 lib/query.c:796 lib/rpminstall.c:324 lib/rpminstall.c:468
-#: lib/rpminstall.c:848
+#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463
+#: lib/rpminstall.c:838
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:774
+#: lib/query.c:616
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:780
+#: lib/query.c:622
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:806 lib/rpminstall.c:481
+#: lib/query.c:648 lib/rpminstall.c:476
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr ""
 
-#: lib/query.c:850
+#: lib/query.c:692
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:874
+#: lib/query.c:716
 msgid "no packages\n"
 msgstr ""
 
-#: lib/query.c:894
+#: lib/query.c:736
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:904
+#: lib/query.c:746
 #, c-format
 msgid "no package triggers %s\n"
 msgstr ""
 
-#: lib/query.c:914
+#: lib/query.c:756
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:925
+#: lib/query.c:767
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:962
+#: lib/query.c:804
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:966
+#: lib/query.c:808
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:993
+#: lib/query.c:835
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:996
+#: lib/query.c:838
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:1001
+#: lib/query.c:843
 #, c-format
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:1012 lib/rpminstall.c:634
+#: lib/query.c:854 lib/rpminstall.c:624
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:50
+#: lib/rpmchecksig.c:49
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:62
+#: lib/rpmchecksig.c:61
 msgid "makeTempFile failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:103
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:164
+#: lib/rpmchecksig.c:163
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:168
+#: lib/rpmchecksig.c:167
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:214
+#: lib/rpmchecksig.c:213
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:220
+#: lib/rpmchecksig.c:219
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:731
+#: lib/rpmchecksig.c:512
+#, c-format
+msgid "%s: No signature available (v1.0 RPM)\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:707
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:732 lib/rpmchecksig.c:746
+#: lib/rpmchecksig.c:708 lib/rpmchecksig.c:722
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:734 lib/rpmchecksig.c:748
+#: lib/rpmchecksig.c:710 lib/rpmchecksig.c:724
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:735 lib/rpmchecksig.c:749
+#: lib/rpmchecksig.c:711 lib/rpmchecksig.c:725
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:737 lib/rpmchecksig.c:751
+#: lib/rpmchecksig.c:713 lib/rpmchecksig.c:727
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:745
+#: lib/rpmchecksig.c:721
 msgid "OK"
 msgstr ""
 
@@ -2491,86 +2496,86 @@ msgstr ""
 msgid "Preparing packages for installation..."
 msgstr ""
 
-#: lib/rpminstall.c:274
+#: lib/rpminstall.c:228
+#, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr ""
+
+#: lib/rpminstall.c:285
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:284
+#: lib/rpminstall.c:295
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:288
+#: lib/rpminstall.c:299
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:370
-#, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr ""
-
-#: lib/rpminstall.c:393
+#: lib/rpminstall.c:388
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:442
+#: lib/rpminstall.c:437
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:448
+#: lib/rpminstall.c:443
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:460 lib/rpminstall.c:705
+#: lib/rpminstall.c:455 lib/rpminstall.c:694
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:496
+#: lib/rpminstall.c:491
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:512
+#: lib/rpminstall.c:507
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:533
+#: lib/rpminstall.c:528
 msgid "installing binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:554
+#: lib/rpminstall.c:549
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:621
+#: lib/rpminstall.c:611
 #, c-format
 msgid "cannot open %s/packages.rpm\n"
 msgstr ""
 
-#: lib/rpminstall.c:637
+#: lib/rpminstall.c:627
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:661
+#: lib/rpminstall.c:651
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:691
+#: lib/rpminstall.c:680
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:697
+#: lib/rpminstall.c:686
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
@@ -2836,17 +2841,17 @@ msgstr ""
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:414
+#: lib/verify.c:417
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:511
+#: lib/verify.c:514
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
 
-#: lib/verify.c:556
+#: lib/verify.c:559
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index ce4f15bfb..285b4d05b 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-24 21:17-0400\n"
+"POT-Creation-Date: 2001-10-26 00:15-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"
@@ -70,15 +70,15 @@ msgstr ""
 msgid "Building for target %s\n"
 msgstr ""
 
-#: rpm2cpio.c:34
+#: rpm2cpio.c:55
 msgid "argument is not an RPM package\n"
 msgstr ""
 
-#: rpm2cpio.c:38
+#: rpm2cpio.c:61
 msgid "error reading header from package\n"
 msgstr ""
 
-#: rpm2cpio.c:60
+#: rpm2cpio.c:83
 #, c-format
 msgid "cannot re-open payload: %s\n"
 msgstr ""
@@ -397,43 +397,43 @@ msgstr ""
 msgid "exec failed\n"
 msgstr ""
 
-#: rpmqv.c:959
+#: rpmqv.c:963
 msgid "no packages files given for rebuild"
 msgstr ""
 
-#: rpmqv.c:1026
+#: rpmqv.c:1038
 msgid "no spec files given for build"
 msgstr ""
 
-#: rpmqv.c:1028
+#: rpmqv.c:1040
 msgid "no tar files given for build"
 msgstr ""
 
-#: rpmqv.c:1047
+#: rpmqv.c:1059
 msgid "no packages given for uninstall"
 msgstr ""
 
-#: rpmqv.c:1058
+#: rpmqv.c:1070
 msgid "no packages given for install"
 msgstr ""
 
-#: rpmqv.c:1106
+#: rpmqv.c:1118
 msgid "no arguments given for query"
 msgstr ""
 
-#: rpmqv.c:1120
+#: rpmqv.c:1132
 msgid "no arguments given for verify"
 msgstr ""
 
-#: rpmqv.c:1128
+#: rpmqv.c:1140
 msgid "unexpected arguments to --querytags "
 msgstr ""
 
-#: rpmqv.c:1144
+#: rpmqv.c:1156
 msgid "no arguments given"
 msgstr ""
 
-#: build/build.c:125 build/pack.c:466
+#: build/build.c:125 build/pack.c:487
 msgid "Unable to open temp file.\n"
 msgstr ""
 
@@ -641,7 +641,7 @@ msgstr ""
 msgid "Could not open %%files file %s: %s\n"
 msgstr ""
 
-#: build/files.c:1777 build/pack.c:145
+#: build/files.c:1777 build/pack.c:148
 #, c-format
 msgid "line: %s\n"
 msgstr ""
@@ -716,152 +716,152 @@ msgstr ""
 msgid "Could not canonicalize hostname: %s\n"
 msgstr ""
 
-#: build/pack.c:78
+#: build/pack.c:81
 #, c-format
 msgid "create archive failed on file %s: %s\n"
 msgstr ""
 
-#: build/pack.c:81
+#: build/pack.c:84
 #, c-format
 msgid "create archive failed: %s\n"
 msgstr ""
 
-#: build/pack.c:103
+#: build/pack.c:106
 #, c-format
 msgid "cpio_copy write failed: %s\n"
 msgstr ""
 
-#: build/pack.c:110
+#: build/pack.c:113
 #, c-format
 msgid "cpio_copy read failed: %s\n"
 msgstr ""
 
-#: build/pack.c:213
+#: build/pack.c:216
 #, c-format
 msgid "Could not open PreIn file: %s\n"
 msgstr ""
 
-#: build/pack.c:220
+#: build/pack.c:223
 #, c-format
 msgid "Could not open PreUn file: %s\n"
 msgstr ""
 
-#: build/pack.c:227
+#: build/pack.c:230
 #, c-format
 msgid "Could not open PostIn file: %s\n"
 msgstr ""
 
-#: build/pack.c:234
+#: build/pack.c:237
 #, c-format
 msgid "Could not open PostUn file: %s\n"
 msgstr ""
 
-#: build/pack.c:242
+#: build/pack.c:245
 #, c-format
 msgid "Could not open VerifyScript file: %s\n"
 msgstr ""
 
-#: build/pack.c:257
+#: build/pack.c:260
 #, c-format
 msgid "Could not open Trigger script file: %s\n"
 msgstr ""
 
-#: build/pack.c:285
+#: build/pack.c:288
 #, c-format
 msgid "readRPM: open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:295
+#: build/pack.c:298
 #, c-format
 msgid "readRPM: read %s: %s\n"
 msgstr ""
 
-#: build/pack.c:304 build/pack.c:508
+#: build/pack.c:307 build/pack.c:529
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr ""
 
-#: build/pack.c:320
+#: build/pack.c:341
 #, c-format
 msgid "readRPM: %s is not an RPM package\n"
 msgstr ""
 
-#: build/pack.c:329
+#: build/pack.c:350
 #, c-format
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:454
+#: build/pack.c:475
 msgid "Unable to create immutable header region.\n"
 msgstr ""
 
-#: build/pack.c:472
+#: build/pack.c:493
 msgid "Unable to write temp header\n"
 msgstr ""
 
-#: build/pack.c:480
+#: build/pack.c:501
 msgid "Bad CSA data\n"
 msgstr ""
 
-#: build/pack.c:515
+#: build/pack.c:536
 msgid "Unable to write final header\n"
 msgstr ""
 
-#: build/pack.c:533
+#: build/pack.c:554
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr ""
 
-#: build/pack.c:546
+#: build/pack.c:567
 msgid "Unable to reload signature header.\n"
 msgstr ""
 
-#: build/pack.c:554
+#: build/pack.c:575
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:590 lib/psm.c:2149
+#: build/pack.c:611 lib/psm.c:2153
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
 
-#: build/pack.c:605
+#: build/pack.c:626
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr ""
 
-#: build/pack.c:615
+#: build/pack.c:636
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr ""
 
-#: build/pack.c:629
+#: build/pack.c:650
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:639
+#: build/pack.c:660
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr ""
 
-#: build/pack.c:645
+#: build/pack.c:666
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:670 lib/psm.c:2415
+#: build/pack.c:691 lib/psm.c:2419
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:737
+#: build/pack.c:758
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:754
+#: build/pack.c:775
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr ""
@@ -1428,60 +1428,60 @@ msgstr ""
 msgid "  %s    A %s\tB %s\n"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1248 lib/depends.c:1381
+#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
 msgid "YES"
 msgstr ""
 
-#: lib/depends.c:585 lib/depends.c:1248 lib/depends.c:1381
+#: lib/depends.c:585 lib/depends.c:1250 lib/depends.c:1383
 msgid "NO "
 msgstr ""
 
-#: lib/depends.c:1042
+#: lib/depends.c:1044
 #, c-format
 msgid "%s: %-45s YES (added files)\n"
 msgstr ""
 
-#: lib/depends.c:1153
+#: lib/depends.c:1155
 #, c-format
 msgid "%s: %-45s YES (added provide)\n"
 msgstr ""
 
-#: lib/depends.c:1247
+#: lib/depends.c:1249
 #, c-format
 msgid "%s: %-45s %-s (cached)\n"
 msgstr ""
 
-#: lib/depends.c:1276
+#: lib/depends.c:1278
 #, c-format
 msgid "%s: %-45s YES (rpmrc provides)\n"
 msgstr ""
 
-#: lib/depends.c:1293
+#: lib/depends.c:1295
 #, c-format
 msgid "%s: %-45s YES (rpmlib provides)\n"
 msgstr ""
 
-#: lib/depends.c:1317
+#: lib/depends.c:1319
 #, c-format
 msgid "%s: %-45s YES (db files)\n"
 msgstr ""
 
-#: lib/depends.c:1330
+#: lib/depends.c:1332
 #, c-format
 msgid "%s: %-45s YES (db provides)\n"
 msgstr ""
 
-#: lib/depends.c:1344
+#: lib/depends.c:1346
 #, c-format
 msgid "%s: %-45s YES (db package)\n"
 msgstr ""
 
-#: lib/depends.c:1360
+#: lib/depends.c:1362
 #, c-format
 msgid "%s: %-45s NO\n"
 msgstr ""
 
-#: lib/depends.c:1381
+#: lib/depends.c:1383
 #, c-format
 msgid "%s: (%s, %s) added to Depends cache.\n"
 msgstr ""
@@ -1489,42 +1489,42 @@ msgstr ""
 #. requirements are satisfied.
 #. @switchbreak@
 #. requirements are not satisfied.
-#: lib/depends.c:1454
+#: lib/depends.c:1456
 #, c-format
 msgid "package %s-%s-%s require not satisfied: %s\n"
 msgstr ""
 
 #. conflicts exist.
-#: lib/depends.c:1533
+#: lib/depends.c:1535
 #, c-format
 msgid "package %s conflicts: %s\n"
 msgstr ""
 
-#: lib/depends.c:1786
+#: lib/depends.c:1788
 #, c-format
 msgid "removing %s-%s-%s \"%s\" from tsort relations.\n"
 msgstr ""
 
 #. Record all relations.
-#: lib/depends.c:1936
+#: lib/depends.c:1938
 msgid "========== recording tsort relations\n"
 msgstr ""
 
 #. T4. Scan for zeroes.
-#: lib/depends.c:1996
+#: lib/depends.c:1998
 msgid ""
 "========== tsorting packages (order, #predecessors, #succesors, depth)\n"
 msgstr ""
 
-#: lib/depends.c:2046
+#: lib/depends.c:2048
 msgid "========== successors only (presentation order)\n"
 msgstr ""
 
-#: lib/depends.c:2099
+#: lib/depends.c:2101
 msgid "LOOP:\n"
 msgstr ""
 
-#: lib/depends.c:2129
+#: lib/depends.c:2131
 msgid "========== continuing tsort ...\n"
 msgstr ""
 
@@ -1710,15 +1710,45 @@ msgstr ""
 msgid "error creating temporary file %s\n"
 msgstr ""
 
-#: lib/package.c:161
+#: lib/package.c:167 lib/package.c:238
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:184
+#: lib/package.c:188 lib/package.c:246
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 
+#: lib/package.c:224 lib/rpmchecksig.c:158 lib/rpmchecksig.c:506
+#, c-format
+msgid "%s: readLead failed\n"
+msgstr ""
+
+#: lib/package.c:230
+#, c-format
+msgid "%s: bad magic\n"
+msgstr ""
+
+#: lib/package.c:254 lib/rpmchecksig.c:176 lib/rpmchecksig.c:522
+#, c-format
+msgid "%s: rpmReadSignature failed\n"
+msgstr ""
+
+#: lib/package.c:258 lib/rpmchecksig.c:180 lib/rpmchecksig.c:527
+#, c-format
+msgid "%s: No signature available\n"
+msgstr ""
+
+#: lib/package.c:284
+#, c-format
+msgid "%s: headerRead failed\n"
+msgstr ""
+
+#: lib/package.c:303 lib/rpmchecksig.c:109 lib/rpmchecksig.c:450
+#, c-format
+msgid "%s: Fread failed: %s\n"
+msgstr ""
+
 #: lib/poptI.c:47
 msgid "exclude paths must begin with a /"
 msgstr ""
@@ -2211,275 +2241,250 @@ msgstr ""
 msgid "cannot write to %%%s %s\n"
 msgstr ""
 
-#: lib/psm.c:1214
+#: lib/psm.c:1217
 msgid "source package expected, binary found\n"
 msgstr ""
 
-#: lib/psm.c:1325
+#: lib/psm.c:1330
 msgid "source package contains no .spec file\n"
 msgstr ""
 
-#: lib/psm.c:1432
+#: lib/psm.c:1436
 #, c-format
 msgid "%s: running %s scriptlet\n"
 msgstr ""
 
-#: lib/psm.c:1600
+#: lib/psm.c:1604
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, waitpid returned %s\n"
 msgstr ""
 
-#: lib/psm.c:1607
+#: lib/psm.c:1611
 #, c-format
 msgid "execution of %s scriptlet from %s-%s-%s failed, exit status %d\n"
 msgstr ""
 
-#: lib/psm.c:1954
+#: lib/psm.c:1958
 #, c-format
 msgid "%s: %s-%s-%s has %d files, test = %d\n"
 msgstr ""
 
-#: lib/psm.c:2071
+#: lib/psm.c:2075
 #, c-format
 msgid "%s: %s scriptlet failed (%d), skipping %s-%s-%s\n"
 msgstr ""
 
-#: lib/psm.c:2186
+#: lib/psm.c:2190
 #, c-format
 msgid "user %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2195
+#: lib/psm.c:2199
 #, c-format
 msgid "group %s does not exist - using root\n"
 msgstr ""
 
-#: lib/psm.c:2236
+#: lib/psm.c:2240
 #, c-format
 msgid "unpacking of archive failed%s%s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2237
+#: lib/psm.c:2241
 msgid " on file "
 msgstr ""
 
-#: lib/psm.c:2423
+#: lib/psm.c:2427
 #, c-format
 msgid "%s failed on file %s: %s\n"
 msgstr ""
 
-#: lib/psm.c:2426
+#: lib/psm.c:2430
 #, c-format
 msgid "%s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:128
+#: lib/query.c:124
 #, c-format
 msgid "incorrect format: %s\n"
 msgstr ""
 
-#: lib/query.c:225
+#: lib/query.c:221
 msgid "(contains no files)"
 msgstr ""
 
-#: lib/query.c:286
+#: lib/query.c:282
 msgid "normal        "
 msgstr ""
 
-#: lib/query.c:289
+#: lib/query.c:285
 msgid "replaced      "
 msgstr ""
 
-#: lib/query.c:292
+#: lib/query.c:288
 msgid "not installed "
 msgstr ""
 
-#: lib/query.c:295
+#: lib/query.c:291
 msgid "net shared    "
 msgstr ""
 
-#: lib/query.c:298
+#: lib/query.c:294
 #, c-format
 msgid "(unknown %3d) "
 msgstr ""
 
-#: lib/query.c:303
+#: lib/query.c:299
 msgid "(no state)    "
 msgstr ""
 
-#: lib/query.c:322 lib/query.c:378
+#: lib/query.c:318 lib/query.c:374
 msgid "package has neither file owner or id lists\n"
 msgstr ""
 
-#: lib/query.c:467
+#: lib/query.c:463
 #, c-format
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:582 lib/rpmchecksig.c:159 lib/rpmchecksig.c:492
-#, c-format
-msgid "%s: readLead failed\n"
-msgstr ""
-
-#: lib/query.c:588 lib/rpmchecksig.c:498
-#, c-format
-msgid "%s: No signature available (v1.0 RPM)\n"
-msgstr ""
-
-#: lib/query.c:597 lib/rpmchecksig.c:177 lib/rpmchecksig.c:508
-#, c-format
-msgid "%s: rpmReadSignature failed\n"
-msgstr ""
-
-#: lib/query.c:601 lib/rpmchecksig.c:181 lib/rpmchecksig.c:513
-#, c-format
-msgid "%s: No signature available\n"
-msgstr ""
-
-#: lib/query.c:624
-#, c-format
-msgid "%s: headerRead failed\n"
-msgstr ""
-
-#: lib/query.c:641 lib/rpmchecksig.c:110 lib/rpmchecksig.c:287
-#, c-format
-msgid "%s: Fread failed: %s\n"
-msgstr ""
-
-#: lib/query.c:758 lib/query.c:796 lib/rpminstall.c:324 lib/rpminstall.c:468
-#: lib/rpminstall.c:848
+#: lib/query.c:600 lib/query.c:638 lib/rpminstall.c:335 lib/rpminstall.c:463
+#: lib/rpminstall.c:838
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:774
+#: lib/query.c:616
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:780
+#: lib/query.c:622
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:806 lib/rpminstall.c:481
+#: lib/query.c:648 lib/rpminstall.c:476
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr ""
 
-#: lib/query.c:850
+#: lib/query.c:692
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:874
+#: lib/query.c:716
 msgid "no packages\n"
 msgstr ""
 
-#: lib/query.c:894
+#: lib/query.c:736
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:904
+#: lib/query.c:746
 #, c-format
 msgid "no package triggers %s\n"
 msgstr ""
 
-#: lib/query.c:914
+#: lib/query.c:756
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:925
+#: lib/query.c:767
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:962
+#: lib/query.c:804
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:966
+#: lib/query.c:808
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:993
+#: lib/query.c:835
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:996
+#: lib/query.c:838
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:1001
+#: lib/query.c:843
 #, c-format
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:1012 lib/rpminstall.c:634
+#: lib/query.c:854 lib/rpminstall.c:624
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:50
+#: lib/rpmchecksig.c:49
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:62
+#: lib/rpmchecksig.c:61
 msgid "makeTempFile failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:103
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:164
+#: lib/rpmchecksig.c:163
 #, c-format
 msgid "%s: Can't sign v1.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:168
+#: lib/rpmchecksig.c:167
 #, c-format
 msgid "%s: Can't re-sign v2.0 RPM\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:214
+#: lib/rpmchecksig.c:213
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:220
+#: lib/rpmchecksig.c:219
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:731
+#: lib/rpmchecksig.c:512
+#, c-format
+msgid "%s: No signature available (v1.0 RPM)\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:707
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:732 lib/rpmchecksig.c:746
+#: lib/rpmchecksig.c:708 lib/rpmchecksig.c:722
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:734 lib/rpmchecksig.c:748
+#: lib/rpmchecksig.c:710 lib/rpmchecksig.c:724
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:735 lib/rpmchecksig.c:749
+#: lib/rpmchecksig.c:711 lib/rpmchecksig.c:725
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:737 lib/rpmchecksig.c:751
+#: lib/rpmchecksig.c:713 lib/rpmchecksig.c:727
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:745
+#: lib/rpmchecksig.c:721
 msgid "OK"
 msgstr ""
 
@@ -2491,86 +2496,86 @@ msgstr ""
 msgid "Preparing packages for installation..."
 msgstr ""
 
-#: lib/rpminstall.c:274
+#: lib/rpminstall.c:228
+#, c-format
+msgid "cannot open Packages database in %s\n"
+msgstr ""
+
+#: lib/rpminstall.c:285
 #, c-format
 msgid "Retrieving %s\n"
 msgstr ""
 
 #. XXX undefined %{name}/%{version}/%{release} here
 #. XXX %{_tmpdir} does not exist
-#: lib/rpminstall.c:284
+#: lib/rpminstall.c:295
 #, c-format
 msgid " ... as %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:288
+#: lib/rpminstall.c:299
 #, c-format
 msgid "skipping %s - transfer failed - %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:370
-#, c-format
-msgid "cannot open Packages database in %s\n"
-msgstr ""
-
-#: lib/rpminstall.c:393
+#: lib/rpminstall.c:388
 #, c-format
 msgid "package %s is not relocateable\n"
 msgstr ""
 
-#: lib/rpminstall.c:442
+#: lib/rpminstall.c:437
 #, c-format
 msgid "error reading from file %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:448
+#: lib/rpminstall.c:443
 #, c-format
 msgid "file %s requires a newer version of RPM\n"
 msgstr ""
 
-#: lib/rpminstall.c:460 lib/rpminstall.c:705
+#: lib/rpminstall.c:455 lib/rpminstall.c:694
 #, c-format
 msgid "%s cannot be installed\n"
 msgstr ""
 
-#: lib/rpminstall.c:496
+#: lib/rpminstall.c:491
 #, c-format
 msgid "found %d source and %d binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:512
+#: lib/rpminstall.c:507
 msgid "failed dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:533
+#: lib/rpminstall.c:528
 msgid "installing binary packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:554
+#: lib/rpminstall.c:549
 #, c-format
 msgid "cannot open file %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:621
+#: lib/rpminstall.c:611
 #, c-format
 msgid "cannot open %s/packages.rpm\n"
 msgstr ""
 
-#: lib/rpminstall.c:637
+#: lib/rpminstall.c:627
 #, c-format
 msgid "\"%s\" specifies multiple packages\n"
 msgstr ""
 
-#: lib/rpminstall.c:661
+#: lib/rpminstall.c:651
 msgid "removing these packages would break dependencies:\n"
 msgstr ""
 
-#: lib/rpminstall.c:691
+#: lib/rpminstall.c:680
 #, c-format
 msgid "cannot open %s: %s\n"
 msgstr ""
 
-#: lib/rpminstall.c:697
+#: lib/rpminstall.c:686
 #, c-format
 msgid "Installing %s\n"
 msgstr ""
@@ -2836,17 +2841,17 @@ msgstr ""
 msgid "package lacks both group name and id lists (this should never happen)\n"
 msgstr ""
 
-#: lib/verify.c:414
+#: lib/verify.c:417
 #, c-format
 msgid "missing    %s"
 msgstr ""
 
-#: lib/verify.c:511
+#: lib/verify.c:514
 #, c-format
 msgid "Unsatisfied dependencies for %s-%s-%s: "
 msgstr ""
 
-#: lib/verify.c:556
+#: lib/verify.c:559
 #, c-format
 msgid "%s-%s-%s: immutable header region digest check failed\n"
 msgstr ""
diff --git a/python/rpmmodule.c b/python/rpmmodule.c
index b1c02a747..8b3985f03 100644
--- a/python/rpmmodule.c
+++ b/python/rpmmodule.c
@@ -115,7 +115,6 @@ static PyObject * pyrpmError;
 struct hdrObject_s {
     PyObject_HEAD;
     Header h;
-    Header sigs;		/* XXX signature tags are in header */
     char ** md5list;
     char ** fileList;
     char ** linkList;
@@ -528,7 +527,6 @@ static PyObject * hdrGetAttr(hdrObject * s, char * name) {
  */
 static void hdrDealloc(hdrObject * s) {
     if (s->h) headerFree(s->h);
-    if (s->sigs) headerFree(s->sigs);
     if (s->md5list) free(s->md5list);
     if (s->fileList) free(s->fileList);
     if (s->linkList) free(s->linkList);
@@ -591,9 +589,7 @@ static PyObject * hdrSubscript(hdrObject * s, PyObject * item) {
             return NULL;
         }
         
-	/* XXX signature tags are appended to header, this API is gonna die */
-        if (!rpmPackageGetEntry(NULL, s->sigs, s->h, tag, &type, &data, &count))
-	{
+        if (!rpmHeaderGetEntry(s->h, tag, &type, &data, &count)) {
             Py_INCREF(Py_None);
             return Py_None;
         }
@@ -787,7 +783,6 @@ rpmdbMINext(rpmdbMIObject * s, PyObject * args) {
 
     ho = PyObject_NEW(hdrObject, &hdrType);
     ho->h = headerLink(h);
-    ho->sigs = NULL;
     ho->fileList = ho->linkList = ho->md5list = NULL;
     ho->uids = ho->gids = ho->mtimes = ho->fileSizes = NULL;
     ho->modes = ho->rdevs = NULL;
@@ -1113,7 +1108,6 @@ rpmdbSubscript(rpmdbObject * s, PyObject * key) {
 
     h = PyObject_NEW(hdrObject, &hdrType);
     h->h = NULL;
-    h->sigs = NULL;
     {	rpmdbMatchIterator mi;
 	mi = rpmdbInitIterator(s->db, RPMDBI_PACKAGES, &offset, sizeof(offset));
 	if ((h->h = rpmdbNextIterator(mi)) != NULL)
@@ -1799,7 +1793,6 @@ static PyObject * findUpgradeSet(PyObject * self, PyObject * args) {
 static PyObject * rpmHeaderFromPackage(PyObject * self, PyObject * args) {
     hdrObject * h;
     Header header;
-    Header sigs;
     FD_t fd;
     int rawFd;
     int isSource = 0;
@@ -1808,7 +1801,7 @@ static PyObject * rpmHeaderFromPackage(PyObject * self, PyObject * args) {
     if (!PyArg_ParseTuple(args, "i", &rawFd)) return NULL;
     fd = fdDup(rawFd);
 
-    rc = rpmReadPackageInfo(fd, &sigs, &header);
+    rc = rpmReadPackageHeader(fd, &header, NULL, NULL, NULL);
     Fclose(fd);
 
     switch (rc) {
@@ -1816,12 +1809,10 @@ static PyObject * rpmHeaderFromPackage(PyObject * self, PyObject * args) {
     case RPMRC_OK:
 	h = (hdrObject *) PyObject_NEW(PyObject, &hdrType);
 	h->h = header;
-	h->sigs = sigs;
 	h->fileList = h->linkList = h->md5list = NULL;
 	h->uids = h->gids = h->mtimes = h->fileSizes = NULL;
 	h->modes = h->rdevs = NULL;
-	if (headerIsEntry(header, RPMTAG_SOURCEPACKAGE))
-	    isSource = 1;
+	isSource = headerIsEntry(header, RPMTAG_SOURCEPACKAGE);
 	break;
 
     case RPMRC_BADMAGIC:
@@ -1868,7 +1859,6 @@ static PyObject * hdrLoad(PyObject * self, PyObject * args) {
 
     h = (hdrObject *) PyObject_NEW(PyObject, &hdrType);
     h->h = hdr;
-    h->sigs = NULL;
     h->fileList = h->linkList = h->md5list = NULL;
     h->uids = h->gids = h->mtimes = h->fileSizes = NULL;
     h->modes = h->rdevs = NULL;
@@ -1924,7 +1914,6 @@ static PyObject * rhnLoad(PyObject * self, PyObject * args) {
 
     h = (hdrObject *) PyObject_NEW(PyObject, &hdrType);
     h->h = hdr;
-    h->sigs = NULL;
     h->fileList = h->linkList = h->md5list = NULL;
     h->uids = h->gids = h->mtimes = h->fileSizes = NULL;
     h->modes = h->rdevs = NULL;
@@ -2020,7 +2009,6 @@ static PyObject * rpmReadHeaders (FD_t fd) {
 	providePackageNVR (header);
 	h = (hdrObject *) PyObject_NEW(PyObject, &hdrType);
 	h->h = header;
-	h->sigs = NULL;
 	h->fileList = h->linkList = h->md5list = NULL;
 	h->uids = h->gids = h->mtimes = h->fileSizes = NULL;
 	h->modes = h->rdevs = NULL;
@@ -2113,12 +2101,10 @@ static int rpmMergeHeaders(PyObject * list, FD_t fd, int matchTag) {
 	    return 1;
 	}
 
-	if (ho->sigs) headerFree(ho->sigs);
 	if (ho->md5list) free(ho->md5list);
 	if (ho->fileList) free(ho->fileList);
 	if (ho->linkList) free(ho->linkList);
 
-	ho->sigs = NULL;
 	ho->md5list = NULL;
 	ho->fileList = NULL;
 	ho->linkList = NULL;
@@ -2311,7 +2297,6 @@ static PyObject * getTsHeader (PyObject * self, PyObject * args) {
     if (transactionSetHeader) {
 	h = (hdrObject *) PyObject_NEW(PyObject, &hdrType);
 	h->h = headerLink(transactionSetHeader);
-	h->sigs = NULL;
 	h->fileList = h->linkList = h->md5list = NULL;
 	h->uids = h->gids = h->mtimes = h->fileSizes = NULL;
 	h->modes = h->rdevs = NULL;
diff --git a/rpm.spec b/rpm.spec
index e5dba23f0..d52bed8dc 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -532,4 +532,5 @@ fi
 - generate an rpm header on the fly for imported pubkeys.
 - wire transactions through rpmcli signature modes.
 - wire transactions through rpmcli query/verify modes.
-- legacy signatures always checked on -qp and -Vp.
+- wire transactions through rpmcli install/erase modes.
+- legacy signatures always checked on package read.
diff --git a/rpm.spec.in b/rpm.spec.in
index 46d5a7e46..3bf22b0d6 100644
--- a/rpm.spec.in
+++ b/rpm.spec.in
@@ -532,4 +532,5 @@ fi
 - generate an rpm header on the fly for imported pubkeys.
 - wire transactions through rpmcli signature modes.
 - wire transactions through rpmcli query/verify modes.
-- legacy signatures always checked on -qp and -Vp.
+- wire transactions through rpmcli install/erase modes.
+- legacy signatures always checked on package read.
diff --git a/rpm2cpio.c b/rpm2cpio.c
index c82d38c67..43025558e 100644
--- a/rpm2cpio.c
+++ b/rpm2cpio.c
@@ -2,7 +2,11 @@
 
 #include "system.h"
 
-#include "rpmlib.h"
+#include <rpmlib.h>
+#include <rpmpgp.h>
+
+#include "depends.c"
+
 #include "debug.h"
 
 int main(int argc, char **argv)
@@ -10,7 +14,7 @@ int main(int argc, char **argv)
     FD_t fdi, fdo;
     Header h;
     char * rpmio_flags;
-    int rc, isSource;
+    rpmRC rc;
     FD_t gzdi;
     
     setprogname(argv[0]);	/* Retrofit glibc __progname */
@@ -26,14 +30,33 @@ int main(int argc, char **argv)
     }
     fdo = fdDup(STDOUT_FILENO);
 
-    rc = rpmReadPackageHeader(fdi, &h, &isSource, NULL, NULL);
+#ifdef	DYING
+    rc = rpmReadPackageHeader(fdi, &h, NULL, NULL, NULL);
+#else
+    {	const char * rootDir = "";
+	rpmdb db = NULL;
+	rpmTransactionSet ts = rpmtransCreateSet(db, rootDir);
+
+	ts->need_payload = 1;
+	/*@-mustmod@*/      /* LCL: segfault */
+	rc = rpmReadPackageFile(ts, fdi, "rpm2cpio", &h);
+	/*@=mustmod@*/
+	ts->need_payload = 0;
+
+	ts = rpmtransFree(ts);
+    }
+#endif
+
     switch (rc) {
-    case 0:
+    case RPMRC_BADSIZE:
+    case RPMRC_OK:
 	break;
-    case 1:
+    case RPMRC_BADMAGIC:
 	fprintf(stderr, _("argument is not an RPM package\n"));
 	exit(EXIT_FAILURE);
 	break;
+    case RPMRC_FAIL:
+    case RPMRC_SHORTREAD:
     default:
 	fprintf(stderr, _("error reading header from package\n"));
 	exit(EXIT_FAILURE);
diff --git a/rpmqv.c b/rpmqv.c
index 0e16f4070..3f5817252 100755
--- a/rpmqv.c
+++ b/rpmqv.c
@@ -951,7 +951,11 @@ int main(int argc, const char ** argv)
 #ifdef	IAM_RPMBT
     case MODE_REBUILD:
     case MODE_RECOMPILE:
-      { const char * pkg;
+    {	const char * pkg;
+	const char * rootDir = "";
+	rpmdb db = NULL;
+	rpmTransactionSet ts = NULL;
+
         while (!rpmIsVerbose())
 	    rpmIncreaseVerbosity();
 
@@ -967,11 +971,17 @@ int main(int argc, const char ** argv)
 	    ba->buildAmount |= RPMBUILD_RMBUILD;
 	}
 
+        if (rpmdbOpen(rootDir, &db, O_RDONLY, 0644)) {
+	    ec = 1;
+	    break;
+	}
+	ts = rpmtransCreateSet(db, rootDir);
+
 	while ((pkg = poptGetArg(optCon))) {
 	    const char * specFile = NULL;
 
 	    ba->cookie = NULL;
-	    ec = rpmInstallSource("", pkg, &specFile, &ba->cookie);
+	    ec = rpmInstallSource(ts, pkg, &specFile, &ba->cookie);
 	    if (ec == 0) {
 		ba->rootdir = rootdir;
 		ba->passPhrase = passPhrase;
@@ -983,11 +993,13 @@ int main(int argc, const char ** argv)
 	    if (ec)
 		/*@loopbreak@*/ break;
 	}
-      }	break;
 
-      case MODE_BUILD:
-      case MODE_TARBUILD:
-      { const char * pkg;
+	ts = rpmtransFree(ts);
+    }	break;
+
+    case MODE_BUILD:
+    case MODE_TARBUILD:
+    {	const char * pkg;
         while (!rpmIsVerbose())
 	    rpmIncreaseVerbosity();
        
@@ -1038,7 +1050,7 @@ int main(int argc, const char ** argv)
 	    rpmFreeMacros(NULL);
 	    (void) rpmReadConfigFiles(rcfile, NULL);
 	}
-      }	break;
+    }	break;
 #endif	/* IAM_RPMBT */
 
 #ifdef	IAM_RPMEIU