- wire --nodigest/--nosignature options to checksig/query/verify modes.

CVS patchset: 5348
CVS date: 2002/03/08 22:24:58

33 files changed, 2303 insertions, 2402 deletions

diff --git a/CHANGES b/CHANGES
index fae5aeb2c..ee6c6f8c4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -92,6 +92,7 @@
 	- add header RSA signature (untested, disabled for now).
 `	- don't bother with signing check if 16 bits of hash don't match.
 	- only V3 signatures for now.
+	- wire --nodigest/--nosignature options to checksig/query/verify modes.
 
 4.0.3 -> 4.0.4:
 	- solaris: translate i86pc to i386 (#57182).
diff --git a/lib/depends.h b/lib/depends.h
index d0b9774fe..94a657525 100644
--- a/lib/depends.h
+++ b/lib/depends.h
@@ -69,13 +69,18 @@ struct rpmTransactionSet_s {
     int orderAlloced;		/*!< No. of allocated transaction elements. */
 
     int chrootDone;		/*!< Has chroot(2) been been done? */
-/*@only@*/ const char * rootDir;/*!< Path to top of install tree. */
-/*@only@*/ const char * currDir;/*!< Current working directory. */
-/*@null@*/ FD_t scriptFd;	/*!< Scriptlet stdout/stderr. */
+/*@only@*/
+    const char * rootDir;	/*!< Path to top of install tree. */
+/*@only@*/
+    const char * currDir;	/*!< Current working directory. */
+/*@null@*/
+    FD_t scriptFd;		/*!< Scriptlet stdout/stderr. */
     int delta;			/*!< Delta for reallocation. */
     int_32 id;			/*!< Transaction id. */
 
     int verify_legacy;		/*!< Verify legacy signatures? */
+    int nodigests;		/*!< Verify digests? */
+    int nosignatures;		/*!< Verify signatures? */
 
 /*@observer@*/ /*@dependent@*/ /*@null@*/
     const char * fn;		/*!< Current package fn. */
diff --git a/lib/package.c b/lib/package.c
index bc234bd42..3e0a7aee2 100644
--- a/lib/package.c
+++ b/lib/package.c
@@ -23,6 +23,9 @@
 /*@access rpmTransactionSet@*/
 /*@access Header@*/		/* XXX compared with NULL */
 
+/*@unchecked@*/
+static int _print_pkts = 0;
+
 void headerMergeLegacySigs(Header h, const Header sig)
 {
     HFD_t hfd = (HFD_t) headerFreeData;
@@ -281,25 +284,45 @@ int rpmReadPackageFile(rpmTransactionSet ts, FD_t fd,
     }
 
     /* Figger the most effective available signature. */
-    if (headerIsEntry(sig, RPMSIGTAG_DSA))
-	ts->sigtag = RPMSIGTAG_DSA;
-    if (headerIsEntry(sig, RPMSIGTAG_RSA))
-	ts->sigtag = RPMSIGTAG_RSA;
-    else if (!ts->verify_legacy)	/* leave fd ready to install payload */
-	ts->sigtag = (headerIsEntry(sig, RPMSIGTAG_SHA1)) ? RPMSIGTAG_SHA1 : 0;
-    else if (headerIsEntry(sig, RPMSIGTAG_GPG)) {
-	ts->sigtag = RPMSIGTAG_GPG;
-	fdInitDigest(fd, PGPHASHALGO_SHA1, 0);
-    } else if (headerIsEntry(sig, RPMSIGTAG_PGP)) {
-	ts->sigtag = RPMSIGTAG_PGP;
-	fdInitDigest(fd, PGPHASHALGO_MD5, 0);
-    } else if (headerIsEntry(sig, RPMSIGTAG_SHA1)) {
-	ts->sigtag = RPMSIGTAG_SHA1;	/* XXX never happens */
-    } else if (headerIsEntry(sig, RPMSIGTAG_MD5)) {
-	ts->sigtag = RPMSIGTAG_MD5;
-	fdInitDigest(fd, PGPHASHALGO_MD5, 0);
-    } else
-	ts->sigtag = 0;			/* XXX never happens */
+    ts->sigtag = 0;
+    if (ts->verify_legacy) {
+	if (ts->sigtag == 0 && !ts->nosignatures) {
+	    if (headerIsEntry(sig, RPMSIGTAG_DSA))
+		ts->sigtag = RPMSIGTAG_DSA;
+	    else if (headerIsEntry(sig, RPMSIGTAG_RSA))
+		ts->sigtag = RPMSIGTAG_RSA;
+	    else if (headerIsEntry(sig, RPMSIGTAG_GPG)) {
+		ts->sigtag = RPMSIGTAG_GPG;
+		fdInitDigest(fd, PGPHASHALGO_SHA1, 0);
+	    } else if (headerIsEntry(sig, RPMSIGTAG_PGP)) {
+		ts->sigtag = RPMSIGTAG_PGP;
+		fdInitDigest(fd, PGPHASHALGO_MD5, 0);
+	    }
+	}
+	if (ts->sigtag == 0 && !ts->nodigests) {
+	    if (headerIsEntry(sig, RPMSIGTAG_SHA1))
+		ts->sigtag = RPMSIGTAG_SHA1;
+	    else if (headerIsEntry(sig, RPMSIGTAG_MD5)) {
+		ts->sigtag = RPMSIGTAG_MD5;
+		fdInitDigest(fd, PGPHASHALGO_MD5, 0);
+	    }
+	}
+    } else {
+	if (ts->sigtag == 0 && !ts->nosignatures) {
+	    if (headerIsEntry(sig, RPMSIGTAG_DSA))
+		ts->sigtag = RPMSIGTAG_DSA;
+	    else if (headerIsEntry(sig, RPMSIGTAG_RSA))
+		ts->sigtag = RPMSIGTAG_RSA;
+	}
+	if (ts->sigtag == 0 && !ts->nodigests) {
+	    if (headerIsEntry(sig, RPMSIGTAG_SHA1))
+		ts->sigtag = RPMSIGTAG_SHA1;
+	}
+    }
+
+#if 0
+fprintf(stderr, "*** RPF: legacy %d nodigests %d nosignatures %d sigtag %d\n", ts->verify_legacy, ts->nodigests, ts->nosignatures, ts->sigtag);
+#endif
 
     /* Read the metadata, computing digest(s) on the fly. */
     hmagic = ((l->major >= 3) ? HEADER_MAGIC_YES : HEADER_MAGIC_NO);
@@ -335,8 +358,8 @@ int rpmReadPackageFile(rpmTransactionSet ts, FD_t fd,
     switch (ts->sigtag) {
     case RPMSIGTAG_RSA:
 	/* Parse the parameters from the OpenPGP packets that will be needed. */
-rpmMessage(RPMMESS_DEBUG, _("========== Header RSA signature\n"));
-	xx = pgpPrtPkts(ts->sig, ts->siglen, ts->dig, rpmIsDebug());
+	xx = pgpPrtPkts(ts->sig, ts->siglen, ts->dig,
+			(_print_pkts & rpmIsDebug()));
 	/* XXX only V3 signatures for now. */
 	if (ts->dig->signature.version != 3) {
 	    rpmMessage(RPMMESS_WARNING,
@@ -345,7 +368,6 @@ rpmMessage(RPMMESS_DEBUG, _("========== Header RSA signature\n"));
 	    rc = RPMRC_OK;
 	    goto exit;
 	}
-	/*@fallthrough@*/
     {	void * uh = NULL;
 	int_32 uht;
 	int_32 uhc;
@@ -363,8 +385,8 @@ rpmMessage(RPMMESS_DEBUG, _("========== Header RSA signature\n"));
     }	break;
     case RPMSIGTAG_DSA:
 	/* Parse the parameters from the OpenPGP packets that will be needed. */
-rpmMessage(RPMMESS_DEBUG, _("========== Header DSA signature\n"));
-	xx = pgpPrtPkts(ts->sig, ts->siglen, ts->dig, rpmIsDebug());
+	xx = pgpPrtPkts(ts->sig, ts->siglen, ts->dig,
+			(_print_pkts & rpmIsDebug()));
 	/* XXX only V3 signatures for now. */
 	if (ts->dig->signature.version != 3) {
 	    rpmMessage(RPMMESS_WARNING,
@@ -394,8 +416,8 @@ rpmMessage(RPMMESS_DEBUG, _("========== Header DSA signature\n"));
     case RPMSIGTAG_PGP5:	/* XXX legacy */
     case RPMSIGTAG_PGP:
 	/* Parse the parameters from the OpenPGP packets that will be needed. */
-rpmMessage(RPMMESS_DEBUG, _("========== Package DSA/RSA signature\n"));
-	xx = pgpPrtPkts(ts->sig, ts->siglen, ts->dig, rpmIsDebug());
+	xx = pgpPrtPkts(ts->sig, ts->siglen, ts->dig,
+			(_print_pkts & rpmIsDebug()));
 
 	/* XXX only V3 signatures for now. */
 	if (ts->dig->signature.version != 3) {
diff --git a/lib/poptQV.c b/lib/poptQV.c
index 3410baa33..cbfa2edeb 100644
--- a/lib/poptQV.c
+++ b/lib/poptQV.c
@@ -270,16 +270,13 @@ struct poptOption rpmVerifyPoptTable[] = {
  { "noscripts", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN,
 	&rpmQVKArgs.qva_flags, VERIFY_SCRIPT,
         N_("don't execute verify script(s)"), NULL },
- { "nodigest", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN,
+ { "nodigest", '\0', POPT_BIT_SET,
 	&rpmQVKArgs.qva_flags, VERIFY_DIGEST,
         N_("don't verify digest(s)"), NULL },
- { "nosignature", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN,
+ { "nosignature", '\0', POPT_BIT_SET,
 	&rpmQVKArgs.qva_flags, VERIFY_SIGNATURE,
         N_("don't verify signature(s)"), NULL },
 
-/** @todo Add --nomd5 alias to rpmpopt, eliminate. */
- { "nomd5", '\0', POPT_BIT_SET, &rpmQVKArgs.qva_flags, VERIFY_MD5,
-	N_("don't verify MD5 digest of files"), NULL },
 /** @todo Add --nogpg/--nopgp aliases to rpmpopt, eliminate. */
  { "nogpg", '\0', POPT_BIT_SET,
 	&rpmQVKArgs.qva_flags, VERIFY_SIGNATURE,
@@ -301,26 +298,22 @@ struct poptOption rpmSignPoptTable[] = {
 	rpmQVSourceArgCallback, 0, NULL, NULL },
 /*@=type@*/
  { "addsign", '\0', 0, NULL, 'A',
-	N_("sign a package, preserving other existing signatures"), NULL },
+	N_("sign a package, preserving digests"), NULL },
  { "checksig", 'K', POPT_ARGFLAG_DOC_HIDDEN, NULL, 'K',
 	N_("verify package signature(s)"), NULL },
  { "import", '\0', POPT_ARGFLAG_DOC_HIDDEN, NULL, 'I',
 	N_("import an armored public key"), NULL },
  { "resign", '\0', 0, NULL, 'R',
-	N_("sign a package, discarding all current signatures"), NULL },
+	N_("sign a package, recomputing digests"), NULL },
  { "sign", '\0', POPT_ARGFLAG_DOC_HIDDEN, &rpmQVKArgs.sign, 0,
 	N_("generate signature"), NULL },
 
-/** @todo Add --nomd5 alias to rpmpopt, eliminate. */
- { "nomd5", '\0', POPT_BIT_SET, &rpmQVKArgs.qva_flags, VERIFY_MD5,
-	N_("don't verify MD5 digest of files"), NULL },
-/** @todo Add --nogpg/--nopgp aliases to rpmpopt, eliminate. */
- { "nogpg", '\0', POPT_BIT_SET,
-	&rpmQVKArgs.qva_flags, VERIFY_SIGNATURE,
-        N_("don't verify GPG V3 DSA signature(s)"), NULL },
- { "nopgp", '\0', POPT_BIT_SET,
+ { "nodigest", '\0', POPT_BIT_SET,
+	&rpmQVKArgs.qva_flags, VERIFY_DIGEST,
+        N_("don't verify digest(s)"), NULL },
+ { "nosignature", '\0', POPT_BIT_SET,
 	&rpmQVKArgs.qva_flags, VERIFY_SIGNATURE,
-        N_("don't verify PGP V3 RSA/MD5 signature(s)"), NULL },
+        N_("don't verify signature(s)"), NULL },
 
    POPT_TABLEEND
 };
diff --git a/lib/query.c b/lib/query.c
index 09f0875e9..58e5445e2 100644
--- a/lib/query.c
+++ b/lib/query.c
@@ -157,8 +157,6 @@ int showQueryPackage(QVA_t qva, /*@unused@*/ rpmTransactionSet ts, Header h)
     HGE_t hge = (HGE_t)headerGetEntryMinMemory;
     HFD_t hfd = headerFreeData;
     char * t, * te;
-    rpmQueryFlags queryFlags = qva->qva_flags;
-    const char * queryFormat = qva->qva_queryFormat;
     rpmTagType type;
     int_32 count;
     char * prefix = NULL;
@@ -185,7 +183,8 @@ int showQueryPackage(QVA_t qva, /*@unused@*/ rpmTransactionSet ts, Header h)
     te = t = xmalloc(BUFSIZ);
     *te = '\0';
 
-    if (queryFormat == NULL && queryFlags == QUERY_FOR_DEFAULT) {
+    if (!(qva->qva_flags & _QUERY_FOR_BITS) && qva->qva_queryFormat == NULL)
+    {
 	const char * name, * version, * release;
 	(void) headerNVR(h, &name, &version, &release);
 	te = stpcpy(te, name);
@@ -194,8 +193,8 @@ int showQueryPackage(QVA_t qva, /*@unused@*/ rpmTransactionSet ts, Header h)
 	goto exit;
     }
 
-    if (queryFormat) {
-	const char * str = queryHeader(h, queryFormat);
+    if (qva->qva_queryFormat != NULL) {
+	const char * str = queryHeader(h, qva->qva_queryFormat);
 	nonewline = 1;
 	/*@-branchstate@*/
 	if (str) {
@@ -214,7 +213,7 @@ int showQueryPackage(QVA_t qva, /*@unused@*/ rpmTransactionSet ts, Header h)
 	/*@=branchstate@*/
     }
 
-    if (!(queryFlags & QUERY_FOR_LIST))
+    if (!(qva->qva_flags & QUERY_FOR_LIST))
 	goto exit;
 
     if (!hge(h, RPMTAG_BASENAMES, &bnt, (void **) &baseNames, &count)) {
@@ -255,12 +254,12 @@ int showQueryPackage(QVA_t qva, /*@unused@*/ rpmTransactionSet ts, Header h)
     for (i = 0; i < count; i++) {
 
 	/* If querying only docs, skip non-doc files. */
-	if ((queryFlags & QUERY_FOR_DOCS)
+	if ((qva->qva_flags & QUERY_FOR_DOCS)
 	  && !(fileFlagsList[i] & RPMFILE_DOC))
 	    continue;
 
 	/* If querying only configs, skip non-config files. */
-	if ((queryFlags & QUERY_FOR_CONFIG)
+	if ((qva->qva_flags & QUERY_FOR_CONFIG)
 	  && !(fileFlagsList[i] & RPMFILE_CONFIG))
 	    continue;
 
@@ -274,7 +273,7 @@ int showQueryPackage(QVA_t qva, /*@unused@*/ rpmTransactionSet ts, Header h)
 	    te = stpcpy(te, prefix);
 	/*@=internalglobs@*/
 
-	if (queryFlags & QUERY_FOR_STATE) {
+	if (qva->qva_flags & QUERY_FOR_STATE) {
 	    if (fileStatesList) {
 		rpmfileState fstate = fileStatesList[i];
 		switch (fstate) {
@@ -300,7 +299,7 @@ int showQueryPackage(QVA_t qva, /*@unused@*/ rpmTransactionSet ts, Header h)
 	    }
 	}
 
-	if (queryFlags & QUERY_FOR_DUMPFILES) {
+	if (qva->qva_flags & QUERY_FOR_DUMPFILES) {
 	    sprintf(te, "%s%s %d %d %s 0%o ", 
 				   dirNames[dirIndexes[i]], baseNames[i],
 				   fileSizeList[i], fileMTimeList[i],
@@ -985,6 +984,9 @@ int rpmcliQuery(rpmTransactionSet ts, QVA_t qva, const char ** argv)
 	break;
     }
 
+    ts->nodigests = (qva->qva_flags & VERIFY_DIGEST);
+    ts->nosignatures = (qva->qva_flags & VERIFY_SIGNATURE);
+
     if (qva->qva_source == RPMQV_ALL) {
 	/*@-nullpass@*/ /* FIX: argv can be NULL, cast to pass argv array */
 	ec = rpmQueryVerify(qva, ts, (const char *) argv);
diff --git a/lib/rpmchecksig.c b/lib/rpmchecksig.c
index df152cf8a..2a977bdf4 100644
--- a/lib/rpmchecksig.c
+++ b/lib/rpmchecksig.c
@@ -21,6 +21,9 @@
 /*@access FD_t @*/
 /*@access pgpDig @*/
 
+/*@unchecked@*/
+static int _print_pkts = 0;
+
 /**
  */
 static int manageFile(FD_t *fdp, const char **fnp, int flags,
@@ -224,6 +227,8 @@ static int rpmReSign(/*@unused@*/ rpmTransactionSet ts,
 
 	/* Reallocate the signature into one contiguous region. */
 	sig = headerReload(sig, RPMTAG_HEADERSIGNATURES);
+	if (sig == NULL)	/* XXX can't happen */
+	    goto exit;
 
 	/* Write the lead/signature of the output rpm */
 	strcpy(tmprpm, rpm);
@@ -443,7 +448,7 @@ static unsigned char header_magic[8] = {
 /**
  * @todo If the GPG key was known available, the md5 digest could be skipped.
  */
-static int readFile(FD_t fd, int_32 sigtag, const char * fn, pgpDig dig)
+static int readFile(FD_t fd, const char * fn, pgpDig dig)
 	/*@globals fileSystem, internalState @*/
 	/*@modifies fd, *dig,
 		fileSystem, internalState @*/
@@ -534,6 +539,8 @@ int rpmVerifySignatures(QVA_t qva, rpmTransactionSet ts, FD_t fd,
     int res = 0;
     int xx;
     rpmRC rc;
+    int nodigests = !(qva->qva_flags & VERIFY_DIGEST);
+    int nosignatures = !(qva->qva_flags & VERIFY_SIGNATURE);
 
     {
 	memset(l, 0, sizeof(*l));
@@ -565,20 +572,23 @@ int rpmVerifySignatures(QVA_t qva, rpmTransactionSet ts, FD_t fd,
 	}
 
 	/* Grab a hint of what needs doing to avoid duplication. */
-	if (headerIsEntry(sig, RPMSIGTAG_DSA))
-	    sigtag = RPMSIGTAG_DSA;
-	else if (headerIsEntry(sig, RPMSIGTAG_RSA))
-	    sigtag = RPMSIGTAG_RSA;
-	else 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 if (headerIsEntry(sig, RPMSIGTAG_SHA1))
-	    sigtag = RPMSIGTAG_SHA1;	/* XXX never happens */
-	else
-	    sigtag = 0;			/* XXX never happens */
+	sigtag = 0;
+	if (sigtag == 0 && !nosignatures) {
+	    if (headerIsEntry(sig, RPMSIGTAG_DSA))
+		sigtag = RPMSIGTAG_DSA;
+	    else if (headerIsEntry(sig, RPMSIGTAG_RSA))
+		sigtag = RPMSIGTAG_RSA;
+	    else if (headerIsEntry(sig, RPMSIGTAG_GPG))
+		sigtag = RPMSIGTAG_GPG;
+	    else if (headerIsEntry(sig, RPMSIGTAG_PGP))
+		sigtag = RPMSIGTAG_PGP;
+	}
+	if (sigtag == 0 && !nodigests) {
+	    if (headerIsEntry(sig, RPMSIGTAG_MD5))
+		sigtag = RPMSIGTAG_MD5;
+	    else if (headerIsEntry(sig, RPMSIGTAG_SHA1))
+		sigtag = RPMSIGTAG_SHA1;	/* XXX never happens */
+	}
 
 	if (headerIsEntry(sig, RPMSIGTAG_PGP)
 	||  headerIsEntry(sig, RPMSIGTAG_PGP5)
@@ -591,7 +601,7 @@ int rpmVerifySignatures(QVA_t qva, rpmTransactionSet ts, FD_t fd,
 
 	/* Read the file, generating digest(s) on the fly. */
 	/*@-mods@*/ /* FIX: double indirection */
-	if (readFile(fd, sigtag, fn, ts->dig)) {
+	if (readFile(fd, fn, ts->dig)) {
 	    res++;
 	    goto bottom;
 	}
@@ -621,9 +631,10 @@ int rpmVerifySignatures(QVA_t qva, rpmTransactionSet ts, FD_t fd,
 	    case RPMSIGTAG_GPG:
 	    case RPMSIGTAG_PGP5:	/* XXX legacy */
 	    case RPMSIGTAG_PGP:
-		if (!(qva->qva_flags & VERIFY_SIGNATURE)) 
+		if (nosignatures)
 		     continue;
-		xx = pgpPrtPkts(ts->sig, ts->siglen, ts->dig, rpmIsDebug());
+		xx = pgpPrtPkts(ts->sig, ts->siglen, ts->dig,
+			(_print_pkts & rpmIsDebug()));
 
 		/* XXX only V3 signatures for now. */
 		if (ts->dig->signature.version != 3) {
@@ -634,22 +645,22 @@ int rpmVerifySignatures(QVA_t qva, rpmTransactionSet ts, FD_t fd,
 		}
 		/*@switchbreak@*/ break;
 	    case RPMSIGTAG_SHA1:
-		if (!(qva->qva_flags & VERIFY_DIGEST)) 
+		if (nodigests)
 		     continue;
 		/* XXX Don't bother with header sha1 if header dsa. */
-		if (sigtag == RPMSIGTAG_DSA)
+		if (!nosignatures && sigtag == RPMSIGTAG_DSA)
 		    continue;
 		/*@switchbreak@*/ break;
 	    case RPMSIGTAG_LEMD5_2:
 	    case RPMSIGTAG_LEMD5_1:
 	    case RPMSIGTAG_MD5:
-		if (!(qva->qva_flags & VERIFY_DIGEST)) 
+		if (nodigests)
 		     continue;
 		/*
 		 * Don't bother with md5 if pgp, as RSA/MD5 is more reliable
 		 * than the -- now unsupported -- legacy md5 breakage.
 		 */
-		if (sigtag == RPMSIGTAG_PGP)
+		if (!nosignatures && sigtag == RPMSIGTAG_PGP)
 		    continue;
 		/*@switchbreak@*/ break;
 	    default:
@@ -670,6 +681,10 @@ int rpmVerifySignatures(QVA_t qva, rpmTransactionSet ts, FD_t fd,
 			b = stpcpy(b, "SIZE ");
 			res2 = 1;
 			/*@switchbreak@*/ break;
+		    case RPMSIGTAG_SHA1:
+			b = stpcpy(b, "SHA1 ");
+			res2 = 1;
+			/*@switchbreak@*/ break;
 		    case RPMSIGTAG_LEMD5_2:
 		    case RPMSIGTAG_LEMD5_1:
 		    case RPMSIGTAG_MD5:
@@ -677,6 +692,9 @@ int rpmVerifySignatures(QVA_t qva, rpmTransactionSet ts, FD_t fd,
 			res2 = 1;
 			/*@switchbreak@*/ break;
 		    case RPMSIGTAG_RSA:
+			b = stpcpy(b, "RSA ");
+			res2 = 1;
+			/*@switchbreak@*/ break;
 		    case RPMSIGTAG_PGP5:	/* XXX legacy */
 		    case RPMSIGTAG_PGP:
 			switch (res3) {
@@ -685,7 +703,7 @@ int rpmVerifySignatures(QVA_t qva, rpmTransactionSet ts, FD_t fd,
 			    /*@fallthrough@*/
 			case RPMSIG_NOTTRUSTED:
 			{   int offset = 6;
-			    b = stpcpy(b, "(PGP) ");
+			    b = stpcpy(b, "(MD5) (PGP) ");
 			    tempKey = strstr(result, "ey ID");
 			    if (tempKey == NULL) {
 			        tempKey = strstr(result, "keyid:");
@@ -702,12 +720,15 @@ int rpmVerifySignatures(QVA_t qva, rpmTransactionSet ts, FD_t fd,
 			    }
 			}   /*@innerbreak@*/ break;
 			default:
-			    b = stpcpy(b, "PGP ");
+			    b = stpcpy(b, "MD5 PGP ");
 			    res2 = 1;
 			    /*@innerbreak@*/ break;
 			}
 			/*@switchbreak@*/ break;
 		    case RPMSIGTAG_DSA:
+			b = stpcpy(b, "(SHA1) DSA ");
+			res2 = 1;
+			/*@switchbreak@*/ break;
 		    case RPMSIGTAG_GPG:
 			/* Do not consider this a failure */
 			switch (res3) {
@@ -740,17 +761,24 @@ int rpmVerifySignatures(QVA_t qva, rpmTransactionSet ts, FD_t fd,
 		    case RPMSIGTAG_SIZE:
 			b = stpcpy(b, "size ");
 			/*@switchbreak@*/ break;
+		    case RPMSIGTAG_SHA1:
+			b = stpcpy(b, "sha1 ");
+			/*@switchbreak@*/ break;
 		    case RPMSIGTAG_LEMD5_2:
 		    case RPMSIGTAG_LEMD5_1:
 		    case RPMSIGTAG_MD5:
 			b = stpcpy(b, "md5 ");
 			/*@switchbreak@*/ break;
 		    case RPMSIGTAG_RSA:
+			b = stpcpy(b, "rsa ");
+			/*@switchbreak@*/ break;
 		    case RPMSIGTAG_PGP5:	/* XXX legacy */
 		    case RPMSIGTAG_PGP:
-			b = stpcpy(b, "pgp ");
+			b = stpcpy(b, "(md5) pgp ");
 			/*@switchbreak@*/ break;
 		    case RPMSIGTAG_DSA:
+			b = stpcpy(b, "(sha1) dsa ");
+			/*@switchbreak@*/ break;
 		    case RPMSIGTAG_GPG:
 			b = stpcpy(b, "gpg ");
 			/*@switchbreak@*/ break;
diff --git a/lib/rpmcli.h b/lib/rpmcli.h
index f25ffcedf..6b7c74284 100644
--- a/lib/rpmcli.h
+++ b/lib/rpmcli.h
@@ -144,6 +144,10 @@ typedef enum rpmQueryFlags_e {
     QUERY_FOR_DUMPFILES	= (1 << 27)	/*!< query:  from --dump */
 } rpmQueryFlags;
 
+#define	_QUERY_FOR_BITS	\
+   (QUERY_FOR_LIST|QUERY_FOR_STATE|QUERY_FOR_DOCS|QUERY_FOR_CONFIG|\
+    QUERY_FOR_DUMPFILES)
+
 /** \ingroup rpmcli
  * Bit(s) to control rpmVerify() operation, stored in qva_flags.
  * @todo Merge rpmQueryFlags, rpmVerifyFlags, and rpmVerifyAttrs values?.
@@ -354,11 +358,12 @@ int showVerifyPackage(QVA_t qva, rpmTransactionSet ts, Header h)
 
 /**
  * Check original header digest.
- * @todo Make digest check part of rpmdb iterator.
- * @todo Wire transaction set here, python bindings prevent.
+ * @deprecated Remove.
+ * @todo Make digest/signature check part of rpmdb iterator.
  * @param h		header
  * @return		0 on success (or unavailable), 1 on digest mismatch
  */
+/*@unused@*/
 int rpmVerifyDigest(Header h)
 	/*@modifies nothing @*/;
 
diff --git a/lib/signature.c b/lib/signature.c
index 7e7bf3c77..775eba62c 100644
--- a/lib/signature.c
+++ b/lib/signature.c
@@ -19,6 +19,7 @@
 /*@access rpmTransactionSet@*/
 /*@access Header@*/		/* XXX compared with NULL */
 /*@access FD_t@*/		/* XXX compared with NULL */
+/*@access DIGEST_CTX@*/		/* XXX compared with NULL */
 /*@access pgpDig@*/
 
 /*@-mustmod@*/ /* FIX: internalState not modified? */
@@ -852,7 +853,9 @@ verifyMD5Signature(const rpmTransactionSet ts, /*@out@*/ char * t,
     }
 
 if (md5ctx == NULL) {
+/*@-modfilesys@*/
 fprintf(stderr, "*** MD5 md5ctx %p\n", md5ctx);
+/*@=modfilesys@*/
 res = RPMSIG_NOKEY;
 t = stpcpy(t, rpmSigString(res));
 goto exit;
@@ -909,7 +912,9 @@ verifySHA1Signature(const rpmTransactionSet ts, /*@out@*/ char * t,
     }
 
 if (sha1ctx == NULL) {
+/*@-modfilesys@*/
 fprintf(stderr, "*** SHA1 sha1ctx %p\n", sha1ctx);
+/*@=modfilesys@*/
 res = RPMSIG_NOKEY;
 t = stpcpy(t, rpmSigString(res));
 goto exit;
@@ -973,8 +978,10 @@ rpmtsFindPubkey(rpmTransactionSet ts)
 	pkpktlen = 0;
 	memset(pksignid, 0, sizeof(pksignid));
 
+	/* Make sure the database is open. */
 	(void) rpmtsOpenDB(ts, ts->dbmode);
 
+	/* Retrieve the pubkey that matches the signature. */
 	mi = rpmtsInitIterator(ts, RPMTAG_PUBKEYS, sigp->signid, sizeof(sigp->signid));
 	while ((h = rpmdbNextIterator(mi)) != NULL) {
 	    const char ** pubkeys;
@@ -991,13 +998,25 @@ rpmtsFindPubkey(rpmTransactionSet ts)
 	}
 	mi = rpmdbFreeIterator(mi);
 
+	/* Was a matching pubkey found? */
 	if (ix < 0 || pkpkt == NULL) {
 	    res = RPMSIG_NOKEY;
 	    goto exit;
 	}
 
-	/* Make sure the pkt can be parsed, print info if debugging. */
-	if (pgpPrtPkts(pkpkt, pkpktlen, NULL, 0)) {
+	/*
+	 * Can the pubkey packets be parsed?
+	 * Do the parameters match the signature?
+	 */
+	if (pgpPrtPkts(pkpkt, pkpktlen, NULL, 0)
+	 && ts->dig->signature.pubkey_algo == ts->dig->pubkey.pubkey_algo
+#ifdef	NOTYET
+	 && ts->dig->signature.hash_algo == ts->dig->pubkey.hash_algo
+#endif
+	 && !memcmp(ts->dig->signature.signid, ts->dig->pubkey.signid, 8))
+	{
+	    pkpkt = _free(pkpkt);
+	    pkpktlen = 0;
 	    res = RPMSIG_NOKEY;
 	    goto exit;
 	}
@@ -1006,6 +1025,12 @@ rpmtsFindPubkey(rpmTransactionSet ts)
 
 	/* Packet looks good, save the signer id. */
 	memcpy(pksignid, sigp->signid, sizeof(pksignid));
+
+	rpmMessage(RPMMESS_DEBUG, "========== %s pubkey id %s\n",
+		(sigp->pubkey_algo == PGPPUBKEYALGO_DSA ? "DSA" :
+		(sigp->pubkey_algo == PGPPUBKEYALGO_RSA ? "RSA" : "???")),
+		pgpHexStr(sigp->signid, sizeof(sigp->signid)));
+
     }
 
 #ifdef	NOTNOW
@@ -1022,16 +1047,11 @@ rpmtsFindPubkey(rpmTransactionSet ts)
     }
 #endif
 
-    rpmMessage(RPMMESS_DEBUG, "========== %s pubkey id %s\n",
-    	(sigp->pubkey_algo == PGPPUBKEYALGO_DSA ? "DSA" :
-    	(sigp->pubkey_algo == PGPPUBKEYALGO_RSA ? "RSA" : "???")),
-	pgpHexStr(sigp->signid, sizeof(sigp->signid)));
-
     /* Retrieve parameters from pubkey packet(s). */
     xx = pgpPrtPkts(pkpkt, pkpktlen, ts->dig, 0);
     /*@=globs =internalglobs =mods =modfilesys@*/
 
-    /* Make sure we have the correct public key. */
+    /* Do the parameters match the signature? */
     if (ts->dig->signature.pubkey_algo == ts->dig->pubkey.pubkey_algo
 #ifdef	NOTYET
      && ts->dig->signature.hash_algo == ts->dig->pubkey.hash_algo
@@ -1097,7 +1117,9 @@ verifyPGPSignature(rpmTransactionSet ts, /*@out@*/ char * t, DIGEST_CTX md5ctx)
     }
 
 if (md5ctx == NULL) {
+/*@-modfilesys@*/
 fprintf(stderr, "*** RSA md5ctx %p\n", md5ctx);
+/*@=modfilesys@*/
 res = RPMSIG_NOKEY;
 goto exit;
 }
@@ -1215,7 +1237,9 @@ verifyGPGSignature(rpmTransactionSet ts, /*@out@*/ char * t, DIGEST_CTX sha1ctx)
     }
 
 if (sha1ctx == NULL) {
+/*@-modfilesys@*/
 fprintf(stderr, "*** DSA sha1ctx %p\n", sha1ctx);
+/*@=modfilesys@*/
 res = RPMSIG_NOKEY;
 goto exit;
 }
diff --git a/lib/verify.c b/lib/verify.c
index c3f544bf1..85ed86a5d 100644
--- a/lib/verify.c
+++ b/lib/verify.c
@@ -534,8 +534,8 @@ int showVerifyPackage(QVA_t qva, rpmTransactionSet ts, Header h)
     int ec = 0;
     int rc;
 
+#ifdef	DYING
     if (qva->qva_flags & VERIFY_DIGEST) {
-	/* XXX Wire transaction set here, python bindings prevent. */
 	if ((rc = rpmVerifyDigest(h)) != 0) {
 	    const char *n, *v, *r;
 	    (void) headerNVR(h, &n, &v, &r);
@@ -545,6 +545,7 @@ int showVerifyPackage(QVA_t qva, rpmTransactionSet ts, Header h)
 	    ec = rc;
 	}
     }
+#endif
     if (qva->qva_flags & VERIFY_DEPS) {
 	if ((rc = verifyDependencies(qva, ts, h)) != 0)
 	    ec = rc;
@@ -584,6 +585,10 @@ int rpmcliVerify(rpmTransactionSet ts, QVA_t qva, const char ** argv)
 	break;
     }
 
+    /* XXX verifyFlags are inverted */
+    ts->nodigests = (qva->qva_flags & VERIFY_DIGEST);
+    ts->nosignatures = (qva->qva_flags & VERIFY_SIGNATURE);
+
     if (qva->qva_source == RPMQV_ALL) {
 	/*@-nullpass@*/ /* FIX: argv can be NULL, cast to pass argv array */
 	ec = rpmQueryVerify(qva, ts, (const char *) argv);
diff --git a/po/cs.po b/po/cs.po
index 2bfd9e902..65c8d190f 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-03-07 17:53-0500\n"
+"POT-Creation-Date: 2002-03-08 17:22-0500\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"
@@ -1621,61 +1621,46 @@ msgstr "%s vytvoøen jako %s\n"
 msgid "error creating temporary file %s\n"
 msgstr "chyba pøi vytváøení doèasného souboru %s\n"
 
-#: lib/package.c:181 lib/package.c:257
+#: lib/package.c:184 lib/package.c:260
 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:202 lib/package.c:265
+#: lib/package.c:205 lib/package.c:268
 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:243 lib/rpmchecksig.c:161 lib/rpmchecksig.c:541
+#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:548
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: readLead selhalo\n"
 
-#: lib/package.c:249
+#: lib/package.c:252
 #, fuzzy, c-format
 msgid "%s: bad magic\n"
 msgstr "©patné magické èíslo"
 
-#: lib/package.c:274 lib/rpmchecksig.c:179 lib/rpmchecksig.c:557
+#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:564
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: rpmReadSignature selhalo\n"
 
-#: lib/package.c:278 lib/rpmchecksig.c:183 lib/rpmchecksig.c:562
+#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:569
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Není dostupnı ¾ádnı podpis\n"
 
-#: lib/package.c:308 lib/rpmchecksig.c:462
+#: lib/package.c:331 lib/rpmchecksig.c:467
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: readLead selhalo\n"
 
-#. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:338
-msgid "========== Header RSA signature\n"
-msgstr ""
-
-#: lib/package.c:343 lib/package.c:371 lib/package.c:403 lib/rpmchecksig.c:631
+#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:642
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
-#. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:366
-msgid "========== Header DSA signature\n"
-msgstr ""
-
-#. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:397
-msgid "========== Package DSA/RSA signature\n"
-msgstr ""
-
-#: lib/package.c:415 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
+#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:496
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Fread selhalo: %s\n"
@@ -2019,7 +2004,7 @@ msgstr "zobrazit stav vypsanıch souborù"
 msgid "display a verbose file listing"
 msgstr "zobrazit roz¹íøenı vıpis souborù"
 
-#: lib/poptQV.c:240 lib/poptQV.c:282 lib/poptQV.c:316
+#: lib/poptQV.c:240
 msgid "don't verify MD5 digest of files"
 msgstr "nekontrolovat MD5 souborù v balíèku"
 
@@ -2060,46 +2045,46 @@ msgstr "nekontrolovat závislosti balíèkù"
 msgid "don't execute verify script(s)"
 msgstr "nespou¹tìt %verifyscript (pokud existuje)"
 
-#: lib/poptQV.c:275
+#: lib/poptQV.c:275 lib/poptQV.c:313
 #, fuzzy
 msgid "don't verify digest(s)"
 msgstr "nekontrolovat MD5 souborù v balíèku"
 
-#: lib/poptQV.c:278
+#: lib/poptQV.c:278 lib/poptQV.c:316
 #, fuzzy
 msgid "don't verify signature(s)"
 msgstr "nekontrolovat cesty symbolickıch linek"
 
-#: lib/poptQV.c:286 lib/poptQV.c:320
+#: lib/poptQV.c:283
 #, fuzzy
 msgid "don't verify GPG V3 DSA signature(s)"
 msgstr "nekontrolovat SHA1 digest v hlavièce"
 
-#: lib/poptQV.c:289 lib/poptQV.c:323
+#: lib/poptQV.c:286
 #, fuzzy
 msgid "don't verify PGP V3 RSA/MD5 signature(s)"
 msgstr "nekontrolovat MD5 souborù v balíèku"
 
-#: lib/poptQV.c:304
+#: lib/poptQV.c:301
 #, fuzzy
-msgid "sign a package, preserving other existing signatures"
+msgid "sign a package, preserving digests"
 msgstr "podepsat balíèek (zahodit aktuální podpis)"
 
-#: lib/poptQV.c:306
+#: lib/poptQV.c:303
 #, fuzzy
 msgid "verify package signature(s)"
 msgstr "ovìøit podpis v balíèku"
 
-#: lib/poptQV.c:308
+#: lib/poptQV.c:305
 msgid "import an armored public key"
 msgstr ""
 
-#: lib/poptQV.c:310
+#: lib/poptQV.c:307
 #, fuzzy
-msgid "sign a package, discarding all current signatures"
+msgid "sign a package, recomputing digests"
 msgstr "podepsat balíèek (zahodit aktuální podpis)"
 
-#: lib/poptQV.c:312
+#: lib/poptQV.c:309
 msgid "generate signature"
 msgstr "generovat PGP/GPG podpis"
 
@@ -2266,129 +2251,129 @@ msgstr "%s selhalo\n"
 msgid "incorrect format: %s\n"
 msgstr "nesprávnı formát: %s\n"
 
-#: lib/query.c:221
+#: lib/query.c:220
 msgid "(contains no files)"
 msgstr "(neobsahuje ¾ádné soubory)"
 
-#: lib/query.c:282
+#: lib/query.c:281
 msgid "normal        "
 msgstr "normální      "
 
-#: lib/query.c:285
+#: lib/query.c:284
 msgid "replaced      "
 msgstr "nahrazen      "
 
-#: lib/query.c:288
+#: lib/query.c:287
 msgid "not installed "
 msgstr "neinstalován  "
 
-#: lib/query.c:291
+#: lib/query.c:290
 msgid "net shared    "
 msgstr "sdílen v síti "
 
-#: lib/query.c:294
+#: lib/query.c:293
 #, c-format
 msgid "(unknown %3d) "
 msgstr "(neznámı %3d) "
 
-#: lib/query.c:299
+#: lib/query.c:298
 msgid "(no state)    "
 msgstr "(chybí stav)  "
 
-#: lib/query.c:318 lib/query.c:374
+#: lib/query.c:317 lib/query.c:373
 msgid "package has neither file owner or id lists\n"
 msgstr "balíèek nemá vlastníka souboru ani seznamy id\n"
 
-#: lib/query.c:463
+#: lib/query.c:462
 #, c-format
 msgid "can't query %s: %s\n"
 msgstr "nemohu provést dotaz %s: %s\n"
 
-#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:333 lib/rpminstall.c:475
+#: lib/query.c:616 lib/query.c:654 lib/rpminstall.c:333 lib/rpminstall.c:475
 #: lib/rpminstall.c:845
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "otevøení %s selhalo: %s\n"
 
-#: lib/query.c:633
+#: lib/query.c:632
 #, c-format
 msgid "query of %s failed\n"
 msgstr "dotaz na %s se nezdaøil\n"
 
-#: lib/query.c:639
+#: lib/query.c:638
 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:665 lib/rpminstall.c:488
+#: lib/query.c:664 lib/rpminstall.c:488
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: Fread selhalo: %s\n"
 
-#: lib/query.c:709
+#: lib/query.c:708
 #, 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:730
+#: lib/query.c:729
 msgid "no packages\n"
 msgstr "¾ádné balíèky\n"
 
-#: lib/query.c:750
+#: lib/query.c:749
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "skupina %s neobsahuje ¾ádné balíèky\n"
 
-#: lib/query.c:760
+#: lib/query.c:759
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "¾ádnı balíèek neaktivuje %s\n"
 
-#: lib/query.c:774 lib/query.c:796 lib/query.c:814 lib/query.c:845
+#: lib/query.c:773 lib/query.c:795 lib/query.c:813 lib/query.c:844
 #, fuzzy, c-format
 msgid "malformed %s: %s\n"
 msgstr "Nemohu èíst %s: %s.\n"
 
-#: lib/query.c:784 lib/query.c:802 lib/query.c:820 lib/query.c:850
+#: lib/query.c:783 lib/query.c:801 lib/query.c:819 lib/query.c:849
 #, fuzzy, c-format
 msgid "no package matches %s: %s\n"
 msgstr "¾ádnı balíèek neaktivuje %s\n"
 
-#: lib/query.c:861
+#: lib/query.c:860
 #, c-format
 msgid "no package requires %s\n"
 msgstr "¾ádnı balíèek nevy¾aduje %s\n"
 
-#: lib/query.c:872
+#: lib/query.c:871
 #, c-format
 msgid "no package provides %s\n"
 msgstr "¾ádnı balíèek neposkytuje %s\n"
 
-#: lib/query.c:906
+#: lib/query.c:905
 #, c-format
 msgid "file %s: %s\n"
 msgstr "soubor %s: %s\n"
 
-#: lib/query.c:910
+#: lib/query.c:909
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "soubor %s nevlastní ¾ádnı balíèek\n"
 
-#: lib/query.c:937
+#: lib/query.c:936
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "neplatné èíslo balíèku: %s\n"
 
-#: lib/query.c:940
+#: lib/query.c:939
 #, c-format
 msgid "package record number: %u\n"
 msgstr "záznam balíèku èíslo: %u\n"
 
-#: lib/query.c:945
+#: lib/query.c:944
 #, c-format
 msgid "record %u could not be read\n"
 msgstr "záznam %d nelze pøeèíst\n"
 
-#: lib/query.c:956 lib/rpminstall.c:633
+#: lib/query.c:955 lib/rpminstall.c:633
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "balíèek %s není nainstalován\n"
@@ -2403,71 +2388,71 @@ msgstr "¹patnı db soubor %s\n"
 msgid "(added provide)"
 msgstr "%s: %-45s ANO (db poskytuje)\n"
 
-#: lib/rpmchecksig.c:51
+#: lib/rpmchecksig.c:54
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s: otevøení selhalo: %s\n"
 
-#: lib/rpmchecksig.c:63
+#: lib/rpmchecksig.c:66
 msgid "makeTempFile failed\n"
 msgstr "makeTempFile selhalo\n"
 
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:107
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: Fwrite selhalo: %s\n"
 
-#: lib/rpmchecksig.c:166
+#: lib/rpmchecksig.c:169
 #, fuzzy, c-format
 msgid "%s: Can't sign v1 packaging\n"
 msgstr "%s: RPM v1.0 nelze podepsat\n"
 
-#: lib/rpmchecksig.c:170
+#: lib/rpmchecksig.c:173
 #, fuzzy, c-format
 msgid "%s: Can't re-sign v2 packaging\n"
 msgstr "%s: Nemohu znovu podepsat RPM v2.0\n"
 
-#: lib/rpmchecksig.c:239
+#: lib/rpmchecksig.c:244
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: writeLead selhalo: %s\n"
 
-#: lib/rpmchecksig.c:245
+#: lib/rpmchecksig.c:250
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmWriteSignature selhalo: %s\n"
 
-#: lib/rpmchecksig.c:476
+#: lib/rpmchecksig.c:481
 #, fuzzy, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr "%s: readLead selhalo\n"
 
-#: lib/rpmchecksig.c:547
+#: lib/rpmchecksig.c:554
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: Není dostupnı ¾ádnı podpis (RPM v1.0)\n"
 
-#: lib/rpmchecksig.c:773
+#: lib/rpmchecksig.c:801
 msgid "NOT OK"
 msgstr "NENÍ OK"
 
-#: lib/rpmchecksig.c:774 lib/rpmchecksig.c:788
+#: lib/rpmchecksig.c:802 lib/rpmchecksig.c:816
 msgid " (MISSING KEYS:"
 msgstr " (CHYBÍ KLÍÈ:"
 
-#: lib/rpmchecksig.c:776 lib/rpmchecksig.c:790
+#: lib/rpmchecksig.c:804 lib/rpmchecksig.c:818
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:777 lib/rpmchecksig.c:791
+#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819
 msgid " (UNTRUSTED KEYS:"
 msgstr " (NEDÙVÌRYHODNİ KLÍÈ:"
 
-#: lib/rpmchecksig.c:779 lib/rpmchecksig.c:793
+#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:787
+#: lib/rpmchecksig.c:815
 msgid "OK"
 msgstr "OK"
 
@@ -2679,141 +2664,141 @@ msgstr "Nemohu èíst %s, HOME je pøíli¹ velkı.\n"
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "Nemohu otevøít %s pro ètení: %s.\n"
 
-#: lib/signature.c:118
+#: lib/signature.c:119
 msgid "file is not regular -- skipping size check\n"
 msgstr "není obyèejnı soubor -- pøeskakuji kontrolu velikosti\n"
 
-#: lib/signature.c:127
+#: lib/signature.c:128
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 "Pøedpokl. délka: %12d = hlavièka(%d)+signatura(%d)+vıplò(%d)+data(%d)\n"
 
-#: lib/signature.c:132
+#: lib/signature.c:133
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr "Aktuální délka: %12d\n"
 
-#: lib/signature.c:152
+#: lib/signature.c:153
 msgid "No signature\n"
 msgstr "Chybí podpis\n"
 
-#: lib/signature.c:156
+#: lib/signature.c:157
 msgid "Old PGP signature\n"
 msgstr "Starı PGP podpis\n"
 
-#: lib/signature.c:169
+#: lib/signature.c:170
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr "Starı (pouze interní) podpis! Jak jste to získali!?\n"
 
-#: lib/signature.c:225
+#: lib/signature.c:226
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "Podpisu: velikost(%d)+vata(%d)\n"
 
-#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:677
-#: lib/signature.c:710
+#: lib/signature.c:307 lib/signature.c:406 lib/signature.c:678
+#: lib/signature.c:711
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "Nemohu spustit %s: %s\n"
 
-#: lib/signature.c:322
+#: lib/signature.c:323
 msgid "pgp failed\n"
 msgstr "pgp selhalo\n"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:329
+#: lib/signature.c:330
 msgid "pgp failed to write signature\n"
 msgstr "pgp selhalo pøi zápisu podpisu\n"
 
-#: lib/signature.c:334
+#: lib/signature.c:335
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr "Velikost podpisu PGP: %d\n"
 
-#: lib/signature.c:350 lib/signature.c:450
+#: lib/signature.c:351 lib/signature.c:451
 msgid "unable to read the signature\n"
 msgstr "nemohu èíst podpis\n"
 
-#: lib/signature.c:355
+#: lib/signature.c:356
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr "Pøeèteno %d bajtù PGP podpisu\n"
 
-#: lib/signature.c:422
+#: lib/signature.c:423
 msgid "gpg failed\n"
 msgstr "gpg selhalo\n"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:429
+#: lib/signature.c:430
 msgid "gpg failed to write signature\n"
 msgstr "gpg selhalo pøi zápisu podpisu\n"
 
-#: lib/signature.c:434
+#: lib/signature.c:435
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr "Velikost GPG podpisu: %d\n"
 
-#: lib/signature.c:455
+#: lib/signature.c:456
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr "Pøeèteno %d bajtù GPG podpisu\n"
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:715 lib/signature.c:770
+#: lib/signature.c:716 lib/signature.c:771
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "©patná %%_signature spec v souboru maker\n"
 
-#: lib/signature.c:749
+#: lib/signature.c:750
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "Musíte nastavit \"%%_gpg_name\" ve svém makro souboru\n"
 
-#: lib/signature.c:762
+#: lib/signature.c:763
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "Musíte nastavit \"%%_pgp_name\" ve svém makro souboru\n"
 
-#: lib/signature.c:806
+#: lib/signature.c:807
 #, fuzzy
 msgid "Header+Payload size: "
 msgstr "Velikost hlavièky je pøili¹ velká"
 
-#: lib/signature.c:846
+#: lib/signature.c:847
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:903
+#: lib/signature.c:906
 msgid "Header SHA1 digest: "
 msgstr ""
 
-#: lib/signature.c:1082
+#: lib/signature.c:1102
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "vynechat pøípadné MD5 souèty"
 
-#: lib/signature.c:1199
+#: lib/signature.c:1221
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1200
+#: lib/signature.c:1222
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "Chybí podpis\n"
 
-#: lib/signature.c:1287
+#: lib/signature.c:1311
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1314
+#: lib/signature.c:1338
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1318
+#: lib/signature.c:1342
 #, fuzzy, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Podpisu: velikost(%d)+vata(%d)\n"
@@ -3450,6 +3435,10 @@ msgstr "url port musí bıt èíslo\n"
 msgid "failed to create %s: %s\n"
 msgstr "nemohu vytvoøit %s: %s\n"
 
+#, fuzzy
+#~ msgid "sign a package, discarding all current signatures"
+#~ msgstr "podepsat balíèek (zahodit aktuální podpis)"
+
 #~ msgid "Generating signature using PGP.\n"
 #~ msgstr "Generuji PGP podpis.\n"
 
diff --git a/po/da.po b/po/da.po
index 3c79c2329..ef852abc7 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-03-07 17:53-0500\n"
+"POT-Creation-Date: 2002-03-08 17:22-0500\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"
@@ -1620,63 +1620,47 @@ msgstr "%s oprettet som %s\n"
 msgid "error creating temporary file %s\n"
 msgstr "fejl ved oprettelse af midlertidig fil %s\n"
 
-#: lib/package.c:181 lib/package.c:257
+#: lib/package.c:184 lib/package.c:260
 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:202 lib/package.c:265
+#: lib/package.c:205 lib/package.c:268
 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:243 lib/rpmchecksig.c:161 lib/rpmchecksig.c:541
+#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:548
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: readLead mislykkedes\n"
 
-#: lib/package.c:249
+#: lib/package.c:252
 #, fuzzy, c-format
 msgid "%s: bad magic\n"
 msgstr "Ugyldigt magisk tal"
 
-#: lib/package.c:274 lib/rpmchecksig.c:179 lib/rpmchecksig.c:557
+#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:564
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: rpmReadSignature mislykkedes\n"
 
-#: lib/package.c:278 lib/rpmchecksig.c:183 lib/rpmchecksig.c:562
+#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:569
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Ingen tilgængelig signatur\n"
 
-#: lib/package.c:308 lib/rpmchecksig.c:462
+#: lib/package.c:331 lib/rpmchecksig.c:467
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: readLead mislykkedes\n"
 
-#. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:338
-#, fuzzy
-msgid "========== Header RSA signature\n"
-msgstr "========== tsort'er pakker\n"
-
-#: lib/package.c:343 lib/package.c:371 lib/package.c:403 lib/rpmchecksig.c:631
+#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:642
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
-#. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:366
-msgid "========== Header DSA signature\n"
-msgstr ""
-
-#. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:397
-msgid "========== Package DSA/RSA signature\n"
-msgstr ""
-
-#: lib/package.c:415 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
+#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:496
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Fread mislykkedes: %s\n"
@@ -2027,7 +2011,7 @@ msgstr "vis filernes status"
 msgid "display a verbose file listing"
 msgstr "giv en detaljeret filliste"
 
-#: lib/poptQV.c:240 lib/poptQV.c:282 lib/poptQV.c:316
+#: lib/poptQV.c:240
 #, fuzzy
 msgid "don't verify MD5 digest of files"
 msgstr "verificér ikke filerne i pakke"
@@ -2075,46 +2059,46 @@ msgstr "undlad at tjekke pakkers afhængighedskrav"
 msgid "don't execute verify script(s)"
 msgstr "udfør ikke eventuelt %verifyscript"
 
-#: lib/poptQV.c:275
+#: lib/poptQV.c:275 lib/poptQV.c:313
 #, fuzzy
 msgid "don't verify digest(s)"
 msgstr "verificér ikke filerne i pakke"
 
-#: lib/poptQV.c:278
+#: lib/poptQV.c:278 lib/poptQV.c:316
 #, fuzzy
 msgid "don't verify signature(s)"
 msgstr "verificér ikke filerne i pakke"
 
-#: lib/poptQV.c:286 lib/poptQV.c:320
+#: lib/poptQV.c:283
 #, fuzzy
 msgid "don't verify GPG V3 DSA signature(s)"
 msgstr "verificér ikke filerne i pakke"
 
-#: lib/poptQV.c:289 lib/poptQV.c:323
+#: lib/poptQV.c:286
 #, fuzzy
 msgid "don't verify PGP V3 RSA/MD5 signature(s)"
 msgstr "verificér ikke filerne i pakke"
 
-#: lib/poptQV.c:304
+#: lib/poptQV.c:301
 #, fuzzy
-msgid "sign a package, preserving other existing signatures"
+msgid "sign a package, preserving digests"
 msgstr "underskriv en pakke (slet nuværende signatur)"
 
-#: lib/poptQV.c:306
+#: lib/poptQV.c:303
 #, fuzzy
 msgid "verify package signature(s)"
 msgstr "verificér pakkesignatur"
 
-#: lib/poptQV.c:308
+#: lib/poptQV.c:305
 msgid "import an armored public key"
 msgstr ""
 
-#: lib/poptQV.c:310
+#: lib/poptQV.c:307
 #, fuzzy
-msgid "sign a package, discarding all current signatures"
+msgid "sign a package, recomputing digests"
 msgstr "underskriv en pakke (slet nuværende signatur)"
 
-#: lib/poptQV.c:312
+#: lib/poptQV.c:309
 #, fuzzy
 msgid "generate signature"
 msgstr "generér PGP/GPG-signatur"
@@ -2285,129 +2269,129 @@ msgstr "%s mislykkedes\n"
 msgid "incorrect format: %s\n"
 msgstr "ugyldigt format: %s\n"
 
-#: lib/query.c:221
+#: lib/query.c:220
 msgid "(contains no files)"
 msgstr "(indeholder ingen filer)"
 
-#: lib/query.c:282
+#: lib/query.c:281
 msgid "normal        "
 msgstr "normal        "
 
-#: lib/query.c:285
+#: lib/query.c:284
 msgid "replaced      "
 msgstr "erstattet     "
 
-#: lib/query.c:288
+#: lib/query.c:287
 msgid "not installed "
 msgstr "ej installeret"
 
-#: lib/query.c:291
+#: lib/query.c:290
 msgid "net shared    "
 msgstr "ej delt       "
 
-#: lib/query.c:294
+#: lib/query.c:293
 #, c-format
 msgid "(unknown %3d) "
 msgstr "(ukendt %3d)  "
 
-#: lib/query.c:299
+#: lib/query.c:298
 msgid "(no state)    "
 msgstr "(ingen status)"
 
-#: lib/query.c:318 lib/query.c:374
+#: lib/query.c:317 lib/query.c:373
 msgid "package has neither file owner or id lists\n"
 msgstr "pakke har hverken filejerskabs- eller id-lister\n"
 
-#: lib/query.c:463
+#: lib/query.c:462
 #, c-format
 msgid "can't query %s: %s\n"
 msgstr "kunne ikke forespørge %s: %s\n"
 
-#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:333 lib/rpminstall.c:475
+#: lib/query.c:616 lib/query.c:654 lib/rpminstall.c:333 lib/rpminstall.c:475
 #: lib/rpminstall.c:845
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "åbning af %s mislykkedes %s\n"
 
-#: lib/query.c:633
+#: lib/query.c:632
 #, c-format
 msgid "query of %s failed\n"
 msgstr "forespørgsel af %s mislykkedes\n"
 
-#: lib/query.c:639
+#: lib/query.c:638
 msgid "old format source packages cannot be queried\n"
 msgstr "pakke med gammelt kildeformat kan ikke forespørges\n"
 
-#: lib/query.c:665 lib/rpminstall.c:488
+#: lib/query.c:664 lib/rpminstall.c:488
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: læs manifest mislykkedes: %s\n"
 
-#: lib/query.c:709
+#: lib/query.c:708
 #, 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:730
+#: lib/query.c:729
 msgid "no packages\n"
 msgstr "ingen pakker\n"
 
-#: lib/query.c:750
+#: lib/query.c:749
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "gruppe %s indeholder ingen pakker\n"
 
-#: lib/query.c:760
+#: lib/query.c:759
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "ingen pakker udløser %s\n"
 
-#: lib/query.c:774 lib/query.c:796 lib/query.c:814 lib/query.c:845
+#: lib/query.c:773 lib/query.c:795 lib/query.c:813 lib/query.c:844
 #, fuzzy, c-format
 msgid "malformed %s: %s\n"
 msgstr "Kunne ikke læse %s: %s.\n"
 
-#: lib/query.c:784 lib/query.c:802 lib/query.c:820 lib/query.c:850
+#: lib/query.c:783 lib/query.c:801 lib/query.c:819 lib/query.c:849
 #, fuzzy, c-format
 msgid "no package matches %s: %s\n"
 msgstr "ingen pakker udløser %s\n"
 
-#: lib/query.c:861
+#: lib/query.c:860
 #, c-format
 msgid "no package requires %s\n"
 msgstr "ingen pakker kræver %s\n"
 
-#: lib/query.c:872
+#: lib/query.c:871
 #, c-format
 msgid "no package provides %s\n"
 msgstr "ingen pakker tilfører %s\n"
 
-#: lib/query.c:906
+#: lib/query.c:905
 #, c-format
 msgid "file %s: %s\n"
 msgstr "fil %s: %s\n"
 
-#: lib/query.c:910
+#: lib/query.c:909
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "filen %s tilhører ingen pakke\n"
 
-#: lib/query.c:937
+#: lib/query.c:936
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "ugyldigt pakkenummer: %s\n"
 
-#: lib/query.c:940
+#: lib/query.c:939
 #, c-format
 msgid "package record number: %u\n"
 msgstr "pakkens post-nummer: %u\n"
 
-#: lib/query.c:945
+#: lib/query.c:944
 #, fuzzy, c-format
 msgid "record %u could not be read\n"
 msgstr "post %d kunne ikke læses\n"
 
-#: lib/query.c:956 lib/rpminstall.c:633
+#: lib/query.c:955 lib/rpminstall.c:633
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "pakken %s er ikke installeret\n"
@@ -2422,71 +2406,71 @@ msgstr "ugyldig db-fil %s\n"
 msgid "(added provide)"
 msgstr "%s: %-45s JA (db tilfører)\n"
 
-#: lib/rpmchecksig.c:51
+#: lib/rpmchecksig.c:54
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s: åbning mislykkedes: %s\n"
 
-#: lib/rpmchecksig.c:63
+#: lib/rpmchecksig.c:66
 msgid "makeTempFile failed\n"
 msgstr "makeTempFile mislykkedes\n"
 
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:107
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: Fwrite mislykkedes: %s\n"
 
-#: lib/rpmchecksig.c:166
+#: lib/rpmchecksig.c:169
 #, fuzzy, c-format
 msgid "%s: Can't sign v1 packaging\n"
 msgstr "%s: Kan ikke underskrive v1.0 RPM\n"
 
-#: lib/rpmchecksig.c:170
+#: lib/rpmchecksig.c:173
 #, fuzzy, c-format
 msgid "%s: Can't re-sign v2 packaging\n"
 msgstr "%s: Kan ikke genunderskrive v2.0 RPM\n"
 
-#: lib/rpmchecksig.c:239
+#: lib/rpmchecksig.c:244
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: writeLead mislykkedes: %s\n"
 
-#: lib/rpmchecksig.c:245
+#: lib/rpmchecksig.c:250
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmWriteSignature mislykkedes: %s\n"
 
-#: lib/rpmchecksig.c:476
+#: lib/rpmchecksig.c:481
 #, fuzzy, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr "%s: readLead mislykkedes\n"
 
-#: lib/rpmchecksig.c:547
+#: lib/rpmchecksig.c:554
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: Ingen tilgængelig signatur (v1.0 RPM)\n"
 
-#: lib/rpmchecksig.c:773
+#: lib/rpmchecksig.c:801
 msgid "NOT OK"
 msgstr "IKKE O.K."
 
-#: lib/rpmchecksig.c:774 lib/rpmchecksig.c:788
+#: lib/rpmchecksig.c:802 lib/rpmchecksig.c:816
 msgid " (MISSING KEYS:"
 msgstr " (MANGLENDE NØGLER:    "
 
-#: lib/rpmchecksig.c:776 lib/rpmchecksig.c:790
+#: lib/rpmchecksig.c:804 lib/rpmchecksig.c:818
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:777 lib/rpmchecksig.c:791
+#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819
 msgid " (UNTRUSTED KEYS:"
 msgstr " (IKKE-BETROEDE NØGLER:"
 
-#: lib/rpmchecksig.c:779 lib/rpmchecksig.c:793
+#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:787
+#: lib/rpmchecksig.c:815
 msgid "OK"
 msgstr "O.K."
 
@@ -2700,140 +2684,140 @@ msgstr "Kunne ikke læse %s, HOME er for stor.\n"
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "Kunne ikke åbne %s for læsning: %s.\n"
 
-#: lib/signature.c:118
+#: lib/signature.c:119
 msgid "file is not regular -- skipping size check\n"
 msgstr "filen er ikke regulær -- overspringer størrelsestjek\n"
 
-#: lib/signature.c:127
+#: lib/signature.c:128
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr "Forventet størrelse: %12d = indled(%d)+sign(%d)+fyld(%d)+data(%d)\n"
 
-#: lib/signature.c:132
+#: lib/signature.c:133
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr "  Faktisk størrelse: %12d\n"
 
-#: lib/signature.c:152
+#: lib/signature.c:153
 msgid "No signature\n"
 msgstr "Ingen signatur\n"
 
-#: lib/signature.c:156
+#: lib/signature.c:157
 msgid "Old PGP signature\n"
 msgstr "Gammel PGP-signatur\n"
 
-#: lib/signature.c:169
+#: lib/signature.c:170
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr "Gammel (internt brug) signatur! Hvordan fik du fingre i den!?\n"
 
-#: lib/signature.c:225
+#: lib/signature.c:226
 #, fuzzy, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "Signaturstørrelse: %d\n"
 
-#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:677
-#: lib/signature.c:710
+#: lib/signature.c:307 lib/signature.c:406 lib/signature.c:678
+#: lib/signature.c:711
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "Kunne ikke udføre %s: %s\n"
 
-#: lib/signature.c:322
+#: lib/signature.c:323
 msgid "pgp failed\n"
 msgstr "pgp fejlede\n"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:329
+#: lib/signature.c:330
 msgid "pgp failed to write signature\n"
 msgstr "pgp kunne ikke skrive signatur\n"
 
-#: lib/signature.c:334
+#: lib/signature.c:335
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr "PGP-signaturstørrelse: %d\n"
 
-#: lib/signature.c:350 lib/signature.c:450
+#: lib/signature.c:351 lib/signature.c:451
 msgid "unable to read the signature\n"
 msgstr "kunne ikke læse signaturen\n"
 
-#: lib/signature.c:355
+#: lib/signature.c:356
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr "Fik %d byte af PGP-signatur\n"
 
-#: lib/signature.c:422
+#: lib/signature.c:423
 msgid "gpg failed\n"
 msgstr "gpg fejlede\n"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:429
+#: lib/signature.c:430
 msgid "gpg failed to write signature\n"
 msgstr "gpg kunne ikke skrive signaturen\n"
 
-#: lib/signature.c:434
+#: lib/signature.c:435
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr "GPG-signaturstørrelse: %d\n"
 
-#: lib/signature.c:455
+#: lib/signature.c:456
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr "Fik %d byte GPG-signatur\n"
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:715 lib/signature.c:770
+#: lib/signature.c:716 lib/signature.c:771
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "Ugyldig angivelse af '%%_signature'-spec i makrofil.\n"
 
-#: lib/signature.c:749
+#: lib/signature.c:750
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "Du skal angive \"%%_gpg_name\" i din makrofil\n"
 
-#: lib/signature.c:762
+#: lib/signature.c:763
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "Du skal angive \"%%_pgp_name\" i din makrofil\n"
 
-#: lib/signature.c:806
+#: lib/signature.c:807
 #, fuzzy
 msgid "Header+Payload size: "
 msgstr "Hovedstørrelse er for stor"
 
-#: lib/signature.c:846
+#: lib/signature.c:847
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:903
+#: lib/signature.c:906
 msgid "Header SHA1 digest: "
 msgstr ""
 
-#: lib/signature.c:1082
+#: lib/signature.c:1102
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "overspring eventuelle MD5-signaturer"
 
-#: lib/signature.c:1199
+#: lib/signature.c:1221
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1200
+#: lib/signature.c:1222
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "Ingen signatur\n"
 
-#: lib/signature.c:1287
+#: lib/signature.c:1311
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1314
+#: lib/signature.c:1338
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1318
+#: lib/signature.c:1342
 #, fuzzy, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Signaturfyld : %d\n"
@@ -3478,6 +3462,14 @@ msgid "failed to create %s: %s\n"
 msgstr "kunne ikke oprette %s: %s\n"
 
 #, fuzzy
+#~ msgid "========== Header RSA signature\n"
+#~ msgstr "========== tsort'er pakker\n"
+
+#, fuzzy
+#~ msgid "sign a package, discarding all current signatures"
+#~ msgstr "underskriv en pakke (slet nuværende signatur)"
+
+#, fuzzy
 #~ msgid "========== Package RSA signature\n"
 #~ msgstr "========== tsort'er pakker\n"
 
diff --git a/po/de.po b/po/de.po
index 8b865a29a..92c7ebee7 100644
--- a/po/de.po
+++ b/po/de.po
@@ -37,7 +37,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-03-07 17:53-0500\n"
+"POT-Creation-Date: 2002-03-08 17:22-0500\n"
 "PO-Revision-Date: 1998-08-03 18:02+02:00\n"
 "Last-Translator: Karl Eichwalder <ke@SuSE.DE>\n"
 "Language-Team: German <de@li.org>\n"
@@ -1759,67 +1759,50 @@ msgstr "kann Datei %s nicht öffnen: "
 msgid "error creating temporary file %s\n"
 msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
 
-#: lib/package.c:181 lib/package.c:257
+#: lib/package.c:184 lib/package.c:260
 #, 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:202 lib/package.c:265
+#: lib/package.c:205 lib/package.c:268
 #, 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:243 lib/rpmchecksig.c:161 lib/rpmchecksig.c:541
+#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:548
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: »readLead« fehlgeschlagen\n"
 
-#: lib/package.c:249
+#: lib/package.c:252
 #, c-format
 msgid "%s: bad magic\n"
 msgstr ""
 
-#: lib/package.c:274 lib/rpmchecksig.c:179 lib/rpmchecksig.c:557
+#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:564
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: »rpmReadSignature« fehlgeschlagen\n"
 
-#: lib/package.c:278 lib/rpmchecksig.c:183 lib/rpmchecksig.c:562
+#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:569
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Keine Signatur verfügbar\n"
 
-#: lib/package.c:308 lib/rpmchecksig.c:462
+#: lib/package.c:331 lib/rpmchecksig.c:467
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: »readLead« fehlgeschlagen\n"
 
-#. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:338
-#, fuzzy
-msgid "========== Header RSA signature\n"
-msgstr "nicht möglich, die Signatur zu lesen"
-
-#: lib/package.c:343 lib/package.c:371 lib/package.c:403 lib/rpmchecksig.c:631
+#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:642
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
-#. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:366
-#, fuzzy
-msgid "========== Header DSA signature\n"
-msgstr "nicht möglich, die Signatur zu lesen"
-
-#. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:397
-msgid "========== Package DSA/RSA signature\n"
-msgstr ""
-
-#: lib/package.c:415 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
+#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:496
 #, fuzzy, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: »readLead« fehlgeschlagen\n"
@@ -2192,7 +2175,7 @@ msgstr ""
 msgid "display a verbose file listing"
 msgstr "Dateiliste des Pakets anzeigen"
 
-#: lib/poptQV.c:240 lib/poptQV.c:282 lib/poptQV.c:316
+#: lib/poptQV.c:240
 #, fuzzy
 msgid "don't verify MD5 digest of files"
 msgstr "Paket installieren"
@@ -2241,46 +2224,46 @@ msgstr "Dateiabhängigkeiten nicht überprüfen"
 msgid "don't execute verify script(s)"
 msgstr "Keine Stufen ausführen"
 
-#: lib/poptQV.c:275
+#: lib/poptQV.c:275 lib/poptQV.c:313
 #, fuzzy
 msgid "don't verify digest(s)"
 msgstr "Paket installieren"
 
-#: lib/poptQV.c:278
+#: lib/poptQV.c:278 lib/poptQV.c:316
 #, fuzzy
 msgid "don't verify signature(s)"
 msgstr "Paket installieren"
 
-#: lib/poptQV.c:286 lib/poptQV.c:320
+#: lib/poptQV.c:283
 #, fuzzy
 msgid "don't verify GPG V3 DSA signature(s)"
 msgstr "Paket installieren"
 
-#: lib/poptQV.c:289 lib/poptQV.c:323
+#: lib/poptQV.c:286
 #, fuzzy
 msgid "don't verify PGP V3 RSA/MD5 signature(s)"
 msgstr "Paket installieren"
 
-#: lib/poptQV.c:304
+#: lib/poptQV.c:301
 #, fuzzy
-msgid "sign a package, preserving other existing signatures"
+msgid "sign a package, preserving digests"
 msgstr "Ein Paket signieren (die aktuelle Signature wird verworfen)"
 
-#: lib/poptQV.c:306
+#: lib/poptQV.c:303
 #, fuzzy
 msgid "verify package signature(s)"
 msgstr "Paketsignatur überprüfen"
 
-#: lib/poptQV.c:308
+#: lib/poptQV.c:305
 msgid "import an armored public key"
 msgstr ""
 
-#: lib/poptQV.c:310
+#: lib/poptQV.c:307
 #, fuzzy
-msgid "sign a package, discarding all current signatures"
+msgid "sign a package, recomputing digests"
 msgstr "Ein Paket signieren (die aktuelle Signature wird verworfen)"
 
-#: lib/poptQV.c:312
+#: lib/poptQV.c:309
 #, fuzzy
 msgid "generate signature"
 msgstr "PGP-Signatur generieren"
@@ -2455,135 +2438,135 @@ msgstr "pgp fehlgeschlagen"
 msgid "incorrect format: %s\n"
 msgstr "Fehler beim Format %s\n"
 
-#: lib/query.c:221
+#: lib/query.c:220
 msgid "(contains no files)"
 msgstr "(beinhaltet keine Dateien)"
 
-#: lib/query.c:282
+#: lib/query.c:281
 msgid "normal        "
 msgstr ""
 
-#: lib/query.c:285
+#: lib/query.c:284
 msgid "replaced      "
 msgstr ""
 
-#: lib/query.c:288
+#: lib/query.c:287
 #, fuzzy
 msgid "not installed "
 msgstr "Paket %s ist nicht installiert\n"
 
-#: lib/query.c:291
+#: lib/query.c:290
 msgid "net shared    "
 msgstr ""
 
-#: lib/query.c:294
+#: lib/query.c:293
 #, fuzzy, c-format
 msgid "(unknown %3d) "
 msgstr "(unbekannter Typ)"
 
-#: lib/query.c:299
+#: lib/query.c:298
 msgid "(no state)    "
 msgstr ""
 
-#: lib/query.c:318 lib/query.c:374
+#: lib/query.c:317 lib/query.c:373
 #, fuzzy
 msgid "package has neither file owner or id lists\n"
 msgstr "Paket hat keinen Namen"
 
-#: lib/query.c:463
+#: lib/query.c:462
 #, fuzzy, c-format
 msgid "can't query %s: %s\n"
 msgstr "Fehler: kann %s nicht öffnen\n"
 
-#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:333 lib/rpminstall.c:475
+#: lib/query.c:616 lib/query.c:654 lib/rpminstall.c:333 lib/rpminstall.c:475
 #: lib/rpminstall.c:845
 #, fuzzy, c-format
 msgid "open of %s failed: %s\n"
 msgstr "öffnen von %s fehlgeschlagen: %s\n"
 
-#: lib/query.c:633
+#: lib/query.c:632
 #, c-format
 msgid "query of %s failed\n"
 msgstr "Anfrage von %s fehlgeschlagen\n"
 
-#: lib/query.c:639
+#: lib/query.c:638
 msgid "old format source packages cannot be queried\n"
 msgstr "altes Sourceformat-Paket kann nicht angefragt werden\n"
 
-#: lib/query.c:665 lib/rpminstall.c:488
+#: lib/query.c:664 lib/rpminstall.c:488
 #, fuzzy, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: »readLead« fehlgeschlagen\n"
 
-#: lib/query.c:709
+#: lib/query.c:708
 #, fuzzy, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "Anfrage von %s fehlgeschlagen\n"
 
-#: lib/query.c:730
+#: lib/query.c:729
 #, fuzzy
 msgid "no packages\n"
 msgstr "Anfrage an alle Pakete"
 
-#: lib/query.c:750
+#: lib/query.c:749
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "Gruppe %s beinhaltet kein einziges Paket\n"
 
-#: lib/query.c:760
+#: lib/query.c:759
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "kein Paket triggert %s\n"
 
 # , c-format
-#: lib/query.c:774 lib/query.c:796 lib/query.c:814 lib/query.c:845
+#: lib/query.c:773 lib/query.c:795 lib/query.c:813 lib/query.c:844
 #, fuzzy, c-format
 msgid "malformed %s: %s\n"
 msgstr "Lesen von %s fehlgeschlagen: %s."
 
-#: lib/query.c:784 lib/query.c:802 lib/query.c:820 lib/query.c:850
+#: lib/query.c:783 lib/query.c:801 lib/query.c:819 lib/query.c:849
 #, fuzzy, c-format
 msgid "no package matches %s: %s\n"
 msgstr "kein Paket triggert %s\n"
 
-#: lib/query.c:861
+#: lib/query.c:860
 #, c-format
 msgid "no package requires %s\n"
 msgstr "kein Paket verlangt %s\n"
 
 # oder besser: ... listet %s auf? -ke-
-#: lib/query.c:872
+#: lib/query.c:871
 #, c-format
 msgid "no package provides %s\n"
 msgstr "kein Paket stellt %s bereit\n"
 
 # , c-format
-#: lib/query.c:906
+#: lib/query.c:905
 #, fuzzy, c-format
 msgid "file %s: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
 
-#: lib/query.c:910
+#: lib/query.c:909
 #, 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:937
+#: lib/query.c:936
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "ungültige Paket-Nummer: %s\n"
 
-#: lib/query.c:940
+#: lib/query.c:939
 #, fuzzy, c-format
 msgid "package record number: %u\n"
 msgstr "ungültige Paket-Nummer: %s\n"
 
-#: lib/query.c:945
+#: lib/query.c:944
 #, fuzzy, c-format
 msgid "record %u could not be read\n"
 msgstr "Eintrag %d konnte nicht gelesen werden\n"
 
-#: lib/query.c:956 lib/rpminstall.c:633
+#: lib/query.c:955 lib/rpminstall.c:633
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "Paket %s ist nicht installiert\n"
@@ -2599,73 +2582,73 @@ msgstr "Öffnen von %s fehlgeschlagen: %s"
 msgid "(added provide)"
 msgstr "die Datei »%s« gehört zu keinem Paket\n"
 
-#: lib/rpmchecksig.c:51
+#: lib/rpmchecksig.c:54
 #, fuzzy, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s: Öffnen fehlgeschlagen\n"
 
-#: lib/rpmchecksig.c:63
+#: lib/rpmchecksig.c:66
 #, fuzzy
 msgid "makeTempFile failed\n"
 msgstr "%s: Öffnen fehlgeschlagen\n"
 
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:107
 #, fuzzy, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: »readLead« fehlgeschlagen\n"
 
-#: lib/rpmchecksig.c:166
+#: lib/rpmchecksig.c:169
 #, fuzzy, c-format
 msgid "%s: Can't sign v1 packaging\n"
 msgstr "%s: Kann v1.0-RPM nicht signieren\n"
 
-#: lib/rpmchecksig.c:170
+#: lib/rpmchecksig.c:173
 #, fuzzy, c-format
 msgid "%s: Can't re-sign v2 packaging\n"
 msgstr "%s: Kann v2.0-RPM nicht erneuert signieren\n"
 
-#: lib/rpmchecksig.c:239
+#: lib/rpmchecksig.c:244
 #, fuzzy, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: »readLead« fehlgeschlagen\n"
 
-#: lib/rpmchecksig.c:245
+#: lib/rpmchecksig.c:250
 #, fuzzy, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: »rpmReadSignature« fehlgeschlagen\n"
 
-#: lib/rpmchecksig.c:476
+#: lib/rpmchecksig.c:481
 #, fuzzy, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr "%s: »readLead« fehlgeschlagen\n"
 
-#: lib/rpmchecksig.c:547
+#: lib/rpmchecksig.c:554
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: Keine Signatur verfügbar (v1.0 RPM)\n"
 
-#: lib/rpmchecksig.c:773
+#: lib/rpmchecksig.c:801
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:774 lib/rpmchecksig.c:788
+#: lib/rpmchecksig.c:802 lib/rpmchecksig.c:816
 #, fuzzy
 msgid " (MISSING KEYS:"
 msgstr " (FEHLENDE SCHLüSSEL)"
 
-#: lib/rpmchecksig.c:776 lib/rpmchecksig.c:790
+#: lib/rpmchecksig.c:804 lib/rpmchecksig.c:818
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:777 lib/rpmchecksig.c:791
+#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:779 lib/rpmchecksig.c:793
+#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:787
+#: lib/rpmchecksig.c:815
 msgid "OK"
 msgstr ""
 
@@ -2882,147 +2865,147 @@ msgstr ""
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "Datei %s kann nicht zum Lesen geöffnet werden: %s."
 
-#: lib/signature.c:118
+#: lib/signature.c:119
 msgid "file is not regular -- skipping size check\n"
 msgstr ""
 
-#: lib/signature.c:127
+#: lib/signature.c:128
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:132
+#: lib/signature.c:133
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:152
+#: lib/signature.c:153
 #, fuzzy
 msgid "No signature\n"
 msgstr "%s: Keine Signatur verfügbar\n"
 
-#: lib/signature.c:156
+#: lib/signature.c:157
 #, fuzzy
 msgid "Old PGP signature\n"
 msgstr "PGP-Signatur generieren"
 
-#: lib/signature.c:169
+#: lib/signature.c:170
 #, fuzzy
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr "Alte Signatur (nur intern)!  Wie bist du daran gekommen!?"
 
-#: lib/signature.c:225
+#: lib/signature.c:226
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:677
-#: lib/signature.c:710
+#: lib/signature.c:307 lib/signature.c:406 lib/signature.c:678
+#: lib/signature.c:711
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "Konnte pgp nicht durchführen"
 
-#: lib/signature.c:322
+#: lib/signature.c:323
 #, fuzzy
 msgid "pgp failed\n"
 msgstr "pgp fehlgeschlagen"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:329
+#: lib/signature.c:330
 #, fuzzy
 msgid "pgp failed to write signature\n"
 msgstr "pgp fehlgeschlagen beim Schreiben der Signatur"
 
-#: lib/signature.c:334
+#: lib/signature.c:335
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:350 lib/signature.c:450
+#: lib/signature.c:351 lib/signature.c:451
 #, fuzzy
 msgid "unable to read the signature\n"
 msgstr "nicht möglich, die Signatur zu lesen"
 
-#: lib/signature.c:355
+#: lib/signature.c:356
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:422
+#: lib/signature.c:423
 #, fuzzy
 msgid "gpg failed\n"
 msgstr "pgp fehlgeschlagen"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:429
+#: lib/signature.c:430
 #, fuzzy
 msgid "gpg failed to write signature\n"
 msgstr "pgp fehlgeschlagen beim Schreiben der Signatur"
 
-#: lib/signature.c:434
+#: lib/signature.c:435
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:455
+#: lib/signature.c:456
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:715 lib/signature.c:770
+#: lib/signature.c:716 lib/signature.c:771
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:749
+#: lib/signature.c:750
 #, fuzzy, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "\"pgp_name:\" muss in der rpmrc-Datei gesetzt sein"
 
-#: lib/signature.c:762
+#: lib/signature.c:763
 #, fuzzy, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "\"pgp_name:\" muss in der rpmrc-Datei gesetzt sein"
 
-#: lib/signature.c:806
+#: lib/signature.c:807
 msgid "Header+Payload size: "
 msgstr ""
 
-#: lib/signature.c:846
+#: lib/signature.c:847
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:903
+#: lib/signature.c:906
 msgid "Header SHA1 digest: "
 msgstr ""
 
-#: lib/signature.c:1082
+#: lib/signature.c:1102
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "alle MD5-Signaturen überspringen"
 
-#: lib/signature.c:1199
+#: lib/signature.c:1221
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1200
+#: lib/signature.c:1222
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "%s: Keine Signatur verfügbar\n"
 
-#: lib/signature.c:1287
+#: lib/signature.c:1311
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1314
+#: lib/signature.c:1338
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1318
+#: lib/signature.c:1342
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
@@ -3676,6 +3659,18 @@ msgid "failed to create %s: %s\n"
 msgstr "anlegen von %s fehlgeschlagen\n"
 
 #, fuzzy
+#~ msgid "========== Header RSA signature\n"
+#~ msgstr "nicht möglich, die Signatur zu lesen"
+
+#, fuzzy
+#~ msgid "========== Header DSA signature\n"
+#~ msgstr "nicht möglich, die Signatur zu lesen"
+
+#, fuzzy
+#~ msgid "sign a package, discarding all current signatures"
+#~ msgstr "Ein Paket signieren (die aktuelle Signature wird verworfen)"
+
+#, fuzzy
 #~ msgid "Generating signature using PGP.\n"
 #~ msgstr "PGP-Signatur generieren"
 
diff --git a/po/fi.po b/po/fi.po
index d95fdb30a..f16a6c1f0 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-03-07 17:53-0500\n"
+"POT-Creation-Date: 2002-03-08 17:22-0500\n"
 "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
 "Language-Team: Finnish <linux@sot.com>\n"
 "Content-Type: text/plain; charset=\n"
@@ -1636,65 +1636,48 @@ msgstr "en voinut avata tiedostoa %s: "
 msgid "error creating temporary file %s\n"
 msgstr "virhe luotaessa hakemistoa %s: %s"
 
-#: lib/package.c:181 lib/package.c:257
+#: lib/package.c:184 lib/package.c:260
 #, 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:202 lib/package.c:265
+#: lib/package.c:205 lib/package.c:268
 #, 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:243 lib/rpmchecksig.c:161 lib/rpmchecksig.c:541
+#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:548
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: readLead  epäonnistui\n"
 
-#: lib/package.c:249
+#: lib/package.c:252
 #, c-format
 msgid "%s: bad magic\n"
 msgstr ""
 
-#: lib/package.c:274 lib/rpmchecksig.c:179 lib/rpmchecksig.c:557
+#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:564
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: rpmReadSignature epäonnistui\n"
 
-#: lib/package.c:278 lib/rpmchecksig.c:183 lib/rpmchecksig.c:562
+#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:569
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Ei allekirjoitusta saatavilla\n"
 
-#: lib/package.c:308 lib/rpmchecksig.c:462
+#: lib/package.c:331 lib/rpmchecksig.c:467
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: readLead  epäonnistui\n"
 
-#. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:338
-#, fuzzy
-msgid "========== Header RSA signature\n"
-msgstr "en voinut lukea allekirjoitusta"
-
-#: lib/package.c:343 lib/package.c:371 lib/package.c:403 lib/rpmchecksig.c:631
+#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:642
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
-#. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:366
-#, fuzzy
-msgid "========== Header DSA signature\n"
-msgstr "en voinut lukea allekirjoitusta"
-
-#. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:397
-msgid "========== Package DSA/RSA signature\n"
-msgstr ""
-
-#: lib/package.c:415 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
+#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:496
 #, fuzzy, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: readLead  epäonnistui\n"
@@ -2059,7 +2042,7 @@ msgstr ""
 msgid "display a verbose file listing"
 msgstr "näytä paketin tiedostolistaus"
 
-#: lib/poptQV.c:240 lib/poptQV.c:282 lib/poptQV.c:316
+#: lib/poptQV.c:240
 #, fuzzy
 msgid "don't verify MD5 digest of files"
 msgstr "asenna paketti"
@@ -2108,46 +2091,46 @@ msgstr "älä tarkista paketin riippuvuuksia"
 msgid "don't execute verify script(s)"
 msgstr "älä suorita mitään vaiheita"
 
-#: lib/poptQV.c:275
+#: lib/poptQV.c:275 lib/poptQV.c:313
 #, fuzzy
 msgid "don't verify digest(s)"
 msgstr "asenna paketti"
 
-#: lib/poptQV.c:278
+#: lib/poptQV.c:278 lib/poptQV.c:316
 #, fuzzy
 msgid "don't verify signature(s)"
 msgstr "asenna paketti"
 
-#: lib/poptQV.c:286 lib/poptQV.c:320
+#: lib/poptQV.c:283
 #, fuzzy
 msgid "don't verify GPG V3 DSA signature(s)"
 msgstr "asenna paketti"
 
-#: lib/poptQV.c:289 lib/poptQV.c:323
+#: lib/poptQV.c:286
 #, fuzzy
 msgid "don't verify PGP V3 RSA/MD5 signature(s)"
 msgstr "asenna paketti"
 
-#: lib/poptQV.c:304
+#: lib/poptQV.c:301
 #, fuzzy
-msgid "sign a package, preserving other existing signatures"
+msgid "sign a package, preserving digests"
 msgstr "allekirjoita paketti (hylkää nykyinen allekirjoitus)"
 
-#: lib/poptQV.c:306
+#: lib/poptQV.c:303
 #, fuzzy
 msgid "verify package signature(s)"
 msgstr "tarkista paketin allekirjoitus"
 
-#: lib/poptQV.c:308
+#: lib/poptQV.c:305
 msgid "import an armored public key"
 msgstr ""
 
-#: lib/poptQV.c:310
+#: lib/poptQV.c:307
 #, fuzzy
-msgid "sign a package, discarding all current signatures"
+msgid "sign a package, recomputing digests"
 msgstr "allekirjoita paketti (hylkää nykyinen allekirjoitus)"
 
-#: lib/poptQV.c:312
+#: lib/poptQV.c:309
 #, fuzzy
 msgid "generate signature"
 msgstr "generoi PGP-allekirjoitus"
@@ -2316,132 +2299,132 @@ msgstr "pgp epäonnistui"
 msgid "incorrect format: %s\n"
 msgstr "virhe formaatissa: %s\n"
 
-#: lib/query.c:221
+#: lib/query.c:220
 msgid "(contains no files)"
 msgstr "(ei tiedostoja)"
 
-#: lib/query.c:282
+#: lib/query.c:281
 msgid "normal        "
 msgstr ""
 
-#: lib/query.c:285
+#: lib/query.c:284
 msgid "replaced      "
 msgstr ""
 
-#: lib/query.c:288
+#: lib/query.c:287
 #, fuzzy
 msgid "not installed "
 msgstr "paketti %s ei ole asennettu\n"
 
-#: lib/query.c:291
+#: lib/query.c:290
 msgid "net shared    "
 msgstr ""
 
-#: lib/query.c:294
+#: lib/query.c:293
 #, fuzzy, c-format
 msgid "(unknown %3d) "
 msgstr "(tuntematon tyyppi)"
 
-#: lib/query.c:299
+#: lib/query.c:298
 msgid "(no state)    "
 msgstr ""
 
-#: lib/query.c:318 lib/query.c:374
+#: lib/query.c:317 lib/query.c:373
 #, fuzzy
 msgid "package has neither file owner or id lists\n"
 msgstr "paketilla ei ole nimeä"
 
-#: lib/query.c:463
+#: lib/query.c:462
 #, fuzzy, c-format
 msgid "can't query %s: %s\n"
 msgstr "virhe: en voi avata %s\n"
 
-#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:333 lib/rpminstall.c:475
+#: lib/query.c:616 lib/query.c:654 lib/rpminstall.c:333 lib/rpminstall.c:475
 #: lib/rpminstall.c:845
 #, fuzzy, c-format
 msgid "open of %s failed: %s\n"
 msgstr "%s:n avaus ei onnistunut: %s\n"
 
-#: lib/query.c:633
+#: lib/query.c:632
 #, c-format
 msgid "query of %s failed\n"
 msgstr "%s:n kysely ei onnistunut\n"
 
-#: lib/query.c:639
+#: lib/query.c:638
 msgid "old format source packages cannot be queried\n"
 msgstr "vanhan formaatin lähdekoodipaketteja ei voi kysellä\n"
 
-#: lib/query.c:665 lib/rpminstall.c:488
+#: lib/query.c:664 lib/rpminstall.c:488
 #, fuzzy, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: readLead  epäonnistui\n"
 
-#: lib/query.c:709
+#: lib/query.c:708
 #, fuzzy, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "%s:n kysely ei onnistunut\n"
 
-#: lib/query.c:730
+#: lib/query.c:729
 #, fuzzy
 msgid "no packages\n"
 msgstr "kysele kaikki paketit"
 
-#: lib/query.c:750
+#: lib/query.c:749
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "ryhmässä %s ei ole paketteja\n"
 
-#: lib/query.c:760
+#: lib/query.c:759
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "mikään paketti ei laukaise %s:a\n"
 
-#: lib/query.c:774 lib/query.c:796 lib/query.c:814 lib/query.c:845
+#: lib/query.c:773 lib/query.c:795 lib/query.c:813 lib/query.c:844
 #, fuzzy, c-format
 msgid "malformed %s: %s\n"
 msgstr "En voi lukea %s: %s."
 
-#: lib/query.c:784 lib/query.c:802 lib/query.c:820 lib/query.c:850
+#: lib/query.c:783 lib/query.c:801 lib/query.c:819 lib/query.c:849
 #, fuzzy, c-format
 msgid "no package matches %s: %s\n"
 msgstr "mikään paketti ei laukaise %s:a\n"
 
-#: lib/query.c:861
+#: lib/query.c:860
 #, c-format
 msgid "no package requires %s\n"
 msgstr "mikään pakettie ei tarvitse %s:a\n"
 
-#: lib/query.c:872
+#: lib/query.c:871
 #, c-format
 msgid "no package provides %s\n"
 msgstr "mikään paketti ei tarjoa %s:a\n"
 
-#: lib/query.c:906
+#: lib/query.c:905
 #, fuzzy, c-format
 msgid "file %s: %s\n"
 msgstr "en voinut avata %s: %s"
 
-#: lib/query.c:910
+#: lib/query.c:909
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "tiedostoa %s ei omista mikään paketti\n"
 
-#: lib/query.c:937
+#: lib/query.c:936
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "virheellinen paketin numero: %s\n"
 
-#: lib/query.c:940
+#: lib/query.c:939
 #, fuzzy, c-format
 msgid "package record number: %u\n"
 msgstr "virheellinen paketin numero: %s\n"
 
-#: lib/query.c:945
+#: lib/query.c:944
 #, fuzzy, c-format
 msgid "record %u could not be read\n"
 msgstr "tietuetta %d ei voitu lukea\n"
 
-#: lib/query.c:956 lib/rpminstall.c:633
+#: lib/query.c:955 lib/rpminstall.c:633
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "paketti %s ei ole asennettu\n"
@@ -2456,73 +2439,73 @@ msgstr "en voinut avata %s: %s"
 msgid "(added provide)"
 msgstr "tiedostoa %s ei omista mikään paketti\n"
 
-#: lib/rpmchecksig.c:51
+#: lib/rpmchecksig.c:54
 #, fuzzy, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s: avaus ei onnistunut\n"
 
-#: lib/rpmchecksig.c:63
+#: lib/rpmchecksig.c:66
 #, fuzzy
 msgid "makeTempFile failed\n"
 msgstr "%s: avaus ei onnistunut\n"
 
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:107
 #, fuzzy, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: readLead  epäonnistui\n"
 
-#: lib/rpmchecksig.c:166
+#: lib/rpmchecksig.c:169
 #, fuzzy, c-format
 msgid "%s: Can't sign v1 packaging\n"
 msgstr "%s: En voi allekirjoittaa v1.0 RPM:ää\n"
 
-#: lib/rpmchecksig.c:170
+#: lib/rpmchecksig.c:173
 #, fuzzy, c-format
 msgid "%s: Can't re-sign v2 packaging\n"
 msgstr "%s: En voi uudelleen allekirjoittaa v2.0 RPM:ää\n"
 
-#: lib/rpmchecksig.c:239
+#: lib/rpmchecksig.c:244
 #, fuzzy, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: readLead  epäonnistui\n"
 
-#: lib/rpmchecksig.c:245
+#: lib/rpmchecksig.c:250
 #, fuzzy, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmReadSignature epäonnistui\n"
 
-#: lib/rpmchecksig.c:476
+#: lib/rpmchecksig.c:481
 #, fuzzy, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr "%s: readLead  epäonnistui\n"
 
-#: lib/rpmchecksig.c:547
+#: lib/rpmchecksig.c:554
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: Ei allekirjoitusta saatavilla (v1.0 RPM)\n"
 
-#: lib/rpmchecksig.c:773
+#: lib/rpmchecksig.c:801
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:774 lib/rpmchecksig.c:788
+#: lib/rpmchecksig.c:802 lib/rpmchecksig.c:816
 #, fuzzy
 msgid " (MISSING KEYS:"
 msgstr "(PUUTTUVAT AVAIMET)"
 
-#: lib/rpmchecksig.c:776 lib/rpmchecksig.c:790
+#: lib/rpmchecksig.c:804 lib/rpmchecksig.c:818
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:777 lib/rpmchecksig.c:791
+#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:779 lib/rpmchecksig.c:793
+#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:787
+#: lib/rpmchecksig.c:815
 msgid "OK"
 msgstr ""
 
@@ -2734,147 +2717,147 @@ msgstr ""
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "En voi avata %s luettavaksi: %s."
 
-#: lib/signature.c:118
+#: lib/signature.c:119
 msgid "file is not regular -- skipping size check\n"
 msgstr ""
 
-#: lib/signature.c:127
+#: lib/signature.c:128
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:132
+#: lib/signature.c:133
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:152
+#: lib/signature.c:153
 #, fuzzy
 msgid "No signature\n"
 msgstr "%s: Ei allekirjoitusta saatavilla\n"
 
-#: lib/signature.c:156
+#: lib/signature.c:157
 #, fuzzy
 msgid "Old PGP signature\n"
 msgstr "generoi PGP-allekirjoitus"
 
-#: lib/signature.c:169
+#: lib/signature.c:170
 #, fuzzy
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr "Vanha (sisäisen käytön) allekirjoitus! Mistä sait sen!?"
 
-#: lib/signature.c:225
+#: lib/signature.c:226
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:677
-#: lib/signature.c:710
+#: lib/signature.c:307 lib/signature.c:406 lib/signature.c:678
+#: lib/signature.c:711
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "En voinut ajaa pgp:tä"
 
-#: lib/signature.c:322
+#: lib/signature.c:323
 #, fuzzy
 msgid "pgp failed\n"
 msgstr "pgp epäonnistui"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:329
+#: lib/signature.c:330
 #, fuzzy
 msgid "pgp failed to write signature\n"
 msgstr "pgp ei voinut kirjoittaa allekirjoitusta"
 
-#: lib/signature.c:334
+#: lib/signature.c:335
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:350 lib/signature.c:450
+#: lib/signature.c:351 lib/signature.c:451
 #, fuzzy
 msgid "unable to read the signature\n"
 msgstr "en voinut lukea allekirjoitusta"
 
-#: lib/signature.c:355
+#: lib/signature.c:356
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:422
+#: lib/signature.c:423
 #, fuzzy
 msgid "gpg failed\n"
 msgstr "pgp epäonnistui"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:429
+#: lib/signature.c:430
 #, fuzzy
 msgid "gpg failed to write signature\n"
 msgstr "pgp ei voinut kirjoittaa allekirjoitusta"
 
-#: lib/signature.c:434
+#: lib/signature.c:435
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:455
+#: lib/signature.c:456
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:715 lib/signature.c:770
+#: lib/signature.c:716 lib/signature.c:771
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:749
+#: lib/signature.c:750
 #, fuzzy, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "Sinun pitää asettaa \"pgp_name:\" rpmrc-tiedostossa"
 
-#: lib/signature.c:762
+#: lib/signature.c:763
 #, fuzzy, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "Sinun pitää asettaa \"pgp_name:\" rpmrc-tiedostossa"
 
-#: lib/signature.c:806
+#: lib/signature.c:807
 msgid "Header+Payload size: "
 msgstr ""
 
-#: lib/signature.c:846
+#: lib/signature.c:847
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:903
+#: lib/signature.c:906
 msgid "Header SHA1 digest: "
 msgstr ""
 
-#: lib/signature.c:1082
+#: lib/signature.c:1102
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "ohita MD5-allekirjoitukset"
 
-#: lib/signature.c:1199
+#: lib/signature.c:1221
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1200
+#: lib/signature.c:1222
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "%s: Ei allekirjoitusta saatavilla\n"
 
-#: lib/signature.c:1287
+#: lib/signature.c:1311
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1314
+#: lib/signature.c:1338
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1318
+#: lib/signature.c:1342
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
@@ -3518,6 +3501,18 @@ msgid "failed to create %s: %s\n"
 msgstr "%s:n luonti epäonnistui\n"
 
 #, fuzzy
+#~ msgid "========== Header RSA signature\n"
+#~ msgstr "en voinut lukea allekirjoitusta"
+
+#, fuzzy
+#~ msgid "========== Header DSA signature\n"
+#~ msgstr "en voinut lukea allekirjoitusta"
+
+#, fuzzy
+#~ msgid "sign a package, discarding all current signatures"
+#~ msgstr "allekirjoita paketti (hylkää nykyinen allekirjoitus)"
+
+#, fuzzy
 #~ msgid "Generating signature using PGP.\n"
 #~ msgstr "generoi PGP-allekirjoitus"
 
diff --git a/po/fr.po b/po/fr.po
index 2847e29ab..fca085aac 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-03-07 17:53-0500\n"
+"POT-Creation-Date: 2002-03-08 17:22-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1671,63 +1671,46 @@ msgstr "impossible d'ouvrir: %s\n"
 msgid "error creating temporary file %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/package.c:181 lib/package.c:257
+#: lib/package.c:184 lib/package.c:260
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:202 lib/package.c:265
+#: lib/package.c:205 lib/package.c:268
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:243 lib/rpmchecksig.c:161 lib/rpmchecksig.c:541
+#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:548
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
 
-#: lib/package.c:249
+#: lib/package.c:252
 #, c-format
 msgid "%s: bad magic\n"
 msgstr ""
 
-#: lib/package.c:274 lib/rpmchecksig.c:179 lib/rpmchecksig.c:557
+#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:564
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/package.c:278 lib/rpmchecksig.c:183 lib/rpmchecksig.c:562
+#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:569
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/package.c:308 lib/rpmchecksig.c:462
+#: lib/package.c:331 lib/rpmchecksig.c:467
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:338
-#, fuzzy
-msgid "========== Header RSA signature\n"
-msgstr "      --sign            - genre une signature PGP"
-
-#: lib/package.c:343 lib/package.c:371 lib/package.c:403 lib/rpmchecksig.c:631
+#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:642
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
-#. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:366
-#, fuzzy
-msgid "========== Header DSA signature\n"
-msgstr "      --sign            - genre une signature PGP"
-
-#. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:397
-msgid "========== Package DSA/RSA signature\n"
-msgstr ""
-
-#: lib/package.c:415 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
+#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:496
 #, fuzzy, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
@@ -2118,7 +2101,7 @@ msgstr ""
 msgid "display a verbose file listing"
 msgstr "        -l                - affiche la liste des packages"
 
-#: lib/poptQV.c:240 lib/poptQV.c:282 lib/poptQV.c:316
+#: lib/poptQV.c:240
 msgid "don't verify MD5 digest of files"
 msgstr ""
 
@@ -2163,44 +2146,44 @@ msgstr ""
 msgid "don't execute verify script(s)"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/poptQV.c:275
+#: lib/poptQV.c:275 lib/poptQV.c:313
 #, fuzzy
 msgid "don't verify digest(s)"
 msgstr ""
 "        -f <file>+        - interroge le package  qui appartient <file>"
 
-#: lib/poptQV.c:278
+#: lib/poptQV.c:278 lib/poptQV.c:316
 #, fuzzy
 msgid "don't verify signature(s)"
 msgstr ""
 "        -f <file>+        - interroge le package  qui appartient <file>"
 
-#: lib/poptQV.c:286 lib/poptQV.c:320
+#: lib/poptQV.c:283
 msgid "don't verify GPG V3 DSA signature(s)"
 msgstr ""
 
-#: lib/poptQV.c:289 lib/poptQV.c:323
+#: lib/poptQV.c:286
 msgid "don't verify PGP V3 RSA/MD5 signature(s)"
 msgstr ""
 
-#: lib/poptQV.c:304
-msgid "sign a package, preserving other existing signatures"
+#: lib/poptQV.c:301
+msgid "sign a package, preserving digests"
 msgstr ""
 
-#: lib/poptQV.c:306
+#: lib/poptQV.c:303
 #, fuzzy
 msgid "verify package signature(s)"
 msgstr "      --sign            - genre une signature PGP"
 
-#: lib/poptQV.c:308
+#: lib/poptQV.c:305
 msgid "import an armored public key"
 msgstr ""
 
-#: lib/poptQV.c:310
-msgid "sign a package, discarding all current signatures"
+#: lib/poptQV.c:307
+msgid "sign a package, recomputing digests"
 msgstr ""
 
-#: lib/poptQV.c:312
+#: lib/poptQV.c:309
 #, fuzzy
 msgid "generate signature"
 msgstr "      --sign            - genre une signature PGP"
@@ -2368,132 +2351,132 @@ msgstr "La construction a chou.\n"
 msgid "incorrect format: %s\n"
 msgstr ""
 
-#: lib/query.c:221
+#: lib/query.c:220
 msgid "(contains no files)"
 msgstr ""
 
-#: lib/query.c:282
+#: lib/query.c:281
 msgid "normal        "
 msgstr ""
 
-#: lib/query.c:285
+#: lib/query.c:284
 msgid "replaced      "
 msgstr ""
 
-#: lib/query.c:288
+#: lib/query.c:287
 #, fuzzy
 msgid "not installed "
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: lib/query.c:291
+#: lib/query.c:290
 msgid "net shared    "
 msgstr ""
 
-#: lib/query.c:294
+#: lib/query.c:293
 #, c-format
 msgid "(unknown %3d) "
 msgstr ""
 
-#: lib/query.c:299
+#: lib/query.c:298
 msgid "(no state)    "
 msgstr ""
 
-#: lib/query.c:318 lib/query.c:374
+#: lib/query.c:317 lib/query.c:373
 #, fuzzy
 msgid "package has neither file owner or id lists\n"
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: lib/query.c:463
+#: lib/query.c:462
 #, fuzzy, c-format
 msgid "can't query %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:333 lib/rpminstall.c:475
+#: lib/query.c:616 lib/query.c:654 lib/rpminstall.c:333 lib/rpminstall.c:475
 #: lib/rpminstall.c:845
 #, fuzzy, c-format
 msgid "open of %s failed: %s\n"
 msgstr "La construction a chou.\n"
 
-#: lib/query.c:633
+#: lib/query.c:632
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:639
+#: lib/query.c:638
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:665 lib/rpminstall.c:488
+#: lib/query.c:664 lib/rpminstall.c:488
 #, fuzzy, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/query.c:709
+#: lib/query.c:708
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:730
+#: lib/query.c:729
 #, fuzzy
 msgid "no packages\n"
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: lib/query.c:750
+#: lib/query.c:749
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:760
+#: lib/query.c:759
 #, fuzzy, c-format
 msgid "no package triggers %s\n"
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: lib/query.c:774 lib/query.c:796 lib/query.c:814 lib/query.c:845
+#: lib/query.c:773 lib/query.c:795 lib/query.c:813 lib/query.c:844
 #, fuzzy, c-format
 msgid "malformed %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/query.c:784 lib/query.c:802 lib/query.c:820 lib/query.c:850
+#: lib/query.c:783 lib/query.c:801 lib/query.c:819 lib/query.c:849
 #, fuzzy, c-format
 msgid "no package matches %s: %s\n"
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: lib/query.c:861
+#: lib/query.c:860
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:872
+#: lib/query.c:871
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:906
+#: lib/query.c:905
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:910
+#: lib/query.c:909
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:937
+#: lib/query.c:936
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:940
+#: lib/query.c:939
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:945
+#: lib/query.c:944
 #, c-format
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:956 lib/rpminstall.c:633
+#: lib/query.c:955 lib/rpminstall.c:633
 #, fuzzy, c-format
 msgid "package %s is not installed\n"
 msgstr "aucun package n'a t spcifi pour l'installation"
@@ -2507,72 +2490,72 @@ msgstr "impossible d'ouvrir: %s\n"
 msgid "(added provide)"
 msgstr ""
 
-#: lib/rpmchecksig.c:51
+#: lib/rpmchecksig.c:54
 #, fuzzy, c-format
 msgid "%s: open failed: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmchecksig.c:63
+#: lib/rpmchecksig.c:66
 #, fuzzy
 msgid "makeTempFile failed\n"
 msgstr "La construction a chou.\n"
 
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:107
 #, fuzzy, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmchecksig.c:166
+#: lib/rpmchecksig.c:169
 #, c-format
 msgid "%s: Can't sign v1 packaging\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:170
+#: lib/rpmchecksig.c:173
 #, c-format
 msgid "%s: Can't re-sign v2 packaging\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:239
+#: lib/rpmchecksig.c:244
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:245
+#: lib/rpmchecksig.c:250
 #, fuzzy, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmchecksig.c:476
+#: lib/rpmchecksig.c:481
 #, fuzzy, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmchecksig.c:547
+#: lib/rpmchecksig.c:554
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:773
+#: lib/rpmchecksig.c:801
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:774 lib/rpmchecksig.c:788
+#: lib/rpmchecksig.c:802 lib/rpmchecksig.c:816
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:776 lib/rpmchecksig.c:790
+#: lib/rpmchecksig.c:804 lib/rpmchecksig.c:818
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:777 lib/rpmchecksig.c:791
+#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:779 lib/rpmchecksig.c:793
+#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:787
+#: lib/rpmchecksig.c:815
 msgid "OK"
 msgstr ""
 
@@ -2783,144 +2766,144 @@ msgstr ""
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/signature.c:118
+#: lib/signature.c:119
 msgid "file is not regular -- skipping size check\n"
 msgstr ""
 
-#: lib/signature.c:127
+#: lib/signature.c:128
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:132
+#: lib/signature.c:133
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:152
+#: lib/signature.c:153
 msgid "No signature\n"
 msgstr ""
 
-#: lib/signature.c:156
+#: lib/signature.c:157
 #, fuzzy
 msgid "Old PGP signature\n"
 msgstr "      --sign            - genre une signature PGP"
 
-#: lib/signature.c:169
+#: lib/signature.c:170
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr ""
 
-#: lib/signature.c:225
+#: lib/signature.c:226
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:677
-#: lib/signature.c:710
+#: lib/signature.c:307 lib/signature.c:406 lib/signature.c:678
+#: lib/signature.c:711
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/signature.c:322
+#: lib/signature.c:323
 #, fuzzy
 msgid "pgp failed\n"
 msgstr "La construction a chou.\n"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:329
+#: lib/signature.c:330
 #, fuzzy
 msgid "pgp failed to write signature\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/signature.c:334
+#: lib/signature.c:335
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:350 lib/signature.c:450
+#: lib/signature.c:351 lib/signature.c:451
 #, fuzzy
 msgid "unable to read the signature\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/signature.c:355
+#: lib/signature.c:356
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:422
+#: lib/signature.c:423
 #, fuzzy
 msgid "gpg failed\n"
 msgstr "La construction a chou.\n"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:429
+#: lib/signature.c:430
 #, fuzzy
 msgid "gpg failed to write signature\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/signature.c:434
+#: lib/signature.c:435
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:455
+#: lib/signature.c:456
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:715 lib/signature.c:770
+#: lib/signature.c:716 lib/signature.c:771
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:749
+#: lib/signature.c:750
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:762
+#: lib/signature.c:763
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:806
+#: lib/signature.c:807
 msgid "Header+Payload size: "
 msgstr ""
 
-#: lib/signature.c:846
+#: lib/signature.c:847
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:903
+#: lib/signature.c:906
 msgid "Header SHA1 digest: "
 msgstr ""
 
-#: lib/signature.c:1082
+#: lib/signature.c:1102
 msgid "V3 RSA/MD5 signature: "
 msgstr ""
 
-#: lib/signature.c:1199
+#: lib/signature.c:1221
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1200
+#: lib/signature.c:1222
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "      --sign            - genre une signature PGP"
 
-#: lib/signature.c:1287
+#: lib/signature.c:1311
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1314
+#: lib/signature.c:1338
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1318
+#: lib/signature.c:1342
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
@@ -3552,6 +3535,14 @@ msgid "failed to create %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
 #, fuzzy
+#~ msgid "========== Header RSA signature\n"
+#~ msgstr "      --sign            - genre une signature PGP"
+
+#, fuzzy
+#~ msgid "========== Header DSA signature\n"
+#~ msgstr "      --sign            - genre une signature PGP"
+
+#, fuzzy
 #~ msgid "Generating signature using PGP.\n"
 #~ msgstr "      --sign            - genre une signature PGP"
 
diff --git a/po/gl.po b/po/gl.po
index 354016283..07a286d73 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2002-03-07 17:53-0500\n"
+"POT-Creation-Date: 2002-03-08 17:22-0500\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"
@@ -1582,61 +1582,46 @@ msgstr ""
 msgid "error creating temporary file %s\n"
 msgstr ""
 
-#: lib/package.c:181 lib/package.c:257
+#: lib/package.c:184 lib/package.c:260
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:202 lib/package.c:265
+#: lib/package.c:205 lib/package.c:268
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:243 lib/rpmchecksig.c:161 lib/rpmchecksig.c:541
+#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:548
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
 
-#: lib/package.c:249
+#: lib/package.c:252
 #, c-format
 msgid "%s: bad magic\n"
 msgstr ""
 
-#: lib/package.c:274 lib/rpmchecksig.c:179 lib/rpmchecksig.c:557
+#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:564
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/package.c:278 lib/rpmchecksig.c:183 lib/rpmchecksig.c:562
+#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:569
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/package.c:308 lib/rpmchecksig.c:462
+#: lib/package.c:331 lib/rpmchecksig.c:467
 #, c-format
 msgid "%s: headerRead failed\n"
 msgstr ""
 
-#. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:338
-msgid "========== Header RSA signature\n"
-msgstr ""
-
-#: lib/package.c:343 lib/package.c:371 lib/package.c:403 lib/rpmchecksig.c:631
+#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:642
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
-#. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:366
-msgid "========== Header DSA signature\n"
-msgstr ""
-
-#. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:397
-msgid "========== Package DSA/RSA signature\n"
-msgstr ""
-
-#: lib/package.c:415 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
+#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:496
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr ""
@@ -1968,7 +1953,7 @@ msgstr ""
 msgid "display a verbose file listing"
 msgstr ""
 
-#: lib/poptQV.c:240 lib/poptQV.c:282 lib/poptQV.c:316
+#: lib/poptQV.c:240
 msgid "don't verify MD5 digest of files"
 msgstr ""
 
@@ -2008,39 +1993,39 @@ msgstr ""
 msgid "don't execute verify script(s)"
 msgstr ""
 
-#: lib/poptQV.c:275
+#: lib/poptQV.c:275 lib/poptQV.c:313
 msgid "don't verify digest(s)"
 msgstr ""
 
-#: lib/poptQV.c:278
+#: lib/poptQV.c:278 lib/poptQV.c:316
 msgid "don't verify signature(s)"
 msgstr ""
 
-#: lib/poptQV.c:286 lib/poptQV.c:320
+#: lib/poptQV.c:283
 msgid "don't verify GPG V3 DSA signature(s)"
 msgstr ""
 
-#: lib/poptQV.c:289 lib/poptQV.c:323
+#: lib/poptQV.c:286
 msgid "don't verify PGP V3 RSA/MD5 signature(s)"
 msgstr ""
 
-#: lib/poptQV.c:304
-msgid "sign a package, preserving other existing signatures"
+#: lib/poptQV.c:301
+msgid "sign a package, preserving digests"
 msgstr ""
 
-#: lib/poptQV.c:306
+#: lib/poptQV.c:303
 msgid "verify package signature(s)"
 msgstr ""
 
-#: lib/poptQV.c:308
+#: lib/poptQV.c:305
 msgid "import an armored public key"
 msgstr ""
 
-#: lib/poptQV.c:310
-msgid "sign a package, discarding all current signatures"
+#: lib/poptQV.c:307
+msgid "sign a package, recomputing digests"
 msgstr ""
 
-#: lib/poptQV.c:312
+#: lib/poptQV.c:309
 msgid "generate signature"
 msgstr ""
 
@@ -2205,129 +2190,129 @@ msgstr ""
 msgid "incorrect format: %s\n"
 msgstr ""
 
-#: lib/query.c:221
+#: lib/query.c:220
 msgid "(contains no files)"
 msgstr ""
 
-#: lib/query.c:282
+#: lib/query.c:281
 msgid "normal        "
 msgstr ""
 
-#: lib/query.c:285
+#: lib/query.c:284
 msgid "replaced      "
 msgstr ""
 
-#: lib/query.c:288
+#: lib/query.c:287
 msgid "not installed "
 msgstr ""
 
-#: lib/query.c:291
+#: lib/query.c:290
 msgid "net shared    "
 msgstr ""
 
-#: lib/query.c:294
+#: lib/query.c:293
 #, c-format
 msgid "(unknown %3d) "
 msgstr ""
 
-#: lib/query.c:299
+#: lib/query.c:298
 msgid "(no state)    "
 msgstr ""
 
-#: lib/query.c:318 lib/query.c:374
+#: lib/query.c:317 lib/query.c:373
 msgid "package has neither file owner or id lists\n"
 msgstr ""
 
-#: lib/query.c:463
+#: lib/query.c:462
 #, c-format
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:333 lib/rpminstall.c:475
+#: lib/query.c:616 lib/query.c:654 lib/rpminstall.c:333 lib/rpminstall.c:475
 #: lib/rpminstall.c:845
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:633
+#: lib/query.c:632
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:639
+#: lib/query.c:638
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:665 lib/rpminstall.c:488
+#: lib/query.c:664 lib/rpminstall.c:488
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr ""
 
-#: lib/query.c:709
+#: lib/query.c:708
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:730
+#: lib/query.c:729
 msgid "no packages\n"
 msgstr ""
 
-#: lib/query.c:750
+#: lib/query.c:749
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:760
+#: lib/query.c:759
 #, c-format
 msgid "no package triggers %s\n"
 msgstr ""
 
-#: lib/query.c:774 lib/query.c:796 lib/query.c:814 lib/query.c:845
+#: lib/query.c:773 lib/query.c:795 lib/query.c:813 lib/query.c:844
 #, c-format
 msgid "malformed %s: %s\n"
 msgstr ""
 
-#: lib/query.c:784 lib/query.c:802 lib/query.c:820 lib/query.c:850
+#: lib/query.c:783 lib/query.c:801 lib/query.c:819 lib/query.c:849
 #, c-format
 msgid "no package matches %s: %s\n"
 msgstr ""
 
-#: lib/query.c:861
+#: lib/query.c:860
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:872
+#: lib/query.c:871
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:906
+#: lib/query.c:905
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:910
+#: lib/query.c:909
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:937
+#: lib/query.c:936
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:940
+#: lib/query.c:939
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:945
+#: lib/query.c:944
 #, c-format
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:956 lib/rpminstall.c:633
+#: lib/query.c:955 lib/rpminstall.c:633
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
@@ -2340,71 +2325,71 @@ msgstr ""
 msgid "(added provide)"
 msgstr ""
 
-#: lib/rpmchecksig.c:51
+#: lib/rpmchecksig.c:54
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:63
+#: lib/rpmchecksig.c:66
 msgid "makeTempFile failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:107
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:166
+#: lib/rpmchecksig.c:169
 #, c-format
 msgid "%s: Can't sign v1 packaging\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:170
+#: lib/rpmchecksig.c:173
 #, c-format
 msgid "%s: Can't re-sign v2 packaging\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:239
+#: lib/rpmchecksig.c:244
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:245
+#: lib/rpmchecksig.c:250
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:476
+#: lib/rpmchecksig.c:481
 #, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:547
+#: lib/rpmchecksig.c:554
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:773
+#: lib/rpmchecksig.c:801
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:774 lib/rpmchecksig.c:788
+#: lib/rpmchecksig.c:802 lib/rpmchecksig.c:816
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:776 lib/rpmchecksig.c:790
+#: lib/rpmchecksig.c:804 lib/rpmchecksig.c:818
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:777 lib/rpmchecksig.c:791
+#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:779 lib/rpmchecksig.c:793
+#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:787
+#: lib/rpmchecksig.c:815
 msgid "OK"
 msgstr ""
 
@@ -2614,137 +2599,137 @@ msgstr ""
 msgid "Unable to open %s for reading: %s.\n"
 msgstr ""
 
-#: lib/signature.c:118
+#: lib/signature.c:119
 msgid "file is not regular -- skipping size check\n"
 msgstr ""
 
-#: lib/signature.c:127
+#: lib/signature.c:128
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:132
+#: lib/signature.c:133
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:152
+#: lib/signature.c:153
 msgid "No signature\n"
 msgstr ""
 
-#: lib/signature.c:156
+#: lib/signature.c:157
 msgid "Old PGP signature\n"
 msgstr ""
 
-#: lib/signature.c:169
+#: lib/signature.c:170
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr ""
 
-#: lib/signature.c:225
+#: lib/signature.c:226
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:677
-#: lib/signature.c:710
+#: lib/signature.c:307 lib/signature.c:406 lib/signature.c:678
+#: lib/signature.c:711
 #, c-format
 msgid "Could not exec %s: %s\n"
 msgstr ""
 
-#: lib/signature.c:322
+#: lib/signature.c:323
 msgid "pgp failed\n"
 msgstr ""
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:329
+#: lib/signature.c:330
 msgid "pgp failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:334
+#: lib/signature.c:335
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:350 lib/signature.c:450
+#: lib/signature.c:351 lib/signature.c:451
 msgid "unable to read the signature\n"
 msgstr ""
 
-#: lib/signature.c:355
+#: lib/signature.c:356
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:422
+#: lib/signature.c:423
 msgid "gpg failed\n"
 msgstr ""
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:429
+#: lib/signature.c:430
 msgid "gpg failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:434
+#: lib/signature.c:435
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:455
+#: lib/signature.c:456
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:715 lib/signature.c:770
+#: lib/signature.c:716 lib/signature.c:771
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:749
+#: lib/signature.c:750
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:762
+#: lib/signature.c:763
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:806
+#: lib/signature.c:807
 msgid "Header+Payload size: "
 msgstr ""
 
-#: lib/signature.c:846
+#: lib/signature.c:847
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:903
+#: lib/signature.c:906
 msgid "Header SHA1 digest: "
 msgstr ""
 
-#: lib/signature.c:1082
+#: lib/signature.c:1102
 msgid "V3 RSA/MD5 signature: "
 msgstr ""
 
-#: lib/signature.c:1199
+#: lib/signature.c:1221
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1200
+#: lib/signature.c:1222
 msgid "V3 DSA signature: "
 msgstr ""
 
-#: lib/signature.c:1287
+#: lib/signature.c:1311
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1314
+#: lib/signature.c:1338
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1318
+#: lib/signature.c:1342
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
diff --git a/po/is.po b/po/is.po
index 4ddb7bc7a..8084b1642 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-03-07 17:53-0500\n"
+"POT-Creation-Date: 2002-03-08 17:22-0500\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"
@@ -1589,61 +1589,46 @@ msgstr "%s búiğ til sem %s\n"
 msgid "error creating temporary file %s\n"
 msgstr ""
 
-#: lib/package.c:181 lib/package.c:257
+#: lib/package.c:184 lib/package.c:260
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:202 lib/package.c:265
+#: lib/package.c:205 lib/package.c:268
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:243 lib/rpmchecksig.c:161 lib/rpmchecksig.c:541
+#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:548
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
 
-#: lib/package.c:249
+#: lib/package.c:252
 #, c-format
 msgid "%s: bad magic\n"
 msgstr ""
 
-#: lib/package.c:274 lib/rpmchecksig.c:179 lib/rpmchecksig.c:557
+#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:564
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/package.c:278 lib/rpmchecksig.c:183 lib/rpmchecksig.c:562
+#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:569
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/package.c:308 lib/rpmchecksig.c:462
+#: lib/package.c:331 lib/rpmchecksig.c:467
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: Fseek brást: %s\n"
 
-#. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:338
-msgid "========== Header RSA signature\n"
-msgstr ""
-
-#: lib/package.c:343 lib/package.c:371 lib/package.c:403 lib/rpmchecksig.c:631
+#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:642
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
-#. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:366
-msgid "========== Header DSA signature\n"
-msgstr ""
-
-#. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:397
-msgid "========== Package DSA/RSA signature\n"
-msgstr ""
-
-#: lib/package.c:415 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
+#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:496
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr ""
@@ -1979,7 +1964,7 @@ msgstr ""
 msgid "display a verbose file listing"
 msgstr ""
 
-#: lib/poptQV.c:240 lib/poptQV.c:282 lib/poptQV.c:316
+#: lib/poptQV.c:240
 msgid "don't verify MD5 digest of files"
 msgstr "ekki yfirfara MD5 undirritun skráa"
 
@@ -2019,44 +2004,44 @@ msgstr "ekki skoğa pakkaskilyrğin"
 msgid "don't execute verify script(s)"
 msgstr ""
 
-#: lib/poptQV.c:275
+#: lib/poptQV.c:275 lib/poptQV.c:313
 #, fuzzy
 msgid "don't verify digest(s)"
 msgstr "ekki yfirfara MD5 undirritun skráa"
 
-#: lib/poptQV.c:278
+#: lib/poptQV.c:278 lib/poptQV.c:316
 #, fuzzy
 msgid "don't verify signature(s)"
 msgstr "ekki yfirfara symlink slóğ skráa"
 
-#: lib/poptQV.c:286 lib/poptQV.c:320
+#: lib/poptQV.c:283
 #, fuzzy
 msgid "don't verify GPG V3 DSA signature(s)"
 msgstr "ekki yfirfara SHA1 undirritunina"
 
-#: lib/poptQV.c:289 lib/poptQV.c:323
+#: lib/poptQV.c:286
 #, fuzzy
 msgid "don't verify PGP V3 RSA/MD5 signature(s)"
 msgstr "ekki yfirfara MD5 undirritun skráa"
 
-#: lib/poptQV.c:304
-msgid "sign a package, preserving other existing signatures"
+#: lib/poptQV.c:301
+msgid "sign a package, preserving digests"
 msgstr ""
 
-#: lib/poptQV.c:306
+#: lib/poptQV.c:303
 #, fuzzy
 msgid "verify package signature(s)"
 msgstr "búa til undirskrift"
 
-#: lib/poptQV.c:308
+#: lib/poptQV.c:305
 msgid "import an armored public key"
 msgstr ""
 
-#: lib/poptQV.c:310
-msgid "sign a package, discarding all current signatures"
+#: lib/poptQV.c:307
+msgid "sign a package, recomputing digests"
 msgstr ""
 
-#: lib/poptQV.c:312
+#: lib/poptQV.c:309
 msgid "generate signature"
 msgstr "búa til undirskrift"
 
@@ -2221,129 +2206,129 @@ msgstr "%s brást\n"
 msgid "incorrect format: %s\n"
 msgstr ""
 
-#: lib/query.c:221
+#: lib/query.c:220
 msgid "(contains no files)"
 msgstr ""
 
-#: lib/query.c:282
+#: lib/query.c:281
 msgid "normal        "
 msgstr ""
 
-#: lib/query.c:285
+#: lib/query.c:284
 msgid "replaced      "
 msgstr ""
 
-#: lib/query.c:288
+#: lib/query.c:287
 msgid "not installed "
 msgstr ""
 
-#: lib/query.c:291
+#: lib/query.c:290
 msgid "net shared    "
 msgstr ""
 
-#: lib/query.c:294
+#: lib/query.c:293
 #, c-format
 msgid "(unknown %3d) "
 msgstr ""
 
-#: lib/query.c:299
+#: lib/query.c:298
 msgid "(no state)    "
 msgstr ""
 
-#: lib/query.c:318 lib/query.c:374
+#: lib/query.c:317 lib/query.c:373
 msgid "package has neither file owner or id lists\n"
 msgstr ""
 
-#: lib/query.c:463
+#: lib/query.c:462
 #, c-format
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:333 lib/rpminstall.c:475
+#: lib/query.c:616 lib/query.c:654 lib/rpminstall.c:333 lib/rpminstall.c:475
 #: lib/rpminstall.c:845
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:633
+#: lib/query.c:632
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:639
+#: lib/query.c:638
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:665 lib/rpminstall.c:488
+#: lib/query.c:664 lib/rpminstall.c:488
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: gat ekki lesiğ manifest: %s\n"
 
-#: lib/query.c:709
+#: lib/query.c:708
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:730
+#: lib/query.c:729
 msgid "no packages\n"
 msgstr ""
 
-#: lib/query.c:750
+#: lib/query.c:749
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:760
+#: lib/query.c:759
 #, c-format
 msgid "no package triggers %s\n"
 msgstr ""
 
-#: lib/query.c:774 lib/query.c:796 lib/query.c:814 lib/query.c:845
+#: lib/query.c:773 lib/query.c:795 lib/query.c:813 lib/query.c:844
 #, fuzzy, c-format
 msgid "malformed %s: %s\n"
 msgstr "Get ekki lesiğ %s: %s.\n"
 
-#: lib/query.c:784 lib/query.c:802 lib/query.c:820 lib/query.c:850
+#: lib/query.c:783 lib/query.c:801 lib/query.c:819 lib/query.c:849
 #, fuzzy, c-format
 msgid "no package matches %s: %s\n"
 msgstr "gat ekki búiğ til %%%s %s\n"
 
-#: lib/query.c:861
+#: lib/query.c:860
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:872
+#: lib/query.c:871
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:906
+#: lib/query.c:905
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:910
+#: lib/query.c:909
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:937
+#: lib/query.c:936
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:940
+#: lib/query.c:939
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:945
+#: lib/query.c:944
 #, c-format
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:956 lib/rpminstall.c:633
+#: lib/query.c:955 lib/rpminstall.c:633
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
@@ -2356,71 +2341,71 @@ msgstr ""
 msgid "(added provide)"
 msgstr ""
 
-#: lib/rpmchecksig.c:51
+#: lib/rpmchecksig.c:54
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:63
+#: lib/rpmchecksig.c:66
 msgid "makeTempFile failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:107
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:166
+#: lib/rpmchecksig.c:169
 #, c-format
 msgid "%s: Can't sign v1 packaging\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:170
+#: lib/rpmchecksig.c:173
 #, c-format
 msgid "%s: Can't re-sign v2 packaging\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:239
+#: lib/rpmchecksig.c:244
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:245
+#: lib/rpmchecksig.c:250
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:476
+#: lib/rpmchecksig.c:481
 #, fuzzy, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr "%s: Fseek brást: %s\n"
 
-#: lib/rpmchecksig.c:547
+#: lib/rpmchecksig.c:554
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:773
+#: lib/rpmchecksig.c:801
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:774 lib/rpmchecksig.c:788
+#: lib/rpmchecksig.c:802 lib/rpmchecksig.c:816
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:776 lib/rpmchecksig.c:790
+#: lib/rpmchecksig.c:804 lib/rpmchecksig.c:818
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:777 lib/rpmchecksig.c:791
+#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:779 lib/rpmchecksig.c:793
+#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:787
+#: lib/rpmchecksig.c:815
 msgid "OK"
 msgstr ""
 
@@ -2630,137 +2615,137 @@ msgstr ""
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "Get ekki opnağ %s til lesturs: %s.\n"
 
-#: lib/signature.c:118
+#: lib/signature.c:119
 msgid "file is not regular -- skipping size check\n"
 msgstr ""
 
-#: lib/signature.c:127
+#: lib/signature.c:128
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:132
+#: lib/signature.c:133
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:152
+#: lib/signature.c:153
 msgid "No signature\n"
 msgstr ""
 
-#: lib/signature.c:156
+#: lib/signature.c:157
 msgid "Old PGP signature\n"
 msgstr ""
 
-#: lib/signature.c:169
+#: lib/signature.c:170
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr ""
 
-#: lib/signature.c:225
+#: lib/signature.c:226
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:677
-#: lib/signature.c:710
+#: lib/signature.c:307 lib/signature.c:406 lib/signature.c:678
+#: lib/signature.c:711
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "Gat ekki keyrt %s: %s\n"
 
-#: lib/signature.c:322
+#: lib/signature.c:323
 msgid "pgp failed\n"
 msgstr "pgp brást\n"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:329
+#: lib/signature.c:330
 msgid "pgp failed to write signature\n"
 msgstr "pgp gat ekki lesiğ undirskriftina\n"
 
-#: lib/signature.c:334
+#: lib/signature.c:335
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:350 lib/signature.c:450
+#: lib/signature.c:351 lib/signature.c:451
 msgid "unable to read the signature\n"
 msgstr "get ekki lesiğ undirskriftina\n"
 
-#: lib/signature.c:355
+#: lib/signature.c:356
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:422
+#: lib/signature.c:423
 msgid "gpg failed\n"
 msgstr "ggp brást\n"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:429
+#: lib/signature.c:430
 msgid "gpg failed to write signature\n"
 msgstr "gpg get ekki lesiğ undirskriftina\n"
 
-#: lib/signature.c:434
+#: lib/signature.c:435
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:455
+#: lib/signature.c:456
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:715 lib/signature.c:770
+#: lib/signature.c:716 lib/signature.c:771
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:749
+#: lib/signature.c:750
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:762
+#: lib/signature.c:763
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:806
+#: lib/signature.c:807
 msgid "Header+Payload size: "
 msgstr ""
 
-#: lib/signature.c:846
+#: lib/signature.c:847
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:903
+#: lib/signature.c:906
 msgid "Header SHA1 digest: "
 msgstr ""
 
-#: lib/signature.c:1082
+#: lib/signature.c:1102
 msgid "V3 RSA/MD5 signature: "
 msgstr ""
 
-#: lib/signature.c:1199
+#: lib/signature.c:1221
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1200
+#: lib/signature.c:1222
 msgid "V3 DSA signature: "
 msgstr ""
 
-#: lib/signature.c:1287
+#: lib/signature.c:1311
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1314
+#: lib/signature.c:1338
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1318
+#: lib/signature.c:1342
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
diff --git a/po/ja.po b/po/ja.po
index f8ed79be4..51a7a194b 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-03-07 17:53-0500\n"
+"POT-Creation-Date: 2002-03-08 17:22-0500\n"
 "PO-Revision-Date: 1999-12-01 22:49 +JST\n"
 "Last-Translator: Kanda Mitsuru <kanda@nn.iij4u.or.jp>\n"
 "Language-Team: JRPM <jrpm@linux.or.jp>\n"
@@ -1668,67 +1668,50 @@ msgstr "·Ù¹ğ: %s ¤Ï %s ¤È¤·¤ÆºîÀ®¤µ¤ì¤Ş¤¹"
 msgid "error creating temporary file %s\n"
 msgstr "°ì»ş¥Õ¥¡¥¤¥ë %s ¤ÎºîÀ®¥¨¥é¡¼"
 
-#: lib/package.c:181 lib/package.c:257
+#: lib/package.c:184 lib/package.c:260
 #, fuzzy
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr ""
 "¥á¥¸¥ã¡¼ÈÖ¹æ <=3 ¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î¤ß¤³¤Î¥Ğ¡¼¥¸¥ç¥ó¤Î RPM ¤Ï¥µ¥İ¡¼¥È¤µ¤ì¤Æ¤¤¤Ş¤¹"
 
-#: lib/package.c:202 lib/package.c:265
+#: lib/package.c:205 lib/package.c:268
 #, fuzzy
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 "¥á¥¸¥ã¡¼ÈÖ¹æ <=3 ¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î¤ß¤³¤Î¥Ğ¡¼¥¸¥ç¥ó¤Î RPM ¤Ï¥µ¥İ¡¼¥È¤µ¤ì¤Æ¤¤¤Ş¤¹"
 
-#: lib/package.c:243 lib/rpmchecksig.c:161 lib/rpmchecksig.c:541
+#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:548
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: readLead ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿\n"
 
-#: lib/package.c:249
+#: lib/package.c:252
 #, fuzzy, c-format
 msgid "%s: bad magic\n"
 msgstr "ÉÔÀµ¤Ê¥Ş¥¸¥Ã¥¯"
 
-#: lib/package.c:274 lib/rpmchecksig.c:179 lib/rpmchecksig.c:557
+#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:564
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: rpmReadSignature ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿\n"
 
-#: lib/package.c:278 lib/rpmchecksig.c:183 lib/rpmchecksig.c:562
+#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:569
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Í­¸ú¤Ê½ğ̾¤Ï¤¢¤ê¤Ş¤»¤ó\n"
 
-#: lib/package.c:308 lib/rpmchecksig.c:462
+#: lib/package.c:331 lib/rpmchecksig.c:467
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: readLead ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿\n"
 
-#. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:338
-#, fuzzy
-msgid "========== Header RSA signature\n"
-msgstr "¿·¤·¤¤¥Ø¥Ã¥À½ğ̾\n"
-
-#: lib/package.c:343 lib/package.c:371 lib/package.c:403 lib/rpmchecksig.c:631
+#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:642
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
-#. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:366
-#, fuzzy
-msgid "========== Header DSA signature\n"
-msgstr "¿·¤·¤¤¥Ø¥Ã¥À½ğ̾\n"
-
-#. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:397
-msgid "========== Package DSA/RSA signature\n"
-msgstr ""
-
-#: lib/package.c:415 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
+#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:496
 #, fuzzy, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Fread ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿: %s\n"
@@ -2109,7 +2092,7 @@ msgstr "Îóµó¤·¤¿¥Õ¥¡¥¤¥ë¤Î¾õÂÖ¤òɽ¼¨¤·¤Ş¤¹"
 msgid "display a verbose file listing"
 msgstr "¥Õ¥¡¥¤¥ë¥ê¥¹¥È¤ò¾éŤËɽ¼¨¤·¤Ş¤¹"
 
-#: lib/poptQV.c:240 lib/poptQV.c:282 lib/poptQV.c:316
+#: lib/poptQV.c:240
 #, fuzzy
 msgid "don't verify MD5 digest of files"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸Ãæ¤Î¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤ò¤·¤Ş¤»¤ó"
@@ -2158,46 +2141,46 @@ msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Î°Í¸´Ø·¸¤Î¸¡¾Ú¤ò¤·¤Ş¤»¤ó"
 msgid "don't execute verify script(s)"
 msgstr "¤É¤ÎÃʳ¬¤â¼Â¹Ô¤·¤Ş¤»¤ó"
 
-#: lib/poptQV.c:275
+#: lib/poptQV.c:275 lib/poptQV.c:313
 #, fuzzy
 msgid "don't verify digest(s)"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸Ãæ¤Î¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤ò¤·¤Ş¤»¤ó"
 
-#: lib/poptQV.c:278
+#: lib/poptQV.c:278 lib/poptQV.c:316
 #, fuzzy
 msgid "don't verify signature(s)"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸Ãæ¤Î¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤ò¤·¤Ş¤»¤ó"
 
-#: lib/poptQV.c:286 lib/poptQV.c:320
+#: lib/poptQV.c:283
 #, fuzzy
 msgid "don't verify GPG V3 DSA signature(s)"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸Ãæ¤Î¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤ò¤·¤Ş¤»¤ó"
 
-#: lib/poptQV.c:289 lib/poptQV.c:323
+#: lib/poptQV.c:286
 #, fuzzy
 msgid "don't verify PGP V3 RSA/MD5 signature(s)"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸Ãæ¤Î¥Õ¥¡¥¤¥ë¤Î¸¡¾Ú¤ò¤·¤Ş¤»¤ó"
 
-#: lib/poptQV.c:304
+#: lib/poptQV.c:301
 #, fuzzy
-msgid "sign a package, preserving other existing signatures"
+msgid "sign a package, preserving digests"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Ë½ğ̾¤·¤Ş¤¹(¸½ºß¤Î½ğ̾¤Ï¼Î¤Æ¤é¤ì¤Ş¤¹)"
 
-#: lib/poptQV.c:306
+#: lib/poptQV.c:303
 #, fuzzy
 msgid "verify package signature(s)"
 msgstr "½ğ̾¤Î¸¡¾Ú¤ò¤·¤Ş¤¹"
 
-#: lib/poptQV.c:308
+#: lib/poptQV.c:305
 msgid "import an armored public key"
 msgstr ""
 
-#: lib/poptQV.c:310
+#: lib/poptQV.c:307
 #, fuzzy
-msgid "sign a package, discarding all current signatures"
+msgid "sign a package, recomputing digests"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Ë½ğ̾¤·¤Ş¤¹(¸½ºß¤Î½ğ̾¤Ï¼Î¤Æ¤é¤ì¤Ş¤¹)"
 
-#: lib/poptQV.c:312
+#: lib/poptQV.c:309
 #, fuzzy
 msgid "generate signature"
 msgstr "PGP/GPG ½ğ̾¤òÀ¸À®¤·¤Ş¤¹"
@@ -2377,131 +2360,131 @@ msgstr "%s ¼ºÇÔ"
 msgid "incorrect format: %s\n"
 msgstr "¥Õ¥©¡¼¥Ş¥Ã¥ÈÃæ¤Î¥¨¥é¡¼: %s\n"
 
-#: lib/query.c:221
+#: lib/query.c:220
 msgid "(contains no files)"
 msgstr "¥Õ¥¡¥¤¥ë¤ò´Ş¤ó¤Ç¤¤¤Ş¤»¤ó"
 
-#: lib/query.c:282
+#: lib/query.c:281
 msgid "normal        "
 msgstr "Ä̾ï"
 
-#: lib/query.c:285
+#: lib/query.c:284
 msgid "replaced      "
 msgstr "ÃÖ¤­´¹¤¨¤é¤ì¤Æ¤¤¤Ş¤¹"
 
-#: lib/query.c:288
+#: lib/query.c:287
 msgid "not installed "
 msgstr "¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Ş¤»¤ó"
 
-#: lib/query.c:291
+#: lib/query.c:290
 msgid "net shared    "
 msgstr "¥Í¥Ã¥È¶¦Í­"
 
-#: lib/query.c:294
+#: lib/query.c:293
 #, c-format
 msgid "(unknown %3d) "
 msgstr "(̤ÃΤΠ%3d)"
 
-#: lib/query.c:299
+#: lib/query.c:298
 msgid "(no state)    "
 msgstr "(²¿¤Î¾õÂ֤⤢¤ê¤Ş¤»¤ó)"
 
-#: lib/query.c:318 lib/query.c:374
+#: lib/query.c:317 lib/query.c:373
 #, fuzzy
 msgid "package has neither file owner or id lists\n"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Ï¥Õ¥¡¥¤¥ë½êÍ­¼Ô¤ä id ¥ê¥¹¥È¤ò¤É¤Á¤é¤â»ı¤Ã¤Æ¤¤¤Ş¤»¤ó"
 
-#: lib/query.c:463
+#: lib/query.c:462
 #, fuzzy, c-format
 msgid "can't query %s: %s\n"
 msgstr "%s ¤òºï½ü(unlink)¤Ç¤­¤Ş¤»¤ó: %s\n"
 
-#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:333 lib/rpminstall.c:475
+#: lib/query.c:616 lib/query.c:654 lib/rpminstall.c:333 lib/rpminstall.c:475
 #: lib/rpminstall.c:845
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ: %s\n"
 
-#: lib/query.c:633
+#: lib/query.c:632
 #, c-format
 msgid "query of %s failed\n"
 msgstr "%s ¤Ø¤ÎÌ䤤¹ç¤ï¤»¤Ë¼ºÇÔ¤·¤Ş¤·¤¿\n"
 
-#: lib/query.c:639
+#: lib/query.c:638
 msgid "old format source packages cannot be queried\n"
 msgstr "µì·Á¼°¤Î¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤òÌ䤤¹ç¤ï¤»¤ë¤³¤È¤Ï¤Ç¤­¤Ş¤»¤ó\n"
 
-#: lib/query.c:665 lib/rpminstall.c:488
+#: lib/query.c:664 lib/rpminstall.c:488
 #, fuzzy, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: Fread ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿: %s\n"
 
-#: lib/query.c:709
+#: lib/query.c:708
 #, fuzzy, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "¥¹¥Ú¥Ã¥¯¥Õ¥¡¥¤¥ë %s ¤Ø¤ÎÌ䤤¹ç¤ï¤»¤Ë¼ºÇÔ¤·¤Ş¤·¤¿¡¢¥Ñ¡¼¥¹¤Ç¤­¤Ş¤»¤ó\n"
 
-#: lib/query.c:730
+#: lib/query.c:729
 #, fuzzy
 msgid "no packages\n"
 msgstr "%d ¸Ä¤Î¥Ñ¥Ã¥±¡¼¥¸¤ò¸«¤Ä¤±¤Ş¤·¤¿\n"
 
-#: lib/query.c:750
+#: lib/query.c:749
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "¥°¥ë¡¼¥× %s ¤Ë°¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ï¸ºß¤·¤Ş¤»¤ó\n"
 
-#: lib/query.c:760
+#: lib/query.c:759
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "%s ¤ò¥È¥ê¥¬¡¼¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ï¸ºß¤·¤Ş¤»¤ó\n"
 
-#: lib/query.c:774 lib/query.c:796 lib/query.c:814 lib/query.c:845
+#: lib/query.c:773 lib/query.c:795 lib/query.c:813 lib/query.c:844
 #, fuzzy, c-format
 msgid "malformed %s: %s\n"
 msgstr "%s ¤òÆɤà¤Î¤Ë¼ºÇÔ: $s¡£"
 
-#: lib/query.c:784 lib/query.c:802 lib/query.c:820 lib/query.c:850
+#: lib/query.c:783 lib/query.c:801 lib/query.c:819 lib/query.c:849
 #, fuzzy, c-format
 msgid "no package matches %s: %s\n"
 msgstr "%s ¤ò¥È¥ê¥¬¡¼¤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ï¸ºß¤·¤Ş¤»¤ó\n"
 
-#: lib/query.c:861
+#: lib/query.c:860
 #, c-format
 msgid "no package requires %s\n"
 msgstr "%s ¤òɬÍפȤ¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ï¸ºß¤·¤Ş¤»¤ó\n"
 
-#: lib/query.c:872
+#: lib/query.c:871
 #, c-format
 msgid "no package provides %s\n"
 msgstr "%s ¤òÄ󶡤¹¤ë¥Ñ¥Ã¥±¡¼¥¸¤Ï¸ºß¤·¤Ş¤»¤ó\n"
 
-#: lib/query.c:906
+#: lib/query.c:905
 #, c-format
 msgid "file %s: %s\n"
 msgstr "¥Õ¥¡¥¤¥ë %s: %s\n"
 
-#: lib/query.c:910
+#: lib/query.c:909
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "¥Õ¥¡¥¤¥ë %s ¤Ï¤É¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ë¤â°¤·¤Æ¤¤¤Ş¤»¤ó\n"
 
-#: lib/query.c:937
+#: lib/query.c:936
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "̵¸ú¤Ê¥Ñ¥Ã¥±¡¼¥¸ÈÖ¹æ: %s\n"
 
-#: lib/query.c:940
+#: lib/query.c:939
 #, fuzzy, c-format
 msgid "package record number: %u\n"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¥ì¥³¡¼¥ÉÈÖ¹æ %d\n"
 
-#: lib/query.c:945
+#: lib/query.c:944
 #, fuzzy, c-format
 msgid "record %u could not be read\n"
 msgstr "¥ì¥³¡¼¥É %d ¤òÆɤळ¤È¤¬¤Ç¤­¤Ş¤»¤ó¤Ç¤·¤¿\n"
 
-#: lib/query.c:956 lib/rpminstall.c:633
+#: lib/query.c:955 lib/rpminstall.c:633
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Ş¤»¤ó\n"
@@ -2516,73 +2499,73 @@ msgstr "ÉÔÀµ¤Ê¥Õ¥¡¥¤¥ë¤Î¾õÂÖ: %s"
 msgid "(added provide)"
 msgstr "%s: %s ¤Ï db ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËş¤µ¤ì¤Ş¤¹¡£\n"
 
-#: lib/rpmchecksig.c:51
+#: lib/rpmchecksig.c:54
 #, fuzzy, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s: fdOpen ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿: %s\n"
 
-#: lib/rpmchecksig.c:63
+#: lib/rpmchecksig.c:66
 #, fuzzy
 msgid "makeTempFile failed\n"
 msgstr "makeTempFile ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿\n"
 
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:107
 #, fuzzy, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: Fwrite ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿: %s\n"
 
-#: lib/rpmchecksig.c:166
+#: lib/rpmchecksig.c:169
 #, fuzzy, c-format
 msgid "%s: Can't sign v1 packaging\n"
 msgstr "%s: v1.0 ¤Î RPM ¤Ë¤Ï½ğ̾¤Ç¤­¤Ş¤»¤ó\n"
 
-#: lib/rpmchecksig.c:170
+#: lib/rpmchecksig.c:173
 #, fuzzy, c-format
 msgid "%s: Can't re-sign v2 packaging\n"
 msgstr "%s: v2.0 ¤Î RPM ¤Ë¤ÏºÆ½ğ̾¤Ç¤­¤Ş¤»¤ó\n"
 
-#: lib/rpmchecksig.c:239
+#: lib/rpmchecksig.c:244
 #, fuzzy, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: writedLead ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿: %s\n"
 
-#: lib/rpmchecksig.c:245
+#: lib/rpmchecksig.c:250
 #, fuzzy, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmWriteSignature ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿\n"
 
-#: lib/rpmchecksig.c:476
+#: lib/rpmchecksig.c:481
 #, fuzzy, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr "%s: readLead ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿\n"
 
-#: lib/rpmchecksig.c:547
+#: lib/rpmchecksig.c:554
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: Í­¸ú¤Ê½ğ̾¤Ï¤¢¤ê¤Ş¤»¤ó(v1.0 RPM)\n"
 
-#: lib/rpmchecksig.c:773
+#: lib/rpmchecksig.c:801
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:774 lib/rpmchecksig.c:788
+#: lib/rpmchecksig.c:802 lib/rpmchecksig.c:816
 #, fuzzy
 msgid " (MISSING KEYS:"
 msgstr " (¥­¡¼¤Îʶ¼º) "
 
-#: lib/rpmchecksig.c:776 lib/rpmchecksig.c:790
+#: lib/rpmchecksig.c:804 lib/rpmchecksig.c:818
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:777 lib/rpmchecksig.c:791
+#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819
 msgid " (UNTRUSTED KEYS:"
 msgstr " (¿®Íê¤Ç¤­¤Ê¤¤¸°:"
 
-#: lib/rpmchecksig.c:779 lib/rpmchecksig.c:793
+#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:787
+#: lib/rpmchecksig.c:815
 msgid "OK"
 msgstr ""
 
@@ -2795,147 +2778,147 @@ msgstr ""
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "Æɤ߹ş¤à¤¿¤á¤Ë %s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Ş¤»¤ó: %s¡£"
 
-#: lib/signature.c:118
+#: lib/signature.c:119
 msgid "file is not regular -- skipping size check\n"
 msgstr ""
 "¥Õ¥¡¥¤¥ë¤Ï°ìÈ̤Υե¡¥¤¥ë¤Ç¤Ï¤¢¤ê¤Ş¤»¤ó -- ¥µ¥¤¥º¥Á¥§¥Ã¥¯¤ò¥¹¥­¥Ã¥×¤·¤Ş¤¹\n"
 
-#: lib/signature.c:127
+#: lib/signature.c:128
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:132
+#: lib/signature.c:133
 #, fuzzy, c-format
 msgid "  Actual size: %12d\n"
 msgstr "½ğ̾¥µ¥¤¥º: %d\n"
 
-#: lib/signature.c:152
+#: lib/signature.c:153
 msgid "No signature\n"
 msgstr "½ğ̾¤Ï¤¢¤ê¤Ş¤»¤ó\n"
 
-#: lib/signature.c:156
+#: lib/signature.c:157
 msgid "Old PGP signature\n"
 msgstr "¸Å¤¤ PGP ½ğ̾\n"
 
-#: lib/signature.c:169
+#: lib/signature.c:170
 #, fuzzy
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr "¸Å¤¤(ÆâÉô¤À¤±¤Î)½ğ̾!  ¤É¤¦¤ä¤Ã¤Æ¤½¤ì¤ò¼ê¤Ë¤¤¤ì¤Ş¤·¤¿¤«!?"
 
-#: lib/signature.c:225
+#: lib/signature.c:226
 #, fuzzy, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "½ğ̾¥µ¥¤¥º: %d\n"
 
-#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:677
-#: lib/signature.c:710
+#: lib/signature.c:307 lib/signature.c:406 lib/signature.c:678
+#: lib/signature.c:711
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "%s ¤ò¼Â¹Ô¤Ç¤­¤Ş¤»¤ó¤Ç¤·¤¿: %s"
 
-#: lib/signature.c:322
+#: lib/signature.c:323
 #, fuzzy
 msgid "pgp failed\n"
 msgstr "pgp ¼ºÇÔ"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:329
+#: lib/signature.c:330
 #, fuzzy
 msgid "pgp failed to write signature\n"
 msgstr "pgp ¤¬½ğ̾¤ò½ñ¤­¹ş¤à¤Î¤Ë¼ºÇÔ¤·¤Ş¤·¤¿"
 
-#: lib/signature.c:334
+#: lib/signature.c:335
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr "PGP ½ğ̾¥µ¥¤¥º: %s\n"
 
-#: lib/signature.c:350 lib/signature.c:450
+#: lib/signature.c:351 lib/signature.c:451
 #, fuzzy
 msgid "unable to read the signature\n"
 msgstr "½ğ̾¤òÆɤळ¤È¤¬¤Ç¤­¤Ş¤»¤ó"
 
-#: lib/signature.c:355
+#: lib/signature.c:356
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr "PGP ½ğ̾¤Î %d ¥Ğ¥¤¥È¤ò¼èÆÀ\n"
 
-#: lib/signature.c:422
+#: lib/signature.c:423
 #, fuzzy
 msgid "gpg failed\n"
 msgstr "gpg ¼ºÇÔ"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:429
+#: lib/signature.c:430
 #, fuzzy
 msgid "gpg failed to write signature\n"
 msgstr "gpg ¤¬½ğ̾¤ò½ñ¤­¹ş¤à¤Î¤Ë¼ºÇÔ¤·¤Ş¤·¤¿"
 
-#: lib/signature.c:434
+#: lib/signature.c:435
 #, fuzzy, c-format
 msgid "GPG sig size: %d\n"
 msgstr "GPG ½ğ̾¥µ¥¤¥º: %s\n"
 
-#: lib/signature.c:455
+#: lib/signature.c:456
 #, fuzzy, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr "GPG ½ğ̾¤Î %d ¥Ğ¥¤¥È¤ò¼èÆÀ\n"
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:715 lib/signature.c:770
+#: lib/signature.c:716 lib/signature.c:771
 #, fuzzy, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "¥Ş¥¯¥í¥Õ¥¡¥¤¥ëÃæ¤Î̵¸ú¤Ê %%_signature ¡£\n"
 
-#: lib/signature.c:749
+#: lib/signature.c:750
 #, fuzzy, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "¥Ş¥¯¥í¥Õ¥¡¥¤¥ë¤Ë \"%%_pgp_name\" ¤òÀßÄꤷ¤Ê¤±¤ì¤Ğ¤Ê¤ê¤Ş¤»¤ó"
 
-#: lib/signature.c:762
+#: lib/signature.c:763
 #, fuzzy, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "¥Ş¥¯¥í¥Õ¥¡¥¤¥ë¤Ë \"%%_pgp_name\" ¤òÀßÄꤷ¤Ê¤±¤ì¤Ğ¤Ê¤ê¤Ş¤»¤ó"
 
-#: lib/signature.c:806
+#: lib/signature.c:807
 #, fuzzy
 msgid "Header+Payload size: "
 msgstr "¥Ø¥Ã¥À¥µ¥¤¥º¤¬Â礭¤¹¤®¤Ş¤¹"
 
-#: lib/signature.c:846
+#: lib/signature.c:847
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:903
+#: lib/signature.c:906
 msgid "Header SHA1 digest: "
 msgstr ""
 
-#: lib/signature.c:1082
+#: lib/signature.c:1102
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "MD5 ½ğ̾¤ò¥¹¥­¥Ã¥×¤·¤Ş¤¹"
 
-#: lib/signature.c:1199
+#: lib/signature.c:1221
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1200
+#: lib/signature.c:1222
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "½ğ̾¤Ï¤¢¤ê¤Ş¤»¤ó\n"
 
-#: lib/signature.c:1287
+#: lib/signature.c:1311
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1314
+#: lib/signature.c:1338
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1318
+#: lib/signature.c:1342
 #, fuzzy, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "½ğ̾¥Ñ¥Ã¥É: %d\n"
@@ -3592,6 +3575,18 @@ msgid "failed to create %s: %s\n"
 msgstr "%s ¤ÎºîÀ®¤Ë¼ºÇÔ¤·¤Ş¤·¤¿\n"
 
 #, fuzzy
+#~ msgid "========== Header RSA signature\n"
+#~ msgstr "¿·¤·¤¤¥Ø¥Ã¥À½ğ̾\n"
+
+#, fuzzy
+#~ msgid "========== Header DSA signature\n"
+#~ msgstr "¿·¤·¤¤¥Ø¥Ã¥À½ğ̾\n"
+
+#, fuzzy
+#~ msgid "sign a package, discarding all current signatures"
+#~ msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Ë½ğ̾¤·¤Ş¤¹(¸½ºß¤Î½ğ̾¤Ï¼Î¤Æ¤é¤ì¤Ş¤¹)"
+
+#, fuzzy
 #~ msgid "Generating signature using PGP.\n"
 #~ msgstr "PGP ¤ò»ÈÍѤ·¤Æ½ğ̾¤ÎÀ¸À®Ãæ\n"
 
diff --git a/po/ko.po b/po/ko.po
index 02dd2a1b6..34556368c 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: 2002-03-07 17:53-0500\n"
+"POT-Creation-Date: 2002-03-08 17:22-0500\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"
@@ -1612,62 +1612,47 @@ msgstr "%s (ÀÌ)°¡ %s (À¸)·Î »ı¼ºµÇ¾ú½À´Ï´Ù\n"
 msgid "error creating temporary file %s\n"
 msgstr "Àӽà ÆÄÀÏ %s (À»)¸¦ »ı¼ºÇÏ´Â µµÁß ¿À·ù°¡ ¹ß»ıÇß½À´Ï´Ù\n"
 
-#: lib/package.c:181 lib/package.c:257
+#: lib/package.c:184 lib/package.c:260
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr "ÀÌ RPM ¹öÀü¿¡¼­´Â ÆĞŰ¡ ¹öÀü '1' ÀÌ Áö¿øµÇÁö ¾Ê½À´Ï´Ù\n"
 
-#: lib/package.c:202 lib/package.c:265
+#: lib/package.c:205 lib/package.c:268
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 "ÀÌ RPM ¹öÀü¿¡¼­´Â ÁÖ¿ä ¹øÈ£(major number) <= 4 ÀÇ ÆĞŰ¡ ¸¸À» Áö¿øÇÕ´Ï´Ù\n"
 
-#: lib/package.c:243 lib/rpmchecksig.c:161 lib/rpmchecksig.c:541
+#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:548
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: readLead¿¡ ½ÇÆĞÇß½À´Ï´Ù\n"
 
-#: lib/package.c:249
+#: lib/package.c:252
 #, fuzzy, c-format
 msgid "%s: bad magic\n"
 msgstr "À߸øµÈ magic ÀÔ´Ï´Ù"
 
-#: lib/package.c:274 lib/rpmchecksig.c:179 lib/rpmchecksig.c:557
+#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:564
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: rpmReadSignature¿¡ ½ÇÆĞÇß½À´Ï´Ù\n"
 
-#: lib/package.c:278 lib/rpmchecksig.c:183 lib/rpmchecksig.c:562
+#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:569
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: À¯È¿ÇÑ ¼­¸íÀÌ ¾ø½À´Ï´Ù\n"
 
-#: lib/package.c:308 lib/rpmchecksig.c:462
+#: lib/package.c:331 lib/rpmchecksig.c:467
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: readLead¿¡ ½ÇÆĞÇß½À´Ï´Ù\n"
 
-#. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:338
-msgid "========== Header RSA signature\n"
-msgstr ""
-
-#: lib/package.c:343 lib/package.c:371 lib/package.c:403 lib/rpmchecksig.c:631
+#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:642
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
-#. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:366
-msgid "========== Header DSA signature\n"
-msgstr ""
-
-#. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:397
-msgid "========== Package DSA/RSA signature\n"
-msgstr ""
-
-#: lib/package.c:415 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
+#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:496
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Fread¿¡ ½ÇÆĞÇß½À´Ï´Ù: %s\n"
@@ -2013,7 +1998,7 @@ msgstr "³ª¿­µÈ ÆÄÀÏÀÇ »óÅÂ(state)¸¦ º¸¿©Áİ´Ï´Ù"
 msgid "display a verbose file listing"
 msgstr "ÆÄÀÏ ¸ñ·ÏÀ» ÀÚ¼¼È÷ º¸¿©Áİ´Ï´Ù"
 
-#: lib/poptQV.c:240 lib/poptQV.c:282 lib/poptQV.c:316
+#: lib/poptQV.c:240
 msgid "don't verify MD5 digest of files"
 msgstr "ÆÄÀÏÀÇ MD5 Ãà¾à(digest)À» °Ë»çÇÏÁö ¾Ê½À´Ï´Ù"
 
@@ -2054,46 +2039,46 @@ msgstr "ÆĞÅ°ÁöÀÇ ÀÇÁ¸¼ºÀ» °Ë»çÇÏÁö ¾Ê½À´Ï´Ù"
 msgid "don't execute verify script(s)"
 msgstr "%verifyscript¸¦ ½ÇÇàÇÏÁö ¾Ê½À´Ï´Ù (ÀÖÀ» °æ¿ì)"
 
-#: lib/poptQV.c:275
+#: lib/poptQV.c:275 lib/poptQV.c:313
 #, fuzzy
 msgid "don't verify digest(s)"
 msgstr "ÆÄÀÏÀÇ MD5 Ãà¾à(digest)À» °Ë»çÇÏÁö ¾Ê½À´Ï´Ù"
 
-#: lib/poptQV.c:278
+#: lib/poptQV.c:278 lib/poptQV.c:316
 #, fuzzy
 msgid "don't verify signature(s)"
 msgstr "ÆÄÀÏÀÇ ½Éº¼¸¯ ¸µÅ© °æ·Î¸¦ °Ë»çÇÏÁö ¾Ê½À´Ï´Ù"
 
-#: lib/poptQV.c:286 lib/poptQV.c:320
+#: lib/poptQV.c:283
 #, fuzzy
 msgid "don't verify GPG V3 DSA signature(s)"
 msgstr "SHA1 Ãà¾à(digest) Çì´õ¸¦ °Ë»çÇÏÁö ¾Ê½À´Ï´Ù"
 
-#: lib/poptQV.c:289 lib/poptQV.c:323
+#: lib/poptQV.c:286
 #, fuzzy
 msgid "don't verify PGP V3 RSA/MD5 signature(s)"
 msgstr "ÆÄÀÏÀÇ MD5 Ãà¾à(digest)À» °Ë»çÇÏÁö ¾Ê½À´Ï´Ù"
 
-#: lib/poptQV.c:304
+#: lib/poptQV.c:301
 #, fuzzy
-msgid "sign a package, preserving other existing signatures"
+msgid "sign a package, preserving digests"
 msgstr "ÆĞÅ°Áö¿¡ ¼­¸íÇÕ´Ï´Ù (±âÁ¸ÀÇ ¼­¸íÀº »èÁ¦µË´Ï´Ù)"
 
-#: lib/poptQV.c:306
+#: lib/poptQV.c:303
 #, fuzzy
 msgid "verify package signature(s)"
 msgstr "ÆĞÅ°ÁöÀÇ ¼­¸íÀ» °Ë»çÇÕ´Ï´Ù"
 
-#: lib/poptQV.c:308
+#: lib/poptQV.c:305
 msgid "import an armored public key"
 msgstr ""
 
-#: lib/poptQV.c:310
+#: lib/poptQV.c:307
 #, fuzzy
-msgid "sign a package, discarding all current signatures"
+msgid "sign a package, recomputing digests"
 msgstr "ÆĞÅ°Áö¿¡ ¼­¸íÇÕ´Ï´Ù (±âÁ¸ÀÇ ¼­¸íÀº »èÁ¦µË´Ï´Ù)"
 
-#: lib/poptQV.c:312
+#: lib/poptQV.c:309
 msgid "generate signature"
 msgstr "¼­¸íÀ» ÀÛ¼ºÇÕ´Ï´Ù"
 
@@ -2272,129 +2257,129 @@ msgstr "%s (ÀÌ)°¡ ½ÇÆĞÇÔ: %s\n"
 msgid "incorrect format: %s\n"
 msgstr "¿Ã¹Ù¸£Áö ¸øÇÑ Çü½Ä: %s\n"
 
-#: lib/query.c:221
+#: lib/query.c:220
 msgid "(contains no files)"
 msgstr "(ÆÄÀÏÀÌ Æ÷ÇԵǾî ÀÖÁö ¾ÊÀ½)"
 
-#: lib/query.c:282
+#: lib/query.c:281
 msgid "normal        "
 msgstr "Á¤»ó(normal)        "
 
-#: lib/query.c:285
+#: lib/query.c:284
 msgid "replaced      "
 msgstr "±³Ã¼µÊ(replaced)    "
 
-#: lib/query.c:288
+#: lib/query.c:287
 msgid "not installed "
 msgstr "¼³Ä¡µÇ¾î ÀÖÁö ¾ÊÀ½  "
 
-#: lib/query.c:291
+#: lib/query.c:290
 msgid "net shared    "
 msgstr "net °øÀ¯µÊ          "
 
-#: lib/query.c:294
+#: lib/query.c:293
 #, c-format
 msgid "(unknown %3d) "
 msgstr "(¾Ë ¼ö ¾ø´Â %3d)    "
 
-#: lib/query.c:299
+#: lib/query.c:298
 msgid "(no state)    "
 msgstr "(»óŸ¦ ¾Ë ¼ö ¾øÀ½) "
 
-#: lib/query.c:318 lib/query.c:374
+#: lib/query.c:317 lib/query.c:373
 msgid "package has neither file owner or id lists\n"
 msgstr "ÆĞÅ°Áö¿¡ ÆÄÀÏ ¼ÒÀ¯ÀÚ ¶Ç´Â id ¸ñ·ÏÀÌ ¾ø½À´Ï´Ù\n"
 
-#: lib/query.c:463
+#: lib/query.c:462
 #, c-format
 msgid "can't query %s: %s\n"
 msgstr "%s (À»)¸¦ ÁúÀÇÇÒ ¼ö ¾øÀ½: %s\n"
 
-#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:333 lib/rpminstall.c:475
+#: lib/query.c:616 lib/query.c:654 lib/rpminstall.c:333 lib/rpminstall.c:475
 #: lib/rpminstall.c:845
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "%s (À»)¸¦ ¿©´Âµ¥ ½ÇÆĞÇÔ: %s\n"
 
-#: lib/query.c:633
+#: lib/query.c:632
 #, c-format
 msgid "query of %s failed\n"
 msgstr "%s (À»)¸¦ ÁúÀÇÇϴµ¥ ½ÇÆĞÇß½À´Ï´Ù\n"
 
-#: lib/query.c:639
+#: lib/query.c:638
 msgid "old format source packages cannot be queried\n"
 msgstr "ÀÌÀü Çü½ÄÀÇ ¼Ò½º ÆĞÅ°Áö´Â ÁúÀÇÇÒ ¼ö ¾ø½À´Ï´Ù\n"
 
-#: lib/query.c:665 lib/rpminstall.c:488
+#: lib/query.c:664 lib/rpminstall.c:488
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: Àдµ¥ ½ÇÆĞÇß½À´Ï´Ù: %s\n"
 
-#: lib/query.c:709
+#: lib/query.c:708
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "%s spec ÆÄÀÏÀ» ÁúÀÇÇϴµ¥ ½ÇÆĞÇß½À´Ï´Ù, ÆÄÀÏÀ» ºĞ¼®ÇÒ ¼ö ¾ø½À´Ï´Ù\n"
 
-#: lib/query.c:730
+#: lib/query.c:729
 msgid "no packages\n"
 msgstr "ÆĞÅ°Áö°¡ ¾ø½À´Ï´Ù\n"
 
-#: lib/query.c:750
+#: lib/query.c:749
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "%s ±×·ìÀº ¾î¶² ÆĞÅ°Áö¿¡µµ Æ÷ÇԵǾî ÀÖÁö ¾Ê½À´Ï´Ù\n"
 
-#: lib/query.c:760
+#: lib/query.c:759
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "%s (À»)¸¦ ¹ß»ı½ÃÅ°´Â ÆĞÅ°Áö°¡ ¾ø½À´Ï´Ù\n"
 
-#: lib/query.c:774 lib/query.c:796 lib/query.c:814 lib/query.c:845
+#: lib/query.c:773 lib/query.c:795 lib/query.c:813 lib/query.c:844
 #, fuzzy, c-format
 msgid "malformed %s: %s\n"
 msgstr "%s (À»)¸¦ Àдµ¥ ½ÇÆĞÇÔ: %s.\n"
 
-#: lib/query.c:784 lib/query.c:802 lib/query.c:820 lib/query.c:850
+#: lib/query.c:783 lib/query.c:801 lib/query.c:819 lib/query.c:849
 #, fuzzy, c-format
 msgid "no package matches %s: %s\n"
 msgstr "%s (À»)¸¦ ¹ß»ı½ÃÅ°´Â ÆĞÅ°Áö°¡ ¾ø½À´Ï´Ù\n"
 
-#: lib/query.c:861
+#: lib/query.c:860
 #, c-format
 msgid "no package requires %s\n"
 msgstr "%s (À»)¸¦ ÇÊ¿ä·Î ÇÏ´Â ÆĞÅ°Áö°¡ ¾ø½À´Ï´Ù\n"
 
-#: lib/query.c:872
+#: lib/query.c:871
 #, c-format
 msgid "no package provides %s\n"
 msgstr "%s (À»)¸¦ Á¦°øÇÏ´Â ÆĞÅ°Áö°¡ ¾ø½À´Ï´Ù\n"
 
-#: lib/query.c:906
+#: lib/query.c:905
 #, c-format
 msgid "file %s: %s\n"
 msgstr "%s ÆÄÀÏ: %s\n"
 
-#: lib/query.c:910
+#: lib/query.c:909
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "%s ÆÄÀÏÀº ¾î¶² ÆĞÅ°Áö¿¡µµ ¼ÓÇØ ÀÖÁö ¾Ê½À´Ï´Ù\n"
 
-#: lib/query.c:937
+#: lib/query.c:936
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "ºÎÀûÇÕÇÑ ÆĞÅ°Áö ¹øÈ£: %s\n"
 
-#: lib/query.c:940
+#: lib/query.c:939
 #, c-format
 msgid "package record number: %u\n"
 msgstr "ÆĞÅ°Áö ±â·Ï(record) ¹øÈ£: %u\n"
 
-#: lib/query.c:945
+#: lib/query.c:944
 #, c-format
 msgid "record %u could not be read\n"
 msgstr "±â·Ï(record) ¹øÈ£ %u (Àº)´Â ÀĞÀ» ¼ö ¾ø½À´Ï´Ù\n"
 
-#: lib/query.c:956 lib/rpminstall.c:633
+#: lib/query.c:955 lib/rpminstall.c:633
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "%s ÆĞÅ°Áö´Â ¼³Ä¡µÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù\n"
@@ -2409,71 +2394,71 @@ msgstr "À߸øµÈ db ÆÄÀÏ    %s\n"
 msgid "(added provide)"
 msgstr "%s: %-45s ¿¹ (db°¡ Á¦°øÇÔ)\n"
 
-#: lib/rpmchecksig.c:51
+#: lib/rpmchecksig.c:54
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s: ¿©´Âµ¥ ½ÇÆĞÇß½À´Ï´Ù: %s\n"
 
-#: lib/rpmchecksig.c:63
+#: lib/rpmchecksig.c:66
 msgid "makeTempFile failed\n"
 msgstr "makeTempFile¿¡ ½ÇÆĞÇß½À´Ï´Ù\n"
 
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:107
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: Fwrite¿¡ ½ÇÆĞÇß½À´Ï´Ù: %s\n"
 
-#: lib/rpmchecksig.c:166
+#: lib/rpmchecksig.c:169
 #, fuzzy, c-format
 msgid "%s: Can't sign v1 packaging\n"
 msgstr "%s: v1.0 RPMÀº ¼­¸íÇÒ ¼ö ¾ø½À´Ï´Ù\n"
 
-#: lib/rpmchecksig.c:170
+#: lib/rpmchecksig.c:173
 #, fuzzy, c-format
 msgid "%s: Can't re-sign v2 packaging\n"
 msgstr "%s: v2.0 RPMÀº Àç-¼­¸íÇÒ ¼ö ¾ø½À´Ï´Ù\n"
 
-#: lib/rpmchecksig.c:239
+#: lib/rpmchecksig.c:244
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: writeLead¿¡ ½ÇÆĞÇß½À´Ï´Ù: %s\n"
 
-#: lib/rpmchecksig.c:245
+#: lib/rpmchecksig.c:250
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmWriteSignature¿¡ ½ÇÆĞÇß½À´Ï´Ù: %s\n"
 
-#: lib/rpmchecksig.c:476
+#: lib/rpmchecksig.c:481
 #, fuzzy, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr "%s: readLead¿¡ ½ÇÆĞÇß½À´Ï´Ù\n"
 
-#: lib/rpmchecksig.c:547
+#: lib/rpmchecksig.c:554
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: À¯È¿ÇÑ ¼­¸íÀÌ ¾ø½À´Ï´Ù (v1.0 RPM)\n"
 
-#: lib/rpmchecksig.c:773
+#: lib/rpmchecksig.c:801
 msgid "NOT OK"
 msgstr "¿Ã¹Ù¸£Áö ¾ÊÀ½"
 
-#: lib/rpmchecksig.c:774 lib/rpmchecksig.c:788
+#: lib/rpmchecksig.c:802 lib/rpmchecksig.c:816
 msgid " (MISSING KEYS:"
 msgstr " (Å°¸¦ ãÀ» ¼ö ¾øÀ½:"
 
-#: lib/rpmchecksig.c:776 lib/rpmchecksig.c:790
+#: lib/rpmchecksig.c:804 lib/rpmchecksig.c:818
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:777 lib/rpmchecksig.c:791
+#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819
 msgid " (UNTRUSTED KEYS:"
 msgstr " (Å°¸¦ ½Å·ÚÇÒ ¼ö ¾øÀ½:"
 
-#: lib/rpmchecksig.c:779 lib/rpmchecksig.c:793
+#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:787
+#: lib/rpmchecksig.c:815
 msgid "OK"
 msgstr "È®ÀÎ"
 
@@ -2685,140 +2670,140 @@ msgstr "%s (À»)¸¦ ÀĞÀ» ¼ö ¾ø½À´Ï´Ù, HOMEÀÌ ³Ê¹« Å®´Ï´Ù.\n"
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "%s (À»)¸¦ ¿­ ¼ö ¾øÀ½: %s.\n"
 
-#: lib/signature.c:118
+#: lib/signature.c:119
 msgid "file is not regular -- skipping size check\n"
 msgstr "ÆÄÀÏÀÌ ¿Ã¹Ù¸£Áö(regular) ¾Ê½À´Ï´Ù -- ¿ë·® °Ë»ç¸¦ »ı·«ÇÕ´Ï´Ù\n"
 
-#: lib/signature.c:127
+#: lib/signature.c:128
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr "¿¹»ó(Expected) ¿ë·®: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 
-#: lib/signature.c:132
+#: lib/signature.c:133
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr " ½ÇÁ¦ ¿ë·®: %12d\n"
 
-#: lib/signature.c:152
+#: lib/signature.c:153
 msgid "No signature\n"
 msgstr "¼­¸íÀÌ ¾ø½À´Ï´Ù\n"
 
-#: lib/signature.c:156
+#: lib/signature.c:157
 msgid "Old PGP signature\n"
 msgstr "ÀÌÀü PGP ¼­¸í\n"
 
-#: lib/signature.c:169
+#: lib/signature.c:170
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr "ÀÌÀü (³»ºÎ-¿ë) ¼­¸í!  ¾î¶»°Ô ¾òÀ¸¼Ì½À´Ï±î!?\n"
 
-#: lib/signature.c:225
+#: lib/signature.c:226
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "¼­¸í: size(%d)+pad(%d)\n"
 
-#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:677
-#: lib/signature.c:710
+#: lib/signature.c:307 lib/signature.c:406 lib/signature.c:678
+#: lib/signature.c:711
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "%s (À»)¸¦ ½ÇÇàÇÒ ¼ö ¾øÀ½: %s\n"
 
-#: lib/signature.c:322
+#: lib/signature.c:323
 msgid "pgp failed\n"
 msgstr "pgp¿¡ ½ÇÆĞÇÔ\n"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:329
+#: lib/signature.c:330
 msgid "pgp failed to write signature\n"
 msgstr "pgp ¼­¸íÀ» ÀÛ¼ºÇϴµ¥ ½ÇÆĞÇß½À´Ï´Ù\n"
 
-#: lib/signature.c:334
+#: lib/signature.c:335
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr "PGP ¼­¸í ¿ë·®: %d\n"
 
-#: lib/signature.c:350 lib/signature.c:450
+#: lib/signature.c:351 lib/signature.c:451
 msgid "unable to read the signature\n"
 msgstr "¼­¸íÀ» ÀĞÀ» ¼ö ¾ø½À´Ï´Ù\n"
 
-#: lib/signature.c:355
+#: lib/signature.c:356
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr "%d ¹ÙÀÌÆ®ÀÇ PGP ¼­¸íÀ» ¾ò¾ú½À´Ï´Ù\n"
 
-#: lib/signature.c:422
+#: lib/signature.c:423
 msgid "gpg failed\n"
 msgstr "gpg¿¡ ½ÇÆĞÇÔ\n"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:429
+#: lib/signature.c:430
 msgid "gpg failed to write signature\n"
 msgstr "gpg ¼­¸íÀ» ÀÛ¼ºÇϴµ¥ ½ÇÆĞÇß½À´Ï´Ù\n"
 
-#: lib/signature.c:434
+#: lib/signature.c:435
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr "GPG ¼­¸í ¿ë·®: %d\n"
 
-#: lib/signature.c:455
+#: lib/signature.c:456
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr "%d ¹ÙÀÌÆ®ÀÇ GPG ¼­¸íÀ» ¾ò¾ú½À´Ï´Ù\n"
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:715 lib/signature.c:770
+#: lib/signature.c:716 lib/signature.c:771
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "¸ÅÅ©·Î ÆÄÀÏ¿¡ ºÎÀûÇÕÇÑ %%_signatureÀÇ ³»¿ëÀÌ ÀÖ½À´Ï´Ù\n"
 
-#: lib/signature.c:749
+#: lib/signature.c:750
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "¸ÅÅ©·Î ÆÄÀÏ¿¡ \"%%_gpg_name\" À» ¼³Á¤ÇØ ÁÖ¼Å¾ß ÇÕ´Ï´Ù\n"
 
-#: lib/signature.c:762
+#: lib/signature.c:763
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "¸ÅÅ©·Î ÆÄÀÏ¿¡ \"%%_pgp_name\" À» ¼³Á¤ÇØ ÁÖ¼Å¾ß ÇÕ´Ï´Ù\n"
 
-#: lib/signature.c:806
+#: lib/signature.c:807
 #, fuzzy
 msgid "Header+Payload size: "
 msgstr "Çì´õÀÇ Å©±â°¡ ³Ê¹« Å®´Ï´Ù"
 
-#: lib/signature.c:846
+#: lib/signature.c:847
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:903
+#: lib/signature.c:906
 msgid "Header SHA1 digest: "
 msgstr ""
 
-#: lib/signature.c:1082
+#: lib/signature.c:1102
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "MD5 ¼­¸íÀº °Ë»çÇÏÁö ¾Ê½À´Ï´Ù"
 
-#: lib/signature.c:1199
+#: lib/signature.c:1221
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1200
+#: lib/signature.c:1222
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "¼­¸íÀÌ ¾ø½À´Ï´Ù\n"
 
-#: lib/signature.c:1287
+#: lib/signature.c:1311
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1314
+#: lib/signature.c:1338
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1318
+#: lib/signature.c:1342
 #, fuzzy, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "¼­¸í: size(%d)+pad(%d)\n"
@@ -3463,6 +3448,10 @@ msgstr "URL Æ÷Æ®´Â ¹İµå½Ã ¼ıÀÚÀ̾î¾ß ÇÕ´Ï´Ù\n"
 msgid "failed to create %s: %s\n"
 msgstr "%s (À»)¸¦ »ı¼ºÇϴµ¥ ½ÇÆĞÇÔ: %s\n"
 
+#, fuzzy
+#~ msgid "sign a package, discarding all current signatures"
+#~ msgstr "ÆĞÅ°Áö¿¡ ¼­¸íÇÕ´Ï´Ù (±âÁ¸ÀÇ ¼­¸íÀº »èÁ¦µË´Ï´Ù)"
+
 #~ msgid "Generating signature using PGP.\n"
 #~ msgstr "PGP¸¦ »ç¿ëÇÏ¿© ¼­¸íÀ» »ı¼ºÇÕ´Ï´Ù.\n"
 
diff --git a/po/no.po b/po/no.po
index f1067f333..ec860f75d 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-03-07 17:53-0500\n"
+"POT-Creation-Date: 2002-03-08 17:22-0500\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"
@@ -1604,61 +1604,46 @@ msgstr "%s opprettet som %s\n"
 msgid "error creating temporary file %s\n"
 msgstr "feil under oppretting av midlertidig fil %s\n"
 
-#: lib/package.c:181 lib/package.c:257
+#: lib/package.c:184 lib/package.c:260
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:202 lib/package.c:265
+#: lib/package.c:205 lib/package.c:268
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:243 lib/rpmchecksig.c:161 lib/rpmchecksig.c:541
+#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:548
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: readLead feilet\n"
 
-#: lib/package.c:249
+#: lib/package.c:252
 #, fuzzy, c-format
 msgid "%s: bad magic\n"
 msgstr "Ugyldig magi"
 
-#: lib/package.c:274 lib/rpmchecksig.c:179 lib/rpmchecksig.c:557
+#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:564
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: rpmReadSignature feilet\n"
 
-#: lib/package.c:278 lib/rpmchecksig.c:183 lib/rpmchecksig.c:562
+#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:569
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Ingen signatur tilgjengelig\n"
 
-#: lib/package.c:308 lib/rpmchecksig.c:462
+#: lib/package.c:331 lib/rpmchecksig.c:467
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: readLead feilet\n"
 
-#. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:338
-msgid "========== Header RSA signature\n"
-msgstr ""
-
-#: lib/package.c:343 lib/package.c:371 lib/package.c:403 lib/rpmchecksig.c:631
+#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:642
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
-#. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:366
-msgid "========== Header DSA signature\n"
-msgstr ""
-
-#. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:397
-msgid "========== Package DSA/RSA signature\n"
-msgstr ""
-
-#: lib/package.c:415 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
+#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:496
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Fread feilet: %s\n"
@@ -2000,7 +1985,7 @@ msgstr ""
 msgid "display a verbose file listing"
 msgstr ""
 
-#: lib/poptQV.c:240 lib/poptQV.c:282 lib/poptQV.c:316
+#: lib/poptQV.c:240
 msgid "don't verify MD5 digest of files"
 msgstr ""
 
@@ -2041,45 +2026,45 @@ msgstr "ikke verifiser pakkeavhengigheter"
 msgid "don't execute verify script(s)"
 msgstr "ikke kjør %verifyscript (hvis noen)"
 
-#: lib/poptQV.c:275
+#: lib/poptQV.c:275 lib/poptQV.c:313
 #, fuzzy
 msgid "don't verify digest(s)"
 msgstr "ikke verifiser header SHA1 digest"
 
-#: lib/poptQV.c:278
+#: lib/poptQV.c:278 lib/poptQV.c:316
 #, fuzzy
 msgid "don't verify signature(s)"
 msgstr "ikke verifiser sti til symbolske lenker for filer"
 
-#: lib/poptQV.c:286 lib/poptQV.c:320
+#: lib/poptQV.c:283
 #, fuzzy
 msgid "don't verify GPG V3 DSA signature(s)"
 msgstr "ikke verifiser header SHA1 digest"
 
-#: lib/poptQV.c:289 lib/poptQV.c:323
+#: lib/poptQV.c:286
 msgid "don't verify PGP V3 RSA/MD5 signature(s)"
 msgstr ""
 
-#: lib/poptQV.c:304
+#: lib/poptQV.c:301
 #, fuzzy
-msgid "sign a package, preserving other existing signatures"
+msgid "sign a package, preserving digests"
 msgstr "signer en pakke (forkast nåværende signatur)"
 
-#: lib/poptQV.c:306
+#: lib/poptQV.c:303
 #, fuzzy
 msgid "verify package signature(s)"
 msgstr "verifiser pakkesignatur"
 
-#: lib/poptQV.c:308
+#: lib/poptQV.c:305
 msgid "import an armored public key"
 msgstr ""
 
-#: lib/poptQV.c:310
+#: lib/poptQV.c:307
 #, fuzzy
-msgid "sign a package, discarding all current signatures"
+msgid "sign a package, recomputing digests"
 msgstr "signer en pakke (forkast nåværende signatur)"
 
-#: lib/poptQV.c:312
+#: lib/poptQV.c:309
 msgid "generate signature"
 msgstr "generer signatur"
 
@@ -2246,129 +2231,129 @@ msgstr "%s feilet\n"
 msgid "incorrect format: %s\n"
 msgstr "ukorrekt format: %s\n"
 
-#: lib/query.c:221
+#: lib/query.c:220
 msgid "(contains no files)"
 msgstr "(inneholder ingen filer)"
 
-#: lib/query.c:282
+#: lib/query.c:281
 msgid "normal        "
 msgstr "normal        "
 
-#: lib/query.c:285
+#: lib/query.c:284
 msgid "replaced      "
 msgstr "erstattet     "
 
-#: lib/query.c:288
+#: lib/query.c:287
 msgid "not installed "
 msgstr "ikke installert"
 
-#: lib/query.c:291
+#: lib/query.c:290
 msgid "net shared    "
 msgstr "delt via nett "
 
-#: lib/query.c:294
+#: lib/query.c:293
 #, c-format
 msgid "(unknown %3d) "
 msgstr "(ukjent %3d)  "
 
-#: lib/query.c:299
+#: lib/query.c:298
 msgid "(no state)    "
 msgstr "(ingen tilstand)"
 
-#: lib/query.c:318 lib/query.c:374
+#: lib/query.c:317 lib/query.c:373
 msgid "package has neither file owner or id lists\n"
 msgstr "pakken har verken fileier eller id-lister\n"
 
-#: lib/query.c:463
+#: lib/query.c:462
 #, c-format
 msgid "can't query %s: %s\n"
 msgstr "kan ikke spørre på %s: %s\n"
 
-#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:333 lib/rpminstall.c:475
+#: lib/query.c:616 lib/query.c:654 lib/rpminstall.c:333 lib/rpminstall.c:475
 #: lib/rpminstall.c:845
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "feil under åpning av %s: %s\n"
 
-#: lib/query.c:633
+#: lib/query.c:632
 #, c-format
 msgid "query of %s failed\n"
 msgstr "spørring på %s feilet\n"
 
-#: lib/query.c:639
+#: lib/query.c:638
 msgid "old format source packages cannot be queried\n"
 msgstr "kildepakker i gammelt format kan ikke spørres\n"
 
-#: lib/query.c:665 lib/rpminstall.c:488
+#: lib/query.c:664 lib/rpminstall.c:488
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: lesing av manifest feilet: %s\n"
 
-#: lib/query.c:709
+#: lib/query.c:708
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:730
+#: lib/query.c:729
 msgid "no packages\n"
 msgstr "ingen pakker\n"
 
-#: lib/query.c:750
+#: lib/query.c:749
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "gruppe %s inneholder ingen pakker\n"
 
-#: lib/query.c:760
+#: lib/query.c:759
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "ingen pakke utløser %s\n"
 
-#: lib/query.c:774 lib/query.c:796 lib/query.c:814 lib/query.c:845
+#: lib/query.c:773 lib/query.c:795 lib/query.c:813 lib/query.c:844
 #, fuzzy, c-format
 msgid "malformed %s: %s\n"
 msgstr "kunne ikke opprette %s: %s\n"
 
-#: lib/query.c:784 lib/query.c:802 lib/query.c:820 lib/query.c:850
+#: lib/query.c:783 lib/query.c:801 lib/query.c:819 lib/query.c:849
 #, fuzzy, c-format
 msgid "no package matches %s: %s\n"
 msgstr "ingen pakke utløser %s\n"
 
-#: lib/query.c:861
+#: lib/query.c:860
 #, c-format
 msgid "no package requires %s\n"
 msgstr "ingen pakke krever %s\n"
 
-#: lib/query.c:872
+#: lib/query.c:871
 #, c-format
 msgid "no package provides %s\n"
 msgstr "ingen pakke gir %s\n"
 
-#: lib/query.c:906
+#: lib/query.c:905
 #, c-format
 msgid "file %s: %s\n"
 msgstr "fil %s: %s\n"
 
-#: lib/query.c:910
+#: lib/query.c:909
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "filen %s eies ikke av noen pakke\n"
 
-#: lib/query.c:937
+#: lib/query.c:936
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "ugyldig pakkenummer: %s\n"
 
-#: lib/query.c:940
+#: lib/query.c:939
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:945
+#: lib/query.c:944
 #, c-format
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:956 lib/rpminstall.c:633
+#: lib/query.c:955 lib/rpminstall.c:633
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "pakke %s er ikke installert\n"
@@ -2381,71 +2366,71 @@ msgstr ""
 msgid "(added provide)"
 msgstr ""
 
-#: lib/rpmchecksig.c:51
+#: lib/rpmchecksig.c:54
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s: åpne feilet: %s\n"
 
-#: lib/rpmchecksig.c:63
+#: lib/rpmchecksig.c:66
 msgid "makeTempFile failed\n"
 msgstr "makeTempFile feilet\n"
 
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:107
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: Fwrite feilet: %s\n"
 
-#: lib/rpmchecksig.c:166
+#: lib/rpmchecksig.c:169
 #, fuzzy, c-format
 msgid "%s: Can't sign v1 packaging\n"
 msgstr "%s: kan ikke signere v1.0 RPM\n"
 
-#: lib/rpmchecksig.c:170
+#: lib/rpmchecksig.c:173
 #, fuzzy, c-format
 msgid "%s: Can't re-sign v2 packaging\n"
 msgstr "%s: Kan ikke signere v2.0 RPM på nytt\n"
 
-#: lib/rpmchecksig.c:239
+#: lib/rpmchecksig.c:244
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: writeLead feilet: %s\n"
 
-#: lib/rpmchecksig.c:245
+#: lib/rpmchecksig.c:250
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmWriteSignature feilet: %s\n"
 
-#: lib/rpmchecksig.c:476
+#: lib/rpmchecksig.c:481
 #, fuzzy, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr "%s: readLead feilet\n"
 
-#: lib/rpmchecksig.c:547
+#: lib/rpmchecksig.c:554
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: Ingen signatur tilgjengelig (v1.0 RPM)\n"
 
-#: lib/rpmchecksig.c:773
+#: lib/rpmchecksig.c:801
 msgid "NOT OK"
 msgstr "IKKE OK"
 
-#: lib/rpmchecksig.c:774 lib/rpmchecksig.c:788
+#: lib/rpmchecksig.c:802 lib/rpmchecksig.c:816
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:776 lib/rpmchecksig.c:790
+#: lib/rpmchecksig.c:804 lib/rpmchecksig.c:818
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:777 lib/rpmchecksig.c:791
+#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:779 lib/rpmchecksig.c:793
+#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:787
+#: lib/rpmchecksig.c:815
 msgid "OK"
 msgstr "OK"
 
@@ -2655,139 +2640,139 @@ msgstr ""
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "Kunne ikke åpne spec fil %s: %s\n"
 
-#: lib/signature.c:118
+#: lib/signature.c:119
 msgid "file is not regular -- skipping size check\n"
 msgstr ""
 
-#: lib/signature.c:127
+#: lib/signature.c:128
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:132
+#: lib/signature.c:133
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:152
+#: lib/signature.c:153
 msgid "No signature\n"
 msgstr ""
 
-#: lib/signature.c:156
+#: lib/signature.c:157
 msgid "Old PGP signature\n"
 msgstr ""
 
-#: lib/signature.c:169
+#: lib/signature.c:170
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr ""
 
-#: lib/signature.c:225
+#: lib/signature.c:226
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:677
-#: lib/signature.c:710
+#: lib/signature.c:307 lib/signature.c:406 lib/signature.c:678
+#: lib/signature.c:711
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "Kunne ikke kjøre %s: %s\n"
 
-#: lib/signature.c:322
+#: lib/signature.c:323
 msgid "pgp failed\n"
 msgstr ""
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:329
+#: lib/signature.c:330
 msgid "pgp failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:334
+#: lib/signature.c:335
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:350 lib/signature.c:450
+#: lib/signature.c:351 lib/signature.c:451
 msgid "unable to read the signature\n"
 msgstr ""
 
-#: lib/signature.c:355
+#: lib/signature.c:356
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:422
+#: lib/signature.c:423
 msgid "gpg failed\n"
 msgstr ""
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:429
+#: lib/signature.c:430
 msgid "gpg failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:434
+#: lib/signature.c:435
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:455
+#: lib/signature.c:456
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:715 lib/signature.c:770
+#: lib/signature.c:716 lib/signature.c:771
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:749
+#: lib/signature.c:750
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:762
+#: lib/signature.c:763
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:806
+#: lib/signature.c:807
 #, fuzzy
 msgid "Header+Payload size: "
 msgstr "For stor header"
 
-#: lib/signature.c:846
+#: lib/signature.c:847
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:903
+#: lib/signature.c:906
 msgid "Header SHA1 digest: "
 msgstr ""
 
-#: lib/signature.c:1082
+#: lib/signature.c:1102
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "hopp over MD5-signaturer"
 
-#: lib/signature.c:1199
+#: lib/signature.c:1221
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1200
+#: lib/signature.c:1222
 msgid "V3 DSA signature: "
 msgstr ""
 
-#: lib/signature.c:1287
+#: lib/signature.c:1311
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1314
+#: lib/signature.c:1338
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1318
+#: lib/signature.c:1342
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
@@ -3414,6 +3399,10 @@ msgstr "url-port må være et tall\n"
 msgid "failed to create %s: %s\n"
 msgstr "kunne ikke opprette %s: %s\n"
 
+#, fuzzy
+#~ msgid "sign a package, discarding all current signatures"
+#~ msgstr "signer en pakke (forkast nåværende signatur)"
+
 #~ msgid "no packages given for uninstall"
 #~ msgstr "ingen pakker oppgitt for avinstallering"
 
diff --git a/po/pl.po b/po/pl.po
index d4e74e756..605cfe063 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-03-07 17:53-0500\n"
+"POT-Creation-Date: 2002-03-08 17:22-0500\n"
 "PO-Revision-Date: 1999-05-25 17:00+0100\n"
 "Last-Translator: Pawe³ Dziekoñski <pdziekonski@mml.ch.pwr.wroc.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -1651,67 +1651,50 @@ msgstr "ostrze¿enie: %s utworzony jako %s"
 msgid "error creating temporary file %s\n"
 msgstr "b³±d w tworzeniu pliku tymczasowego %s"
 
-#: lib/package.c:181 lib/package.c:257
+#: lib/package.c:184 lib/package.c:260
 #, 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:202 lib/package.c:265
+#: lib/package.c:205 lib/package.c:268
 #, 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:243 lib/rpmchecksig.c:161 lib/rpmchecksig.c:541
+#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:548
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: readLead nie powiod³o siê\n"
 
-#: lib/package.c:249
+#: lib/package.c:252
 #, fuzzy, c-format
 msgid "%s: bad magic\n"
 msgstr "B³êdny magic"
 
-#: lib/package.c:274 lib/rpmchecksig.c:179 lib/rpmchecksig.c:557
+#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:564
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: rpmReadSignature nie powiod³o siê\n"
 
-#: lib/package.c:278 lib/rpmchecksig.c:183 lib/rpmchecksig.c:562
+#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:569
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Sygnatura nie jest dostêpna\n"
 
-#: lib/package.c:308 lib/rpmchecksig.c:462
+#: lib/package.c:331 lib/rpmchecksig.c:467
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: readLead nie powiod³o siê\n"
 
-#. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:338
-#, fuzzy
-msgid "========== Header RSA signature\n"
-msgstr "Nowa sygnatura nag³ówka\n"
-
-#: lib/package.c:343 lib/package.c:371 lib/package.c:403 lib/rpmchecksig.c:631
+#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:642
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
-#. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:366
-#, fuzzy
-msgid "========== Header DSA signature\n"
-msgstr "Nowa sygnatura nag³ówka\n"
-
-#. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:397
-msgid "========== Package DSA/RSA signature\n"
-msgstr ""
-
-#: lib/package.c:415 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
+#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:496
 #, fuzzy, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: readLead nie powiod³o siê\n"
@@ -2075,7 +2058,7 @@ msgstr "wy¶wietl status pokazywanych plików"
 msgid "display a verbose file listing"
 msgstr "wy¶wietl wiêcej informacji o plikach z listy"
 
-#: lib/poptQV.c:240 lib/poptQV.c:282 lib/poptQV.c:316
+#: lib/poptQV.c:240
 #, fuzzy
 msgid "don't verify MD5 digest of files"
 msgstr "nie sprawdzaj plików pakietu"
@@ -2123,46 +2106,46 @@ msgstr "nie sprawdzaj zale¿no¶ci pakietu"
 msgid "don't execute verify script(s)"
 msgstr "nie wykonuj ¿adnych etapów"
 
-#: lib/poptQV.c:275
+#: lib/poptQV.c:275 lib/poptQV.c:313
 #, fuzzy
 msgid "don't verify digest(s)"
 msgstr "nie sprawdzaj plików pakietu"
 
-#: lib/poptQV.c:278
+#: lib/poptQV.c:278 lib/poptQV.c:316
 #, fuzzy
 msgid "don't verify signature(s)"
 msgstr "nie sprawdzaj plików pakietu"
 
-#: lib/poptQV.c:286 lib/poptQV.c:320
+#: lib/poptQV.c:283
 #, fuzzy
 msgid "don't verify GPG V3 DSA signature(s)"
 msgstr "nie sprawdzaj plików pakietu"
 
-#: lib/poptQV.c:289 lib/poptQV.c:323
+#: lib/poptQV.c:286
 #, fuzzy
 msgid "don't verify PGP V3 RSA/MD5 signature(s)"
 msgstr "nie sprawdzaj plików pakietu"
 
-#: lib/poptQV.c:304
+#: lib/poptQV.c:301
 #, fuzzy
-msgid "sign a package, preserving other existing signatures"
+msgid "sign a package, preserving digests"
 msgstr "podpisz pakiet (porzuæ bierz±c± sygnaturê)"
 
-#: lib/poptQV.c:306
+#: lib/poptQV.c:303
 #, fuzzy
 msgid "verify package signature(s)"
 msgstr "sprawd¼ sygnaturê pakietu"
 
-#: lib/poptQV.c:308
+#: lib/poptQV.c:305
 msgid "import an armored public key"
 msgstr ""
 
-#: lib/poptQV.c:310
+#: lib/poptQV.c:307
 #, fuzzy
-msgid "sign a package, discarding all current signatures"
+msgid "sign a package, recomputing digests"
 msgstr "podpisz pakiet (porzuæ bierz±c± sygnaturê)"
 
-#: lib/poptQV.c:312
+#: lib/poptQV.c:309
 #, fuzzy
 msgid "generate signature"
 msgstr "generuj sygnaturê PGP/GPG"
@@ -2334,131 +2317,131 @@ msgstr "%s nie powiod³o siê"
 msgid "incorrect format: %s\n"
 msgstr "b³±d w formacie: %s\n"
 
-#: lib/query.c:221
+#: lib/query.c:220
 msgid "(contains no files)"
 msgstr "(nie zawiera plików)"
 
-#: lib/query.c:282
+#: lib/query.c:281
 msgid "normal        "
 msgstr "normalny      "
 
-#: lib/query.c:285
+#: lib/query.c:284
 msgid "replaced      "
 msgstr "zast±piony    "
 
-#: lib/query.c:288
+#: lib/query.c:287
 msgid "not installed "
 msgstr "niezainstalowany"
 
-#: lib/query.c:291
+#: lib/query.c:290
 msgid "net shared    "
 msgstr "udostêpniony w sieci"
 
-#: lib/query.c:294
+#: lib/query.c:293
 #, c-format
 msgid "(unknown %3d) "
 msgstr "(nieznany %3d)"
 
-#: lib/query.c:299
+#: lib/query.c:298
 msgid "(no state)    "
 msgstr "(brak statusu)"
 
-#: lib/query.c:318 lib/query.c:374
+#: lib/query.c:317 lib/query.c:373
 #, 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:463
+#: lib/query.c:462
 #, fuzzy, c-format
 msgid "can't query %s: %s\n"
 msgstr "nie mo¿na odwi±zaæ %s: %s\n"
 
-#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:333 lib/rpminstall.c:475
+#: lib/query.c:616 lib/query.c:654 lib/rpminstall.c:333 lib/rpminstall.c:475
 #: lib/rpminstall.c:845
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "otwarcie %s nie powiod³o siê\n"
 
-#: lib/query.c:633
+#: lib/query.c:632
 #, c-format
 msgid "query of %s failed\n"
 msgstr "odpytywanie %s nie powiod³o siê\n"
 
-#: lib/query.c:639
+#: lib/query.c:638
 msgid "old format source packages cannot be queried\n"
 msgstr "pakiety w starym formacie nie mog± byæ odpytywane\n"
 
-#: lib/query.c:665 lib/rpminstall.c:488
+#: lib/query.c:664 lib/rpminstall.c:488
 #, fuzzy, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: readLead nie powiod³o siê\n"
 
-#: lib/query.c:709
+#: lib/query.c:708
 #, 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:730
+#: lib/query.c:729
 #, fuzzy
 msgid "no packages\n"
 msgstr "znaleziono %d pakietów\n"
 
-#: lib/query.c:750
+#: lib/query.c:749
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "grupa %s nie zawiera ¿adnych pakietów\n"
 
-#: lib/query.c:760
+#: lib/query.c:759
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "¿aden pakiet nie zahacza %s\n"
 
-#: lib/query.c:774 lib/query.c:796 lib/query.c:814 lib/query.c:845
+#: lib/query.c:773 lib/query.c:795 lib/query.c:813 lib/query.c:844
 #, fuzzy, c-format
 msgid "malformed %s: %s\n"
 msgstr "Odczytanie %s nie powiod³o siê: %s."
 
-#: lib/query.c:784 lib/query.c:802 lib/query.c:820 lib/query.c:850
+#: lib/query.c:783 lib/query.c:801 lib/query.c:819 lib/query.c:849
 #, fuzzy, c-format
 msgid "no package matches %s: %s\n"
 msgstr "¿aden pakiet nie zahacza %s\n"
 
-#: lib/query.c:861
+#: lib/query.c:860
 #, c-format
 msgid "no package requires %s\n"
 msgstr "¿aden pakiet nie wymaga %s\n"
 
-#: lib/query.c:872
+#: lib/query.c:871
 #, c-format
 msgid "no package provides %s\n"
 msgstr "¿aden pakiet nie udostêpnia %s\n"
 
-#: lib/query.c:906
+#: lib/query.c:905
 #, c-format
 msgid "file %s: %s\n"
 msgstr "plik %s: %s\n"
 
-#: lib/query.c:910
+#: lib/query.c:909
 #, 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:937
+#: lib/query.c:936
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "b³êdny numer pakietu: %s\n"
 
-#: lib/query.c:940
+#: lib/query.c:939
 #, fuzzy, c-format
 msgid "package record number: %u\n"
 msgstr "numer rekordu pakietu: %d\n"
 
-#: lib/query.c:945
+#: lib/query.c:944
 #, fuzzy, c-format
 msgid "record %u could not be read\n"
 msgstr "nie mo¿na odczytaæ rekordu %d\n"
 
-#: lib/query.c:956 lib/rpminstall.c:633
+#: lib/query.c:955 lib/rpminstall.c:633
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "pakiet %s nie jest zainstalowany\n"
@@ -2473,72 +2456,72 @@ msgstr "b³êdny status pliku: %s"
 msgid "(added provide)"
 msgstr "Udostêpniane zasoby:"
 
-#: lib/rpmchecksig.c:51
+#: lib/rpmchecksig.c:54
 #, fuzzy, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s: Open nie powiod³o siê\n"
 
-#: lib/rpmchecksig.c:63
+#: lib/rpmchecksig.c:66
 #, fuzzy
 msgid "makeTempFile failed\n"
 msgstr "wykonanie nie powiod³o siê\n"
 
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:107
 #, fuzzy, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: readLead nie powiod³o siê\n"
 
-#: lib/rpmchecksig.c:166
+#: lib/rpmchecksig.c:169
 #, fuzzy, c-format
 msgid "%s: Can't sign v1 packaging\n"
 msgstr "%s: Nie mo¿na podpisaæ v1.0 RPM\n"
 
-#: lib/rpmchecksig.c:170
+#: lib/rpmchecksig.c:173
 #, fuzzy, c-format
 msgid "%s: Can't re-sign v2 packaging\n"
 msgstr "%s: Nie mo¿na ponownie podpisaæ v2.0 RPM\n"
 
-#: lib/rpmchecksig.c:239
+#: lib/rpmchecksig.c:244
 #, fuzzy, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: readLead nie powiod³o siê\n"
 
-#: lib/rpmchecksig.c:245
+#: lib/rpmchecksig.c:250
 #, fuzzy, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmReadSignature nie powiod³o siê\n"
 
-#: lib/rpmchecksig.c:476
+#: lib/rpmchecksig.c:481
 #, fuzzy, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr "%s: readLead nie powiod³o siê\n"
 
-#: lib/rpmchecksig.c:547
+#: lib/rpmchecksig.c:554
 #, 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:773
+#: lib/rpmchecksig.c:801
 msgid "NOT OK"
 msgstr "NIE DOBRZE"
 
-#: lib/rpmchecksig.c:774 lib/rpmchecksig.c:788
+#: lib/rpmchecksig.c:802 lib/rpmchecksig.c:816
 msgid " (MISSING KEYS:"
 msgstr " (BRAK KLUCZY:"
 
-#: lib/rpmchecksig.c:776 lib/rpmchecksig.c:790
+#: lib/rpmchecksig.c:804 lib/rpmchecksig.c:818
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:777 lib/rpmchecksig.c:791
+#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819
 msgid " (UNTRUSTED KEYS:"
 msgstr "(NIEWIARYGODNE KLUCZE:"
 
-#: lib/rpmchecksig.c:779 lib/rpmchecksig.c:793
+#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:787
+#: lib/rpmchecksig.c:815
 msgid "OK"
 msgstr "OK"
 
@@ -2749,146 +2732,146 @@ msgstr ""
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "Nie mo¿na otworzyæ %s do odczytu: %s."
 
-#: lib/signature.c:118
+#: lib/signature.c:119
 msgid "file is not regular -- skipping size check\n"
 msgstr "plik nieregularny -- sprawdzanie rozmiaru pominiête\n"
 
-#: lib/signature.c:127
+#: lib/signature.c:128
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:132
+#: lib/signature.c:133
 #, fuzzy, c-format
 msgid "  Actual size: %12d\n"
 msgstr "Rozmiar sygnatury: %d\n"
 
-#: lib/signature.c:152
+#: lib/signature.c:153
 msgid "No signature\n"
 msgstr "Brak sygnatury\n"
 
-#: lib/signature.c:156
+#: lib/signature.c:157
 msgid "Old PGP signature\n"
 msgstr "Stara sygnatura PGP\n"
 
-#: lib/signature.c:169
+#: lib/signature.c:170
 #, fuzzy
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr "Stara (tylko wewnêtrzna) sygnatura! Sk±d Ty to wzi±³e¶!?"
 
-#: lib/signature.c:225
+#: lib/signature.c:226
 #, fuzzy, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "Rozmiar sygnatury: %d\n"
 
-#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:677
-#: lib/signature.c:710
+#: lib/signature.c:307 lib/signature.c:406 lib/signature.c:678
+#: lib/signature.c:711
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "Nie mo¿na uruchomiæ %s"
 
-#: lib/signature.c:322
+#: lib/signature.c:323
 #, fuzzy
 msgid "pgp failed\n"
 msgstr "pgp nie powiod³o siê"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:329
+#: lib/signature.c:330
 #, fuzzy
 msgid "pgp failed to write signature\n"
 msgstr "zapisanie sygnatury przez pgp nie powiod³o siê"
 
-#: lib/signature.c:334
+#: lib/signature.c:335
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr "rozmiar sygnatury PGP: %d\n"
 
-#: lib/signature.c:350 lib/signature.c:450
+#: lib/signature.c:351 lib/signature.c:451
 #, fuzzy
 msgid "unable to read the signature\n"
 msgstr "nie mo¿na odczytaæ sygnatury"
 
-#: lib/signature.c:355
+#: lib/signature.c:356
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr "Mam %d bajtów sygnatury PGP\n"
 
-#: lib/signature.c:422
+#: lib/signature.c:423
 #, fuzzy
 msgid "gpg failed\n"
 msgstr "gpg nie powiod³o siê"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:429
+#: lib/signature.c:430
 #, fuzzy
 msgid "gpg failed to write signature\n"
 msgstr "zapisanie sygnatury przez gpg nie powiod³o siê"
 
-#: lib/signature.c:434
+#: lib/signature.c:435
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr "rozmiar sygnatury GPG: %d\n"
 
-#: lib/signature.c:455
+#: lib/signature.c:456
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr "Mam %d bajtów sygnatury GPG\n"
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:715 lib/signature.c:770
+#: lib/signature.c:716 lib/signature.c:771
 #, fuzzy, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "B³êdny %%_signature spec w pliku makra.\n"
 
-#: lib/signature.c:749
+#: lib/signature.c:750
 #, fuzzy, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "Musisz ustawiæ \"%%_gpg_name\" w pliku swego makra"
 
-#: lib/signature.c:762
+#: lib/signature.c:763
 #, fuzzy, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "Musisz ustawiæ \"%%_pgp_name\" w pliku swego makra"
 
-#: lib/signature.c:806
+#: lib/signature.c:807
 #, fuzzy
 msgid "Header+Payload size: "
 msgstr "Rozmiar nag³ówka jest zbyt du¿y"
 
-#: lib/signature.c:846
+#: lib/signature.c:847
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:903
+#: lib/signature.c:906
 msgid "Header SHA1 digest: "
 msgstr ""
 
-#: lib/signature.c:1082
+#: lib/signature.c:1102
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "pomiñ wszelkie sygnatury MD5"
 
-#: lib/signature.c:1199
+#: lib/signature.c:1221
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1200
+#: lib/signature.c:1222
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "Brak sygnatury\n"
 
-#: lib/signature.c:1287
+#: lib/signature.c:1311
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1314
+#: lib/signature.c:1338
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1318
+#: lib/signature.c:1342
 #, fuzzy, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Blok sygnatury: %d\n"
@@ -3534,6 +3517,18 @@ msgid "failed to create %s: %s\n"
 msgstr "utworzenie %s nie powiod³o siê\n"
 
 #, fuzzy
+#~ msgid "========== Header RSA signature\n"
+#~ msgstr "Nowa sygnatura nag³ówka\n"
+
+#, fuzzy
+#~ msgid "========== Header DSA signature\n"
+#~ msgstr "Nowa sygnatura nag³ówka\n"
+
+#, fuzzy
+#~ msgid "sign a package, discarding all current signatures"
+#~ msgstr "podpisz pakiet (porzuæ bierz±c± sygnaturê)"
+
+#, fuzzy
 #~ msgid "Generating signature using PGP.\n"
 #~ msgstr "Generowanie sygnatury: %d\n"
 
diff --git a/po/pt.po b/po/pt.po
index db569b104..3bae8b840 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: 2002-03-07 17:53-0500\n"
+"POT-Creation-Date: 2002-03-08 17:22-0500\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"
@@ -1607,62 +1607,46 @@ msgstr "%s criado como %s\n"
 msgid "error creating temporary file %s\n"
 msgstr "erro ao criar o ficheiro temporário %s\n"
 
-#: lib/package.c:181 lib/package.c:257
+#: lib/package.c:184 lib/package.c:260
 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:202 lib/package.c:265
+#: lib/package.c:205 lib/package.c:268
 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:243 lib/rpmchecksig.c:161 lib/rpmchecksig.c:541
+#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:548
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ":%s: o readLead falhou\n"
 
-#: lib/package.c:249
+#: lib/package.c:252
 #, fuzzy, c-format
 msgid "%s: bad magic\n"
 msgstr "Código de integridade inválido"
 
-#: lib/package.c:274 lib/rpmchecksig.c:179 lib/rpmchecksig.c:557
+#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:564
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: o rpmReadSignature falhou\n"
 
-#: lib/package.c:278 lib/rpmchecksig.c:183 lib/rpmchecksig.c:562
+#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:569
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Nenhuma assinatura disponível\n"
 
-#: lib/package.c:308 lib/rpmchecksig.c:462
+#: lib/package.c:331 lib/rpmchecksig.c:467
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr ":%s: o readLead falhou\n"
 
-#. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:338
-#, fuzzy
-msgid "========== Header RSA signature\n"
-msgstr "========== a realizar o tsort nos pacotes\n"
-
-#: lib/package.c:343 lib/package.c:371 lib/package.c:403 lib/rpmchecksig.c:631
+#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:642
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
-#. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:366
-msgid "========== Header DSA signature\n"
-msgstr ""
-
-#. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:397
-msgid "========== Package DSA/RSA signature\n"
-msgstr ""
-
-#: lib/package.c:415 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
+#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:496
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: O fread falhou: %s\n"
@@ -2006,7 +1990,7 @@ msgstr "mostrar os estados dos ficheiros listados"
 msgid "display a verbose file listing"
 msgstr "mostrar uma listagem descritiva do ficheiro"
 
-#: lib/poptQV.c:240 lib/poptQV.c:282 lib/poptQV.c:316
+#: lib/poptQV.c:240
 #, fuzzy
 msgid "don't verify MD5 digest of files"
 msgstr "não verificar os ficheiros no pacote"
@@ -2054,46 +2038,46 @@ msgstr "não verifica as dependências do pacote"
 msgid "don't execute verify script(s)"
 msgstr "não executar o %verifyscript (se existir)"
 
-#: lib/poptQV.c:275
+#: lib/poptQV.c:275 lib/poptQV.c:313
 #, fuzzy
 msgid "don't verify digest(s)"
 msgstr "não verificar os ficheiros no pacote"
 
-#: lib/poptQV.c:278
+#: lib/poptQV.c:278 lib/poptQV.c:316
 #, fuzzy
 msgid "don't verify signature(s)"
 msgstr "não verificar os ficheiros no pacote"
 
-#: lib/poptQV.c:286 lib/poptQV.c:320
+#: lib/poptQV.c:283
 #, fuzzy
 msgid "don't verify GPG V3 DSA signature(s)"
 msgstr "não verificar os ficheiros no pacote"
 
-#: lib/poptQV.c:289 lib/poptQV.c:323
+#: lib/poptQV.c:286
 #, fuzzy
 msgid "don't verify PGP V3 RSA/MD5 signature(s)"
 msgstr "não verificar os ficheiros no pacote"
 
-#: lib/poptQV.c:304
+#: lib/poptQV.c:301
 #, fuzzy
-msgid "sign a package, preserving other existing signatures"
+msgid "sign a package, preserving digests"
 msgstr "assinar um pacote (retira a assinatura actual)"
 
-#: lib/poptQV.c:306
+#: lib/poptQV.c:303
 #, fuzzy
 msgid "verify package signature(s)"
 msgstr "verificar a assinatura do pacote"
 
-#: lib/poptQV.c:308
+#: lib/poptQV.c:305
 msgid "import an armored public key"
 msgstr ""
 
-#: lib/poptQV.c:310
+#: lib/poptQV.c:307
 #, fuzzy
-msgid "sign a package, discarding all current signatures"
+msgid "sign a package, recomputing digests"
 msgstr "assinar um pacote (retira a assinatura actual)"
 
-#: lib/poptQV.c:312
+#: lib/poptQV.c:309
 #, fuzzy
 msgid "generate signature"
 msgstr "gerar a assinatura PGP/GPG"
@@ -2261,129 +2245,129 @@ msgstr "O %s falhou\n"
 msgid "incorrect format: %s\n"
 msgstr "formato incorrecto: %s\n"
 
-#: lib/query.c:221
+#: lib/query.c:220
 msgid "(contains no files)"
 msgstr "(não contém ficheiros)"
 
-#: lib/query.c:282
+#: lib/query.c:281
 msgid "normal        "
 msgstr "normal        "
 
-#: lib/query.c:285
+#: lib/query.c:284
 msgid "replaced      "
 msgstr "substituído   "
 
-#: lib/query.c:288
+#: lib/query.c:287
 msgid "not installed "
 msgstr "não instalado "
 
-#: lib/query.c:291
+#: lib/query.c:290
 msgid "net shared    "
 msgstr "partilhado"
 
-#: lib/query.c:294
+#: lib/query.c:293
 #, c-format
 msgid "(unknown %3d) "
 msgstr "(desconhecido %3d)"
 
-#: lib/query.c:299
+#: lib/query.c:298
 msgid "(no state)    "
 msgstr "(sem estado)  "
 
-#: lib/query.c:318 lib/query.c:374
+#: lib/query.c:317 lib/query.c:373
 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:463
+#: lib/query.c:462
 #, c-format
 msgid "can't query %s: %s\n"
 msgstr "não consigo pesquisar o %s: %s\n"
 
-#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:333 lib/rpminstall.c:475
+#: lib/query.c:616 lib/query.c:654 lib/rpminstall.c:333 lib/rpminstall.c:475
 #: lib/rpminstall.c:845
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "o acesso ao %s falhou: %s\n"
 
-#: lib/query.c:633
+#: lib/query.c:632
 #, c-format
 msgid "query of %s failed\n"
 msgstr "a pesquisa do %s falhou\n"
 
-#: lib/query.c:639
+#: lib/query.c:638
 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:665 lib/rpminstall.c:488
+#: lib/query.c:664 lib/rpminstall.c:488
 #, fuzzy, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: O fread falhou: %s\n"
 
-#: lib/query.c:709
+#: lib/query.c:708
 #, 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:730
+#: lib/query.c:729
 msgid "no packages\n"
 msgstr "nenhum pacote\n"
 
-#: lib/query.c:750
+#: lib/query.c:749
 #, 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:760
+#: lib/query.c:759
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "nenhum pacote activa o %s\n"
 
-#: lib/query.c:774 lib/query.c:796 lib/query.c:814 lib/query.c:845
+#: lib/query.c:773 lib/query.c:795 lib/query.c:813 lib/query.c:844
 #, fuzzy, c-format
 msgid "malformed %s: %s\n"
 msgstr "Não consegui ler o %s: %s.\n"
 
-#: lib/query.c:784 lib/query.c:802 lib/query.c:820 lib/query.c:850
+#: lib/query.c:783 lib/query.c:801 lib/query.c:819 lib/query.c:849
 #, fuzzy, c-format
 msgid "no package matches %s: %s\n"
 msgstr "nenhum pacote activa o %s\n"
 
-#: lib/query.c:861
+#: lib/query.c:860
 #, c-format
 msgid "no package requires %s\n"
 msgstr "nenhum pacote precisa do %s\n"
 
-#: lib/query.c:872
+#: lib/query.c:871
 #, c-format
 msgid "no package provides %s\n"
 msgstr "nenhum pacote oferece o %s\n"
 
-#: lib/query.c:906
+#: lib/query.c:905
 #, c-format
 msgid "file %s: %s\n"
 msgstr "ficheiro %s: %s\n"
 
-#: lib/query.c:910
+#: lib/query.c:909
 #, 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:937
+#: lib/query.c:936
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "número de pacote inválido: %s\n"
 
-#: lib/query.c:940
+#: lib/query.c:939
 #, c-format
 msgid "package record number: %u\n"
 msgstr "número de registo do pacote: %u\n"
 
-#: lib/query.c:945
+#: lib/query.c:944
 #, 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:956 lib/rpminstall.c:633
+#: lib/query.c:955 lib/rpminstall.c:633
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "o pacote %s não está instalado\n"
@@ -2398,71 +2382,71 @@ msgstr "ficheiro db inválido %s\n"
 msgid "(added provide)"
 msgstr "%s: %-45s SI (oferecidos pelo db)\n"
 
-#: lib/rpmchecksig.c:51
+#: lib/rpmchecksig.c:54
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s: o acesso falhou: %s\n"
 
-#: lib/rpmchecksig.c:63
+#: lib/rpmchecksig.c:66
 msgid "makeTempFile failed\n"
 msgstr "o makeTempFile falhou\n"
 
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:107
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: O fwrite falhou: %s\n"
 
-#: lib/rpmchecksig.c:166
+#: lib/rpmchecksig.c:169
 #, fuzzy, c-format
 msgid "%s: Can't sign v1 packaging\n"
 msgstr "%s: Não consigo assinar o RPM v1.0\n"
 
-#: lib/rpmchecksig.c:170
+#: lib/rpmchecksig.c:173
 #, fuzzy, c-format
 msgid "%s: Can't re-sign v2 packaging\n"
 msgstr "%s: não consigo assinar de novo o RPM v2.0\n"
 
-#: lib/rpmchecksig.c:239
+#: lib/rpmchecksig.c:244
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: o writeLead falhou: %s\n"
 
-#: lib/rpmchecksig.c:245
+#: lib/rpmchecksig.c:250
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: o rpmWriteSignature falhou: %s\n"
 
-#: lib/rpmchecksig.c:476
+#: lib/rpmchecksig.c:481
 #, fuzzy, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr ":%s: o readLead falhou\n"
 
-#: lib/rpmchecksig.c:547
+#: lib/rpmchecksig.c:554
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: Nenhuma assinatura disponível (RPM v1.0)\n"
 
-#: lib/rpmchecksig.c:773
+#: lib/rpmchecksig.c:801
 msgid "NOT OK"
 msgstr "NÃO-OK"
 
-#: lib/rpmchecksig.c:774 lib/rpmchecksig.c:788
+#: lib/rpmchecksig.c:802 lib/rpmchecksig.c:816
 msgid " (MISSING KEYS:"
 msgstr " (FALTAM AS CHAVES:"
 
-#: lib/rpmchecksig.c:776 lib/rpmchecksig.c:790
+#: lib/rpmchecksig.c:804 lib/rpmchecksig.c:818
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:777 lib/rpmchecksig.c:791
+#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819
 msgid " (UNTRUSTED KEYS:"
 msgstr " (CHAVES SUSPEITAS:"
 
-#: lib/rpmchecksig.c:779 lib/rpmchecksig.c:793
+#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:787
+#: lib/rpmchecksig.c:815
 msgid "OK"
 msgstr "OK"
 
@@ -2674,140 +2658,140 @@ msgstr "Não consigo ler o %s, a HOME é demasiado grande.\n"
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "Não consegui abrir o %s para leitura: %s.\n"
 
-#: lib/signature.c:118
+#: lib/signature.c:119
 msgid "file is not regular -- skipping size check\n"
 msgstr "o ficheiro não é normal -- a ignorar a verificação do tamanho\n"
 
-#: lib/signature.c:127
+#: lib/signature.c:128
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr "Esperado um tamanho: %12d = início(%d)+assin.(%d)+'pad'(%d)+dados(%d)\n"
 
-#: lib/signature.c:132
+#: lib/signature.c:133
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr "  Tamanho real: %12d\n"
 
-#: lib/signature.c:152
+#: lib/signature.c:153
 msgid "No signature\n"
 msgstr "Sem assinatura\n"
 
-#: lib/signature.c:156
+#: lib/signature.c:157
 msgid "Old PGP signature\n"
 msgstr "Assinatura PGP antiga\n"
 
-#: lib/signature.c:169
+#: lib/signature.c:170
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr "Assinatura (só interna) antiga! Como é que obteve isto!?\n"
 
-#: lib/signature.c:225
+#: lib/signature.c:226
 #, fuzzy, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "Tamanho da assinatura: %d\n"
 
-#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:677
-#: lib/signature.c:710
+#: lib/signature.c:307 lib/signature.c:406 lib/signature.c:678
+#: lib/signature.c:711
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "Não consegui executar o %s: %S\n"
 
-#: lib/signature.c:322
+#: lib/signature.c:323
 msgid "pgp failed\n"
 msgstr "o pgp falhou\n"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:329
+#: lib/signature.c:330
 msgid "pgp failed to write signature\n"
 msgstr "o pgp não conseguiu gravar a assinatura\n"
 
-#: lib/signature.c:334
+#: lib/signature.c:335
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr "tamanho da assinatura do PGP: %d\n"
 
-#: lib/signature.c:350 lib/signature.c:450
+#: lib/signature.c:351 lib/signature.c:451
 msgid "unable to read the signature\n"
 msgstr "incapaz de ler a assinatura\n"
 
-#: lib/signature.c:355
+#: lib/signature.c:356
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr "Obtive %d bytes da assinatura PGP\n"
 
-#: lib/signature.c:422
+#: lib/signature.c:423
 msgid "gpg failed\n"
 msgstr "o gpg falhou\n"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:429
+#: lib/signature.c:430
 msgid "gpg failed to write signature\n"
 msgstr "o gpg não conseguiu gravar a assinatura\n"
 
-#: lib/signature.c:434
+#: lib/signature.c:435
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr "Tamanho da assinatura do GPG: %d\n"
 
-#: lib/signature.c:455
+#: lib/signature.c:456
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr "Obtive %d bytes da assinatura do GPG\n"
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:715 lib/signature.c:770
+#: lib/signature.c:716 lib/signature.c:771
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "'Spec' %%_signature inválido no ficheiro de macros\n"
 
-#: lib/signature.c:749
+#: lib/signature.c:750
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "Precisa definir o \"%%_gpg_name\" no seu ficheiro de macros\n"
 
-#: lib/signature.c:762
+#: lib/signature.c:763
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "Precisa definir o \"%%_pgp_name\" no seu ficheiro de macros\n"
 
-#: lib/signature.c:806
+#: lib/signature.c:807
 #, fuzzy
 msgid "Header+Payload size: "
 msgstr "Tamanho do cabeçalho demasiado grande"
 
-#: lib/signature.c:846
+#: lib/signature.c:847
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:903
+#: lib/signature.c:906
 msgid "Header SHA1 digest: "
 msgstr ""
 
-#: lib/signature.c:1082
+#: lib/signature.c:1102
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "ignorar as assinaturas de MD5"
 
-#: lib/signature.c:1199
+#: lib/signature.c:1221
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1200
+#: lib/signature.c:1222
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "Sem assinatura\n"
 
-#: lib/signature.c:1287
+#: lib/signature.c:1311
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1314
+#: lib/signature.c:1338
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1318
+#: lib/signature.c:1342
 #, fuzzy, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "'Pad' ou preenchimento da assinatura: %d\n"
@@ -3441,6 +3425,14 @@ msgid "failed to create %s: %s\n"
 msgstr "não consegui criar o %s: %s\n"
 
 #, fuzzy
+#~ msgid "========== Header RSA signature\n"
+#~ msgstr "========== a realizar o tsort nos pacotes\n"
+
+#, fuzzy
+#~ msgid "sign a package, discarding all current signatures"
+#~ msgstr "assinar um pacote (retira a assinatura actual)"
+
+#, fuzzy
 #~ msgid "========== Package RSA signature\n"
 #~ msgstr "========== a realizar o tsort nos pacotes\n"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 8c943db8f..948b95e34 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-03-07 17:53-0500\n"
+"POT-Creation-Date: 2002-03-08 17:22-0500\n"
 
 #: build.c:36
 #, fuzzy
@@ -1769,65 +1769,48 @@ msgstr "No consegui abrir: %s\n"
 msgid "error creating temporary file %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/package.c:181 lib/package.c:257
+#: lib/package.c:184 lib/package.c:260
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:202 lib/package.c:265
+#: lib/package.c:205 lib/package.c:268
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:243 lib/rpmchecksig.c:161 lib/rpmchecksig.c:541
+#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:548
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
 
-#: lib/package.c:249
+#: lib/package.c:252
 #, c-format
 msgid "%s: bad magic\n"
 msgstr ""
 
-#: lib/package.c:274 lib/rpmchecksig.c:179 lib/rpmchecksig.c:557
+#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:564
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/package.c:278 lib/rpmchecksig.c:183 lib/rpmchecksig.c:562
+#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:569
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
 # , c-format
-#: lib/package.c:308 lib/rpmchecksig.c:462
+#: lib/package.c:331 lib/rpmchecksig.c:467
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "No consegui abrir: %s\n"
 
-#. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:338
-#, fuzzy
-msgid "========== Header RSA signature\n"
-msgstr "gere assinatura PGP"
-
-#: lib/package.c:343 lib/package.c:371 lib/package.c:403 lib/rpmchecksig.c:631
+#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:642
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
-#. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:366
-#, fuzzy
-msgid "========== Header DSA signature\n"
-msgstr "gere assinatura PGP"
-
-#. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:397
-msgid "========== Package DSA/RSA signature\n"
-msgstr ""
-
 # , c-format
-#: lib/package.c:415 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
+#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:496
 #, fuzzy, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "No consegui abrir: %s\n"
@@ -2199,7 +2182,7 @@ msgstr ""
 msgid "display a verbose file listing"
 msgstr "mostre a lista de arquivos do pacote"
 
-#: lib/poptQV.c:240 lib/poptQV.c:282 lib/poptQV.c:316
+#: lib/poptQV.c:240
 #, fuzzy
 msgid "don't verify MD5 digest of files"
 msgstr "instale pacote"
@@ -2248,46 +2231,46 @@ msgstr "no verifique as dependncias do pacote"
 msgid "don't execute verify script(s)"
 msgstr "no execute nenhum estgio"
 
-#: lib/poptQV.c:275
+#: lib/poptQV.c:275 lib/poptQV.c:313
 #, fuzzy
 msgid "don't verify digest(s)"
 msgstr "instale pacote"
 
-#: lib/poptQV.c:278
+#: lib/poptQV.c:278 lib/poptQV.c:316
 #, fuzzy
 msgid "don't verify signature(s)"
 msgstr "instale pacote"
 
-#: lib/poptQV.c:286 lib/poptQV.c:320
+#: lib/poptQV.c:283
 #, fuzzy
 msgid "don't verify GPG V3 DSA signature(s)"
 msgstr "instale pacote"
 
-#: lib/poptQV.c:289 lib/poptQV.c:323
+#: lib/poptQV.c:286
 #, fuzzy
 msgid "don't verify PGP V3 RSA/MD5 signature(s)"
 msgstr "instale pacote"
 
-#: lib/poptQV.c:304
+#: lib/poptQV.c:301
 #, fuzzy
-msgid "sign a package, preserving other existing signatures"
+msgid "sign a package, preserving digests"
 msgstr "assine um pacote (descarte a assinatura corrente)"
 
-#: lib/poptQV.c:306
+#: lib/poptQV.c:303
 #, fuzzy
 msgid "verify package signature(s)"
 msgstr "verifique a assinatura do pacote"
 
-#: lib/poptQV.c:308
+#: lib/poptQV.c:305
 msgid "import an armored public key"
 msgstr ""
 
-#: lib/poptQV.c:310
+#: lib/poptQV.c:307
 #, fuzzy
-msgid "sign a package, discarding all current signatures"
+msgid "sign a package, recomputing digests"
 msgstr "assine um pacote (descarte a assinatura corrente)"
 
-#: lib/poptQV.c:312
+#: lib/poptQV.c:309
 #, fuzzy
 msgid "generate signature"
 msgstr "gere assinatura PGP"
@@ -2457,135 +2440,135 @@ msgstr "Construo falhou.\n"
 msgid "incorrect format: %s\n"
 msgstr ""
 
-#: lib/query.c:221
+#: lib/query.c:220
 msgid "(contains no files)"
 msgstr ""
 
-#: lib/query.c:282
+#: lib/query.c:281
 msgid "normal        "
 msgstr ""
 
-#: lib/query.c:285
+#: lib/query.c:284
 msgid "replaced      "
 msgstr ""
 
-#: lib/query.c:288
+#: lib/query.c:287
 #, fuzzy
 msgid "not installed "
 msgstr "no foi passado pacote para instalao"
 
-#: lib/query.c:291
+#: lib/query.c:290
 msgid "net shared    "
 msgstr ""
 
-#: lib/query.c:294
+#: lib/query.c:293
 #, c-format
 msgid "(unknown %3d) "
 msgstr ""
 
-#: lib/query.c:299
+#: lib/query.c:298
 msgid "(no state)    "
 msgstr ""
 
-#: lib/query.c:318 lib/query.c:374
+#: lib/query.c:317 lib/query.c:373
 #, fuzzy
 msgid "package has neither file owner or id lists\n"
 msgstr "no foi passado pacote para instalao"
 
 # , c-format
-#: lib/query.c:463
+#: lib/query.c:462
 #, fuzzy, c-format
 msgid "can't query %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:333 lib/rpminstall.c:475
+#: lib/query.c:616 lib/query.c:654 lib/rpminstall.c:333 lib/rpminstall.c:475
 #: lib/rpminstall.c:845
 #, fuzzy, c-format
 msgid "open of %s failed: %s\n"
 msgstr "Construo falhou.\n"
 
-#: lib/query.c:633
+#: lib/query.c:632
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:639
+#: lib/query.c:638
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
 # , c-format
-#: lib/query.c:665 lib/rpminstall.c:488
+#: lib/query.c:664 lib/rpminstall.c:488
 #, fuzzy, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/query.c:709
+#: lib/query.c:708
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:730
+#: lib/query.c:729
 #, fuzzy
 msgid "no packages\n"
 msgstr "pesquise todos os pacotes"
 
-#: lib/query.c:750
+#: lib/query.c:749
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:760
+#: lib/query.c:759
 #, fuzzy, c-format
 msgid "no package triggers %s\n"
 msgstr "no foram passados pacotes para assinatura"
 
 # , c-format
-#: lib/query.c:774 lib/query.c:796 lib/query.c:814 lib/query.c:845
+#: lib/query.c:773 lib/query.c:795 lib/query.c:813 lib/query.c:844
 #, fuzzy, c-format
 msgid "malformed %s: %s\n"
 msgstr "No consegui ler o arquivo spec de %s\n"
 
-#: lib/query.c:784 lib/query.c:802 lib/query.c:820 lib/query.c:850
+#: lib/query.c:783 lib/query.c:801 lib/query.c:819 lib/query.c:849
 #, fuzzy, c-format
 msgid "no package matches %s: %s\n"
 msgstr "no foram passados pacotes para assinatura"
 
-#: lib/query.c:861
+#: lib/query.c:860
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:872
+#: lib/query.c:871
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:906
+#: lib/query.c:905
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:910
+#: lib/query.c:909
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:937
+#: lib/query.c:936
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:940
+#: lib/query.c:939
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:945
+#: lib/query.c:944
 #, c-format
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:956 lib/rpminstall.c:633
+#: lib/query.c:955 lib/rpminstall.c:633
 #, fuzzy, c-format
 msgid "package %s is not installed\n"
 msgstr "no foi passado pacote para instalao"
@@ -2601,75 +2584,75 @@ msgid "(added provide)"
 msgstr ""
 
 # , c-format
-#: lib/rpmchecksig.c:51
+#: lib/rpmchecksig.c:54
 #, fuzzy, c-format
 msgid "%s: open failed: %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/rpmchecksig.c:63
+#: lib/rpmchecksig.c:66
 #, fuzzy
 msgid "makeTempFile failed\n"
 msgstr "Construo falhou.\n"
 
 # , c-format
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:107
 #, fuzzy, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/rpmchecksig.c:166
+#: lib/rpmchecksig.c:169
 #, c-format
 msgid "%s: Can't sign v1 packaging\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:170
+#: lib/rpmchecksig.c:173
 #, c-format
 msgid "%s: Can't re-sign v2 packaging\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:239
+#: lib/rpmchecksig.c:244
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
 # , c-format
-#: lib/rpmchecksig.c:245
+#: lib/rpmchecksig.c:250
 #, fuzzy, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: lib/rpmchecksig.c:476
+#: lib/rpmchecksig.c:481
 #, fuzzy, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/rpmchecksig.c:547
+#: lib/rpmchecksig.c:554
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:773
+#: lib/rpmchecksig.c:801
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:774 lib/rpmchecksig.c:788
+#: lib/rpmchecksig.c:802 lib/rpmchecksig.c:816
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:776 lib/rpmchecksig.c:790
+#: lib/rpmchecksig.c:804 lib/rpmchecksig.c:818
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:777 lib/rpmchecksig.c:791
+#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:779 lib/rpmchecksig.c:793
+#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:787
+#: lib/rpmchecksig.c:815
 msgid "OK"
 msgstr ""
 
@@ -2900,146 +2883,146 @@ msgstr ""
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/signature.c:118
+#: lib/signature.c:119
 msgid "file is not regular -- skipping size check\n"
 msgstr ""
 
-#: lib/signature.c:127
+#: lib/signature.c:128
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:132
+#: lib/signature.c:133
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:152
+#: lib/signature.c:153
 msgid "No signature\n"
 msgstr ""
 
-#: lib/signature.c:156
+#: lib/signature.c:157
 #, fuzzy
 msgid "Old PGP signature\n"
 msgstr "gere assinatura PGP"
 
-#: lib/signature.c:169
+#: lib/signature.c:170
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr ""
 
-#: lib/signature.c:225
+#: lib/signature.c:226
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
 # , c-format
-#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:677
-#: lib/signature.c:710
+#: lib/signature.c:307 lib/signature.c:406 lib/signature.c:678
+#: lib/signature.c:711
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "No consegui ler o arquivo spec de %s\n"
 
-#: lib/signature.c:322
+#: lib/signature.c:323
 #, fuzzy
 msgid "pgp failed\n"
 msgstr "Construo falhou.\n"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:329
+#: lib/signature.c:330
 #, fuzzy
 msgid "pgp failed to write signature\n"
 msgstr "gere assinatura PGP"
 
-#: lib/signature.c:334
+#: lib/signature.c:335
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:350 lib/signature.c:450
+#: lib/signature.c:351 lib/signature.c:451
 #, fuzzy
 msgid "unable to read the signature\n"
 msgstr "gere assinatura PGP"
 
-#: lib/signature.c:355
+#: lib/signature.c:356
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:422
+#: lib/signature.c:423
 #, fuzzy
 msgid "gpg failed\n"
 msgstr "Construo falhou.\n"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:429
+#: lib/signature.c:430
 #, fuzzy
 msgid "gpg failed to write signature\n"
 msgstr "gere assinatura PGP"
 
-#: lib/signature.c:434
+#: lib/signature.c:435
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:455
+#: lib/signature.c:456
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:715 lib/signature.c:770
+#: lib/signature.c:716 lib/signature.c:771
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:749
+#: lib/signature.c:750
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:762
+#: lib/signature.c:763
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:806
+#: lib/signature.c:807
 msgid "Header+Payload size: "
 msgstr ""
 
-#: lib/signature.c:846
+#: lib/signature.c:847
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:903
+#: lib/signature.c:906
 msgid "Header SHA1 digest: "
 msgstr ""
 
-#: lib/signature.c:1082
+#: lib/signature.c:1102
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "desconsidere quaisquer assinaturas MD5"
 
-#: lib/signature.c:1199
+#: lib/signature.c:1221
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1200
+#: lib/signature.c:1222
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "gere assinatura PGP"
 
-#: lib/signature.c:1287
+#: lib/signature.c:1311
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1314
+#: lib/signature.c:1338
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1318
+#: lib/signature.c:1342
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
@@ -3701,6 +3684,18 @@ msgid "failed to create %s: %s\n"
 msgstr "No consegui abrir o pipe tar: %s\n"
 
 #, fuzzy
+#~ msgid "========== Header RSA signature\n"
+#~ msgstr "gere assinatura PGP"
+
+#, fuzzy
+#~ msgid "========== Header DSA signature\n"
+#~ msgstr "gere assinatura PGP"
+
+#, fuzzy
+#~ msgid "sign a package, discarding all current signatures"
+#~ msgstr "assine um pacote (descarte a assinatura corrente)"
+
+#, fuzzy
 #~ msgid "Generating signature using PGP.\n"
 #~ msgstr "gere assinatura PGP"
 
diff --git a/po/ro.po b/po/ro.po
index 630a048c4..342ac3e8a 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-03-07 17:53-0500\n"
+"POT-Creation-Date: 2002-03-08 17:22-0500\n"
 "PO-Revision-Date: 1999-04-10 12:00+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
@@ -1582,61 +1582,46 @@ msgstr ""
 msgid "error creating temporary file %s\n"
 msgstr ""
 
-#: lib/package.c:181 lib/package.c:257
+#: lib/package.c:184 lib/package.c:260
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:202 lib/package.c:265
+#: lib/package.c:205 lib/package.c:268
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:243 lib/rpmchecksig.c:161 lib/rpmchecksig.c:541
+#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:548
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
 
-#: lib/package.c:249
+#: lib/package.c:252
 #, c-format
 msgid "%s: bad magic\n"
 msgstr ""
 
-#: lib/package.c:274 lib/rpmchecksig.c:179 lib/rpmchecksig.c:557
+#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:564
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/package.c:278 lib/rpmchecksig.c:183 lib/rpmchecksig.c:562
+#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:569
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/package.c:308 lib/rpmchecksig.c:462
+#: lib/package.c:331 lib/rpmchecksig.c:467
 #, c-format
 msgid "%s: headerRead failed\n"
 msgstr ""
 
-#. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:338
-msgid "========== Header RSA signature\n"
-msgstr ""
-
-#: lib/package.c:343 lib/package.c:371 lib/package.c:403 lib/rpmchecksig.c:631
+#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:642
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
-#. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:366
-msgid "========== Header DSA signature\n"
-msgstr ""
-
-#. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:397
-msgid "========== Package DSA/RSA signature\n"
-msgstr ""
-
-#: lib/package.c:415 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
+#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:496
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr ""
@@ -1968,7 +1953,7 @@ msgstr ""
 msgid "display a verbose file listing"
 msgstr ""
 
-#: lib/poptQV.c:240 lib/poptQV.c:282 lib/poptQV.c:316
+#: lib/poptQV.c:240
 msgid "don't verify MD5 digest of files"
 msgstr ""
 
@@ -2008,39 +1993,39 @@ msgstr ""
 msgid "don't execute verify script(s)"
 msgstr ""
 
-#: lib/poptQV.c:275
+#: lib/poptQV.c:275 lib/poptQV.c:313
 msgid "don't verify digest(s)"
 msgstr ""
 
-#: lib/poptQV.c:278
+#: lib/poptQV.c:278 lib/poptQV.c:316
 msgid "don't verify signature(s)"
 msgstr ""
 
-#: lib/poptQV.c:286 lib/poptQV.c:320
+#: lib/poptQV.c:283
 msgid "don't verify GPG V3 DSA signature(s)"
 msgstr ""
 
-#: lib/poptQV.c:289 lib/poptQV.c:323
+#: lib/poptQV.c:286
 msgid "don't verify PGP V3 RSA/MD5 signature(s)"
 msgstr ""
 
-#: lib/poptQV.c:304
-msgid "sign a package, preserving other existing signatures"
+#: lib/poptQV.c:301
+msgid "sign a package, preserving digests"
 msgstr ""
 
-#: lib/poptQV.c:306
+#: lib/poptQV.c:303
 msgid "verify package signature(s)"
 msgstr ""
 
-#: lib/poptQV.c:308
+#: lib/poptQV.c:305
 msgid "import an armored public key"
 msgstr ""
 
-#: lib/poptQV.c:310
-msgid "sign a package, discarding all current signatures"
+#: lib/poptQV.c:307
+msgid "sign a package, recomputing digests"
 msgstr ""
 
-#: lib/poptQV.c:312
+#: lib/poptQV.c:309
 msgid "generate signature"
 msgstr ""
 
@@ -2205,129 +2190,129 @@ msgstr ""
 msgid "incorrect format: %s\n"
 msgstr ""
 
-#: lib/query.c:221
+#: lib/query.c:220
 msgid "(contains no files)"
 msgstr ""
 
-#: lib/query.c:282
+#: lib/query.c:281
 msgid "normal        "
 msgstr ""
 
-#: lib/query.c:285
+#: lib/query.c:284
 msgid "replaced      "
 msgstr ""
 
-#: lib/query.c:288
+#: lib/query.c:287
 msgid "not installed "
 msgstr ""
 
-#: lib/query.c:291
+#: lib/query.c:290
 msgid "net shared    "
 msgstr ""
 
-#: lib/query.c:294
+#: lib/query.c:293
 #, c-format
 msgid "(unknown %3d) "
 msgstr ""
 
-#: lib/query.c:299
+#: lib/query.c:298
 msgid "(no state)    "
 msgstr ""
 
-#: lib/query.c:318 lib/query.c:374
+#: lib/query.c:317 lib/query.c:373
 msgid "package has neither file owner or id lists\n"
 msgstr ""
 
-#: lib/query.c:463
+#: lib/query.c:462
 #, c-format
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:333 lib/rpminstall.c:475
+#: lib/query.c:616 lib/query.c:654 lib/rpminstall.c:333 lib/rpminstall.c:475
 #: lib/rpminstall.c:845
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:633
+#: lib/query.c:632
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:639
+#: lib/query.c:638
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:665 lib/rpminstall.c:488
+#: lib/query.c:664 lib/rpminstall.c:488
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr ""
 
-#: lib/query.c:709
+#: lib/query.c:708
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:730
+#: lib/query.c:729
 msgid "no packages\n"
 msgstr ""
 
-#: lib/query.c:750
+#: lib/query.c:749
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:760
+#: lib/query.c:759
 #, c-format
 msgid "no package triggers %s\n"
 msgstr ""
 
-#: lib/query.c:774 lib/query.c:796 lib/query.c:814 lib/query.c:845
+#: lib/query.c:773 lib/query.c:795 lib/query.c:813 lib/query.c:844
 #, c-format
 msgid "malformed %s: %s\n"
 msgstr ""
 
-#: lib/query.c:784 lib/query.c:802 lib/query.c:820 lib/query.c:850
+#: lib/query.c:783 lib/query.c:801 lib/query.c:819 lib/query.c:849
 #, c-format
 msgid "no package matches %s: %s\n"
 msgstr ""
 
-#: lib/query.c:861
+#: lib/query.c:860
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:872
+#: lib/query.c:871
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:906
+#: lib/query.c:905
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:910
+#: lib/query.c:909
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:937
+#: lib/query.c:936
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:940
+#: lib/query.c:939
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:945
+#: lib/query.c:944
 #, c-format
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:956 lib/rpminstall.c:633
+#: lib/query.c:955 lib/rpminstall.c:633
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
@@ -2340,71 +2325,71 @@ msgstr ""
 msgid "(added provide)"
 msgstr ""
 
-#: lib/rpmchecksig.c:51
+#: lib/rpmchecksig.c:54
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:63
+#: lib/rpmchecksig.c:66
 msgid "makeTempFile failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:107
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:166
+#: lib/rpmchecksig.c:169
 #, c-format
 msgid "%s: Can't sign v1 packaging\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:170
+#: lib/rpmchecksig.c:173
 #, c-format
 msgid "%s: Can't re-sign v2 packaging\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:239
+#: lib/rpmchecksig.c:244
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:245
+#: lib/rpmchecksig.c:250
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:476
+#: lib/rpmchecksig.c:481
 #, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:547
+#: lib/rpmchecksig.c:554
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:773
+#: lib/rpmchecksig.c:801
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:774 lib/rpmchecksig.c:788
+#: lib/rpmchecksig.c:802 lib/rpmchecksig.c:816
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:776 lib/rpmchecksig.c:790
+#: lib/rpmchecksig.c:804 lib/rpmchecksig.c:818
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:777 lib/rpmchecksig.c:791
+#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:779 lib/rpmchecksig.c:793
+#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:787
+#: lib/rpmchecksig.c:815
 msgid "OK"
 msgstr ""
 
@@ -2614,137 +2599,137 @@ msgstr ""
 msgid "Unable to open %s for reading: %s.\n"
 msgstr ""
 
-#: lib/signature.c:118
+#: lib/signature.c:119
 msgid "file is not regular -- skipping size check\n"
 msgstr ""
 
-#: lib/signature.c:127
+#: lib/signature.c:128
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:132
+#: lib/signature.c:133
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:152
+#: lib/signature.c:153
 msgid "No signature\n"
 msgstr ""
 
-#: lib/signature.c:156
+#: lib/signature.c:157
 msgid "Old PGP signature\n"
 msgstr ""
 
-#: lib/signature.c:169
+#: lib/signature.c:170
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr ""
 
-#: lib/signature.c:225
+#: lib/signature.c:226
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:677
-#: lib/signature.c:710
+#: lib/signature.c:307 lib/signature.c:406 lib/signature.c:678
+#: lib/signature.c:711
 #, c-format
 msgid "Could not exec %s: %s\n"
 msgstr ""
 
-#: lib/signature.c:322
+#: lib/signature.c:323
 msgid "pgp failed\n"
 msgstr ""
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:329
+#: lib/signature.c:330
 msgid "pgp failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:334
+#: lib/signature.c:335
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:350 lib/signature.c:450
+#: lib/signature.c:351 lib/signature.c:451
 msgid "unable to read the signature\n"
 msgstr ""
 
-#: lib/signature.c:355
+#: lib/signature.c:356
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:422
+#: lib/signature.c:423
 msgid "gpg failed\n"
 msgstr ""
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:429
+#: lib/signature.c:430
 msgid "gpg failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:434
+#: lib/signature.c:435
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:455
+#: lib/signature.c:456
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:715 lib/signature.c:770
+#: lib/signature.c:716 lib/signature.c:771
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:749
+#: lib/signature.c:750
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:762
+#: lib/signature.c:763
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:806
+#: lib/signature.c:807
 msgid "Header+Payload size: "
 msgstr ""
 
-#: lib/signature.c:846
+#: lib/signature.c:847
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:903
+#: lib/signature.c:906
 msgid "Header SHA1 digest: "
 msgstr ""
 
-#: lib/signature.c:1082
+#: lib/signature.c:1102
 msgid "V3 RSA/MD5 signature: "
 msgstr ""
 
-#: lib/signature.c:1199
+#: lib/signature.c:1221
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1200
+#: lib/signature.c:1222
 msgid "V3 DSA signature: "
 msgstr ""
 
-#: lib/signature.c:1287
+#: lib/signature.c:1311
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1314
+#: lib/signature.c:1338
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1318
+#: lib/signature.c:1342
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
diff --git a/po/rpm.pot b/po/rpm.pot
index d58589936..41d5b9bce 100644
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-03-07 17:53-0500\n"
+"POT-Creation-Date: 2002-03-08 17:22-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1587,61 +1587,46 @@ msgstr ""
 msgid "error creating temporary file %s\n"
 msgstr ""
 
-#: lib/package.c:181 lib/package.c:257
+#: lib/package.c:184 lib/package.c:260
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:202 lib/package.c:265
+#: lib/package.c:205 lib/package.c:268
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:243 lib/rpmchecksig.c:161 lib/rpmchecksig.c:541
+#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:548
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
 
-#: lib/package.c:249
+#: lib/package.c:252
 #, c-format
 msgid "%s: bad magic\n"
 msgstr ""
 
-#: lib/package.c:274 lib/rpmchecksig.c:179 lib/rpmchecksig.c:557
+#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:564
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/package.c:278 lib/rpmchecksig.c:183 lib/rpmchecksig.c:562
+#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:569
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/package.c:308 lib/rpmchecksig.c:462
+#: lib/package.c:331 lib/rpmchecksig.c:467
 #, c-format
 msgid "%s: headerRead failed\n"
 msgstr ""
 
-#. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:338
-msgid "========== Header RSA signature\n"
-msgstr ""
-
-#: lib/package.c:343 lib/package.c:371 lib/package.c:403 lib/rpmchecksig.c:631
+#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:642
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
-#. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:366
-msgid "========== Header DSA signature\n"
-msgstr ""
-
-#. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:397
-msgid "========== Package DSA/RSA signature\n"
-msgstr ""
-
-#: lib/package.c:415 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
+#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:496
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr ""
@@ -1973,7 +1958,7 @@ msgstr ""
 msgid "display a verbose file listing"
 msgstr ""
 
-#: lib/poptQV.c:240 lib/poptQV.c:282 lib/poptQV.c:316
+#: lib/poptQV.c:240
 msgid "don't verify MD5 digest of files"
 msgstr ""
 
@@ -2013,39 +1998,39 @@ msgstr ""
 msgid "don't execute verify script(s)"
 msgstr ""
 
-#: lib/poptQV.c:275
+#: lib/poptQV.c:275 lib/poptQV.c:313
 msgid "don't verify digest(s)"
 msgstr ""
 
-#: lib/poptQV.c:278
+#: lib/poptQV.c:278 lib/poptQV.c:316
 msgid "don't verify signature(s)"
 msgstr ""
 
-#: lib/poptQV.c:286 lib/poptQV.c:320
+#: lib/poptQV.c:283
 msgid "don't verify GPG V3 DSA signature(s)"
 msgstr ""
 
-#: lib/poptQV.c:289 lib/poptQV.c:323
+#: lib/poptQV.c:286
 msgid "don't verify PGP V3 RSA/MD5 signature(s)"
 msgstr ""
 
-#: lib/poptQV.c:304
-msgid "sign a package, preserving other existing signatures"
+#: lib/poptQV.c:301
+msgid "sign a package, preserving digests"
 msgstr ""
 
-#: lib/poptQV.c:306
+#: lib/poptQV.c:303
 msgid "verify package signature(s)"
 msgstr ""
 
-#: lib/poptQV.c:308
+#: lib/poptQV.c:305
 msgid "import an armored public key"
 msgstr ""
 
-#: lib/poptQV.c:310
-msgid "sign a package, discarding all current signatures"
+#: lib/poptQV.c:307
+msgid "sign a package, recomputing digests"
 msgstr ""
 
-#: lib/poptQV.c:312
+#: lib/poptQV.c:309
 msgid "generate signature"
 msgstr ""
 
@@ -2210,129 +2195,129 @@ msgstr ""
 msgid "incorrect format: %s\n"
 msgstr ""
 
-#: lib/query.c:221
+#: lib/query.c:220
 msgid "(contains no files)"
 msgstr ""
 
-#: lib/query.c:282
+#: lib/query.c:281
 msgid "normal        "
 msgstr ""
 
-#: lib/query.c:285
+#: lib/query.c:284
 msgid "replaced      "
 msgstr ""
 
-#: lib/query.c:288
+#: lib/query.c:287
 msgid "not installed "
 msgstr ""
 
-#: lib/query.c:291
+#: lib/query.c:290
 msgid "net shared    "
 msgstr ""
 
-#: lib/query.c:294
+#: lib/query.c:293
 #, c-format
 msgid "(unknown %3d) "
 msgstr ""
 
-#: lib/query.c:299
+#: lib/query.c:298
 msgid "(no state)    "
 msgstr ""
 
-#: lib/query.c:318 lib/query.c:374
+#: lib/query.c:317 lib/query.c:373
 msgid "package has neither file owner or id lists\n"
 msgstr ""
 
-#: lib/query.c:463
+#: lib/query.c:462
 #, c-format
 msgid "can't query %s: %s\n"
 msgstr ""
 
-#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:333 lib/rpminstall.c:475
+#: lib/query.c:616 lib/query.c:654 lib/rpminstall.c:333 lib/rpminstall.c:475
 #: lib/rpminstall.c:845
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr ""
 
-#: lib/query.c:633
+#: lib/query.c:632
 #, c-format
 msgid "query of %s failed\n"
 msgstr ""
 
-#: lib/query.c:639
+#: lib/query.c:638
 msgid "old format source packages cannot be queried\n"
 msgstr ""
 
-#: lib/query.c:665 lib/rpminstall.c:488
+#: lib/query.c:664 lib/rpminstall.c:488
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr ""
 
-#: lib/query.c:709
+#: lib/query.c:708
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr ""
 
-#: lib/query.c:730
+#: lib/query.c:729
 msgid "no packages\n"
 msgstr ""
 
-#: lib/query.c:750
+#: lib/query.c:749
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr ""
 
-#: lib/query.c:760
+#: lib/query.c:759
 #, c-format
 msgid "no package triggers %s\n"
 msgstr ""
 
-#: lib/query.c:774 lib/query.c:796 lib/query.c:814 lib/query.c:845
+#: lib/query.c:773 lib/query.c:795 lib/query.c:813 lib/query.c:844
 #, c-format
 msgid "malformed %s: %s\n"
 msgstr ""
 
-#: lib/query.c:784 lib/query.c:802 lib/query.c:820 lib/query.c:850
+#: lib/query.c:783 lib/query.c:801 lib/query.c:819 lib/query.c:849
 #, c-format
 msgid "no package matches %s: %s\n"
 msgstr ""
 
-#: lib/query.c:861
+#: lib/query.c:860
 #, c-format
 msgid "no package requires %s\n"
 msgstr ""
 
-#: lib/query.c:872
+#: lib/query.c:871
 #, c-format
 msgid "no package provides %s\n"
 msgstr ""
 
-#: lib/query.c:906
+#: lib/query.c:905
 #, c-format
 msgid "file %s: %s\n"
 msgstr ""
 
-#: lib/query.c:910
+#: lib/query.c:909
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr ""
 
-#: lib/query.c:937
+#: lib/query.c:936
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr ""
 
-#: lib/query.c:940
+#: lib/query.c:939
 #, c-format
 msgid "package record number: %u\n"
 msgstr ""
 
-#: lib/query.c:945
+#: lib/query.c:944
 #, c-format
 msgid "record %u could not be read\n"
 msgstr ""
 
-#: lib/query.c:956 lib/rpminstall.c:633
+#: lib/query.c:955 lib/rpminstall.c:633
 #, c-format
 msgid "package %s is not installed\n"
 msgstr ""
@@ -2345,71 +2330,71 @@ msgstr ""
 msgid "(added provide)"
 msgstr ""
 
-#: lib/rpmchecksig.c:51
+#: lib/rpmchecksig.c:54
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:63
+#: lib/rpmchecksig.c:66
 msgid "makeTempFile failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:107
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:166
+#: lib/rpmchecksig.c:169
 #, c-format
 msgid "%s: Can't sign v1 packaging\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:170
+#: lib/rpmchecksig.c:173
 #, c-format
 msgid "%s: Can't re-sign v2 packaging\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:239
+#: lib/rpmchecksig.c:244
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:245
+#: lib/rpmchecksig.c:250
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:476
+#: lib/rpmchecksig.c:481
 #, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:547
+#: lib/rpmchecksig.c:554
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:773
+#: lib/rpmchecksig.c:801
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:774 lib/rpmchecksig.c:788
+#: lib/rpmchecksig.c:802 lib/rpmchecksig.c:816
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:776 lib/rpmchecksig.c:790
+#: lib/rpmchecksig.c:804 lib/rpmchecksig.c:818
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:777 lib/rpmchecksig.c:791
+#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:779 lib/rpmchecksig.c:793
+#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:787
+#: lib/rpmchecksig.c:815
 msgid "OK"
 msgstr ""
 
@@ -2619,137 +2604,137 @@ msgstr ""
 msgid "Unable to open %s for reading: %s.\n"
 msgstr ""
 
-#: lib/signature.c:118
+#: lib/signature.c:119
 msgid "file is not regular -- skipping size check\n"
 msgstr ""
 
-#: lib/signature.c:127
+#: lib/signature.c:128
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:132
+#: lib/signature.c:133
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:152
+#: lib/signature.c:153
 msgid "No signature\n"
 msgstr ""
 
-#: lib/signature.c:156
+#: lib/signature.c:157
 msgid "Old PGP signature\n"
 msgstr ""
 
-#: lib/signature.c:169
+#: lib/signature.c:170
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr ""
 
-#: lib/signature.c:225
+#: lib/signature.c:226
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:677
-#: lib/signature.c:710
+#: lib/signature.c:307 lib/signature.c:406 lib/signature.c:678
+#: lib/signature.c:711
 #, c-format
 msgid "Could not exec %s: %s\n"
 msgstr ""
 
-#: lib/signature.c:322
+#: lib/signature.c:323
 msgid "pgp failed\n"
 msgstr ""
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:329
+#: lib/signature.c:330
 msgid "pgp failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:334
+#: lib/signature.c:335
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:350 lib/signature.c:450
+#: lib/signature.c:351 lib/signature.c:451
 msgid "unable to read the signature\n"
 msgstr ""
 
-#: lib/signature.c:355
+#: lib/signature.c:356
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:422
+#: lib/signature.c:423
 msgid "gpg failed\n"
 msgstr ""
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:429
+#: lib/signature.c:430
 msgid "gpg failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:434
+#: lib/signature.c:435
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:455
+#: lib/signature.c:456
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:715 lib/signature.c:770
+#: lib/signature.c:716 lib/signature.c:771
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:749
+#: lib/signature.c:750
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:762
+#: lib/signature.c:763
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:806
+#: lib/signature.c:807
 msgid "Header+Payload size: "
 msgstr ""
 
-#: lib/signature.c:846
+#: lib/signature.c:847
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:903
+#: lib/signature.c:906
 msgid "Header SHA1 digest: "
 msgstr ""
 
-#: lib/signature.c:1082
+#: lib/signature.c:1102
 msgid "V3 RSA/MD5 signature: "
 msgstr ""
 
-#: lib/signature.c:1199
+#: lib/signature.c:1221
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1200
+#: lib/signature.c:1222
 msgid "V3 DSA signature: "
 msgstr ""
 
-#: lib/signature.c:1287
+#: lib/signature.c:1311
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1314
+#: lib/signature.c:1338
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1318
+#: lib/signature.c:1342
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
diff --git a/po/ru.po b/po/ru.po
index c88422be0..a5811f025 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-03-07 17:53-0500\n"
+"POT-Creation-Date: 2002-03-08 17:22-0500\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"
@@ -1631,61 +1631,46 @@ msgstr "%s ÓÏÚÄÁÎ ËÁË %s\n"
 msgid "error creating temporary file %s\n"
 msgstr "ÏÛÉÂËÁ ÓÏÚÄÁÎÉÑ ×ÒÅÍÅÎÎÏÇÏ ÆÁÊÌÁ %s\n"
 
-#: lib/package.c:181 lib/package.c:257
+#: lib/package.c:184 lib/package.c:260
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr "ĞÁËÅÔÙ ×ÅÒÓÉÉ 1 ÎÅ ĞÏÄÄÅÒÖÉ×ÁÀÔÓÑ ÜÔÏÊ ×ÅÒÓÉÅÊ RPM\n"
 
-#: lib/package.c:202 lib/package.c:265
+#: lib/package.c:205 lib/package.c:268
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr "ÜÔÁ ×ÅÒÓÉÑ RPM ĞÏÄÄÅÒÖÉ×ÁÅÔ ÔÏÌØËÏ ĞÁËÅÔÙ ×ÅÒÓÉÉ <= 4\n"
 
-#: lib/package.c:243 lib/rpmchecksig.c:161 lib/rpmchecksig.c:541
+#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:548
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: ÏÛÉÂËÁ readLead\n"
 
-#: lib/package.c:249
+#: lib/package.c:252
 #, fuzzy, c-format
 msgid "%s: bad magic\n"
 msgstr "îÅ×ÅÒÎÙÊ magic"
 
-#: lib/package.c:274 lib/rpmchecksig.c:179 lib/rpmchecksig.c:557
+#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:564
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: ÏÛÉÂËÁ rpmReadSignature\n"
 
-#: lib/package.c:278 lib/rpmchecksig.c:183 lib/rpmchecksig.c:562
+#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:569
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: ğÏÄĞÉÓØ ÎÅÄÏÓÔÕĞÎÁ\n"
 
-#: lib/package.c:308 lib/rpmchecksig.c:462
+#: lib/package.c:331 lib/rpmchecksig.c:467
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: ÏÛÉÂËÁ readLead\n"
 
-#. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:338
-msgid "========== Header RSA signature\n"
-msgstr ""
-
-#: lib/package.c:343 lib/package.c:371 lib/package.c:403 lib/rpmchecksig.c:631
+#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:642
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
-#. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:366
-msgid "========== Header DSA signature\n"
-msgstr ""
-
-#. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:397
-msgid "========== Package DSA/RSA signature\n"
-msgstr ""
-
-#: lib/package.c:415 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
+#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:496
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: ÏÛÉÂËÁ Fread: %s\n"
@@ -2032,7 +2017,7 @@ msgstr "ĞÏËÁÚÁÔØ ÓÏÓÔÏÑÎÉÅ ĞÅÒÅŞÉÓÌÅÎÎÙÈ ÆÁÊÌÏ×"
 msgid "display a verbose file listing"
 msgstr "ĞÏËÁÚÁÔØ ÄÅÔÁÌØÎÙÊ ÓĞÉÓÏË ÆÁÊÌÏ×"
 
-#: lib/poptQV.c:240 lib/poptQV.c:282 lib/poptQV.c:316
+#: lib/poptQV.c:240
 msgid "don't verify MD5 digest of files"
 msgstr "ÎÅ ĞÒÏ×ÅÒÑÔØ ÆÁÊÌÙ ÎÁ ËÏÎÔÒÏÌØÎÕÀ ÓÕÍÍÕ MD5"
 
@@ -2073,46 +2058,46 @@ msgstr "ÎÅ ĞÒÏ×ÅÒÑÔØ ÚÁ×ÉÓÉÍÏÓÔÉ ĞÁËÅÔÁ"
 msgid "don't execute verify script(s)"
 msgstr "ÎÅ ÉÓĞÏÌÎÑÔØ %verifyscript (ÅÓÌÉ ÅÓÔØ)"
 
-#: lib/poptQV.c:275
+#: lib/poptQV.c:275 lib/poptQV.c:313
 #, fuzzy
 msgid "don't verify digest(s)"
 msgstr "ÎÅ ĞÒÏ×ÅÒÑÔØ ÆÁÊÌÙ ÎÁ ËÏÎÔÒÏÌØÎÕÀ ÓÕÍÍÕ MD5"
 
-#: lib/poptQV.c:278
+#: lib/poptQV.c:278 lib/poptQV.c:316
 #, fuzzy
 msgid "don't verify signature(s)"
 msgstr "ÎÅ ĞÒÏ×ÅÒÑÔØ ĞÕÔØ ÓÉÍ×ÏÌÉŞÅÓËÉÈ ÓÓÙÌÏË"
 
-#: lib/poptQV.c:286 lib/poptQV.c:320
+#: lib/poptQV.c:283
 #, fuzzy
 msgid "don't verify GPG V3 DSA signature(s)"
 msgstr "ÎÅ ĞÒÏ×ÅÒÑÔØ ËÏÎÔÒÏÌØÎÕÀ ÓÕÍÍÕ SHA1 ÚÁÇÏÌÏ×ËÁ ĞÁËÅÔÁ"
 
-#: lib/poptQV.c:289 lib/poptQV.c:323
+#: lib/poptQV.c:286
 #, fuzzy
 msgid "don't verify PGP V3 RSA/MD5 signature(s)"
 msgstr "ÎÅ ĞÒÏ×ÅÒÑÔØ ÆÁÊÌÙ ÎÁ ËÏÎÔÒÏÌØÎÕÀ ÓÕÍÍÕ MD5"
 
-#: lib/poptQV.c:304
+#: lib/poptQV.c:301
 #, fuzzy
-msgid "sign a package, preserving other existing signatures"
+msgid "sign a package, preserving digests"
 msgstr "ĞÏÄĞÉÓÁÔØ ĞÁËÅÔ (ÕÄÁÌÉ× ÔÅËÕİÕÀ ĞÏÄĞÉÓØ)"
 
-#: lib/poptQV.c:306
+#: lib/poptQV.c:303
 #, fuzzy
 msgid "verify package signature(s)"
 msgstr "ĞÒÏ×ÅÒÉÔØ ĞÏÄĞÉÓØ × ĞÁËÅÔÅ"
 
-#: lib/poptQV.c:308
+#: lib/poptQV.c:305
 msgid "import an armored public key"
 msgstr ""
 
-#: lib/poptQV.c:310
+#: lib/poptQV.c:307
 #, fuzzy
-msgid "sign a package, discarding all current signatures"
+msgid "sign a package, recomputing digests"
 msgstr "ĞÏÄĞÉÓÁÔØ ĞÁËÅÔ (ÕÄÁÌÉ× ÔÅËÕİÕÀ ĞÏÄĞÉÓØ)"
 
-#: lib/poptQV.c:312
+#: lib/poptQV.c:309
 msgid "generate signature"
 msgstr "ÇÅÎÅÒÉÒÏ×ÁÔØ ĞÏÄĞÉÓØ"
 
@@ -2279,129 +2264,129 @@ msgstr "%s ÎÅ ÕÄÁÌÏÓØ: %s\n"
 msgid "incorrect format: %s\n"
 msgstr "ÏÛÉÂËÁ × ÆÏÒÍÁÔÅ: %s\n"
 
-#: lib/query.c:221
+#: lib/query.c:220
 msgid "(contains no files)"
 msgstr "(ÎÅ ÓÏÄÅÒÖÉÔ ÆÁÊÌÏ×)"
 
-#: lib/query.c:282
+#: lib/query.c:281
 msgid "normal        "
 msgstr "ÎÏÒÍÁÌØÎÙÊ    "
 
-#: lib/query.c:285
+#: lib/query.c:284
 msgid "replaced      "
 msgstr "ÚÁÍÅÎÅÎÎÙÊ    "
 
-#: lib/query.c:288
+#: lib/query.c:287
 msgid "not installed "
 msgstr "ÎÅ ÕÓÔÁÎÏ×ÌÅÎ "
 
-#: lib/query.c:291
+#: lib/query.c:290
 msgid "net shared    "
 msgstr "ÓÅÔÅ×ÏÊ       "
 
-#: lib/query.c:294
+#: lib/query.c:293
 #, c-format
 msgid "(unknown %3d) "
 msgstr "(ÎÅÉÚ×. %3d)  "
 
-#: lib/query.c:299
+#: lib/query.c:298
 msgid "(no state)    "
 msgstr "(ÓÏÓÔ. ÎÅÔ)   "
 
-#: lib/query.c:318 lib/query.c:374
+#: lib/query.c:317 lib/query.c:373
 msgid "package has neither file owner or id lists\n"
 msgstr "ĞÁËÅÔ ÎÅ ÓÏÄÅÒÖÉÔ ÓĞÉÓËÏ× ÎÉ ÈÏÚÑÅ× ÆÁÊÌÏ×, ÎÉ ÉÈ ID\n"
 
-#: lib/query.c:463
+#: lib/query.c:462
 #, c-format
 msgid "can't query %s: %s\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁĞÒÏÓÉÔØ %s: %s\n"
 
-#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:333 lib/rpminstall.c:475
+#: lib/query.c:616 lib/query.c:654 lib/rpminstall.c:333 lib/rpminstall.c:475
 #: lib/rpminstall.c:845
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s\n"
 
-#: lib/query.c:633
+#: lib/query.c:632
 #, c-format
 msgid "query of %s failed\n"
 msgstr "ÏÛÉÂËÁ ÚÁĞÒÏÓÁ %s\n"
 
-#: lib/query.c:639
+#: lib/query.c:638
 msgid "old format source packages cannot be queried\n"
 msgstr "ÚÁĞÒÏÓÙ Ë ÉÓÈÏÄÎÙÍ ĞÁËÅÔÁÍ × ÓÔÁÒÏÍ ÆÏÒÍÁÔÅ ÎÅ ĞÏÄÄÅÒÖÉ×ÁÀÔÓÑ\n"
 
-#: lib/query.c:665 lib/rpminstall.c:488
+#: lib/query.c:664 lib/rpminstall.c:488
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: ÏÛÉÂËÁ ŞÔÅÎÉÑ ÓĞÉÓËÁ ÆÁÊÌÏ×: %s\n"
 
-#: lib/query.c:709
+#: lib/query.c:708
 #, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "ÚÁĞÒÏÓ ÆÁÊÌÁ ÓĞÅÃÉÆÉËÁÃÉÉ %s ÎÅ ÕÄÁÌÓÑ, ÎÅ×ÏÚÍÏÖÎÏ ÒÁÚÏÂÒÁÔØ ÆÁÊÌ\n"
 
-#: lib/query.c:730
+#: lib/query.c:729
 msgid "no packages\n"
 msgstr "ÎÅÔ ĞÁËÅÔÏ×\n"
 
-#: lib/query.c:750
+#: lib/query.c:749
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "ÇÒÕĞĞÁ %s ÎÅ ÓÏÄÅÒÖÉÔ ÎÉËÁËÉÈ ĞÁËÅÔÏ×\n"
 
-#: lib/query.c:760
+#: lib/query.c:759
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "ÎÉ ÏÄÉÎ ÉÚ ĞÁËÅÔÏ× ÎÅ ×Ú×ÏÄÉÔ ÔÒÉÇÇÅÒ %s\n"
 
-#: lib/query.c:774 lib/query.c:796 lib/query.c:814 lib/query.c:845
+#: lib/query.c:773 lib/query.c:795 lib/query.c:813 lib/query.c:844
 #, fuzzy, c-format
 msgid "malformed %s: %s\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ĞÒÏŞÅÓÔØ %s: %s.\n"
 
-#: lib/query.c:784 lib/query.c:802 lib/query.c:820 lib/query.c:850
+#: lib/query.c:783 lib/query.c:801 lib/query.c:819 lib/query.c:849
 #, fuzzy, c-format
 msgid "no package matches %s: %s\n"
 msgstr "ÎÉ ÏÄÉÎ ÉÚ ĞÁËÅÔÏ× ÎÅ ×Ú×ÏÄÉÔ ÔÒÉÇÇÅÒ %s\n"
 
-#: lib/query.c:861
+#: lib/query.c:860
 #, c-format
 msgid "no package requires %s\n"
 msgstr "ÎÉ ÏÄÉÎ ÉÚ ĞÁËÅÔÏ× ÎÅ ÔÒÅÂÕÅÔ %s\n"
 
-#: lib/query.c:872
+#: lib/query.c:871
 #, c-format
 msgid "no package provides %s\n"
 msgstr "ÎÉ ÏÄÉÎ ÉÚ ĞÁËÅÔÏ× ÎÅ ĞÒÅÄÏÓÔÁ×ÌÑÅÔ %s\n"
 
-#: lib/query.c:906
+#: lib/query.c:905
 #, c-format
 msgid "file %s: %s\n"
 msgstr "ÆÁÊÌ %s: %s\n"
 
-#: lib/query.c:910
+#: lib/query.c:909
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "ÆÁÊÌ %s ÎÅ ĞÒÉÎÁÄÌÅÖÉÔ ÎÉ ÏÄÎÏÍÕ ÉÚ ĞÁËÅÔÏ×\n"
 
-#: lib/query.c:937
+#: lib/query.c:936
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "ÎÅ×ÅÒÎÙÊ ÎÏÍÅÒ ĞÁËÅÔÁ: %s\n"
 
-#: lib/query.c:940
+#: lib/query.c:939
 #, c-format
 msgid "package record number: %u\n"
 msgstr "ÎÏÍÅÒ ÚÁĞÉÓÉ ĞÁËÅÔÁ: %u\n"
 
-#: lib/query.c:945
+#: lib/query.c:944
 #, c-format
 msgid "record %u could not be read\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ĞÒÏŞÉÔÁÔØ ÚÁĞÉÓØ %u\n"
 
-#: lib/query.c:956 lib/rpminstall.c:633
+#: lib/query.c:955 lib/rpminstall.c:633
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "ĞÁËÅÔ %s ÎÅ ÕÓÔÁÎÏ×ÌÅÎ\n"
@@ -2416,71 +2401,71 @@ msgstr "ÎÅ×ÅÒÎÙÊ ÆÁÊÌ ÂÁÚÙ ÄÁÎÎÙÈ %s\n"
 msgid "(added provide)"
 msgstr "%s: %-45s YES (db provides)\n"
 
-#: lib/rpmchecksig.c:51
+#: lib/rpmchecksig.c:54
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s: ÏÛÉÂËÁ ÏÔËÒÙÔÉÑ: %s\n"
 
-#: lib/rpmchecksig.c:63
+#: lib/rpmchecksig.c:66
 msgid "makeTempFile failed\n"
 msgstr "ÏÛÉÂËÁ makeTempFile\n"
 
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:107
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: ÏÛÉÂËÁ Fwrite: %s\n"
 
-#: lib/rpmchecksig.c:166
+#: lib/rpmchecksig.c:169
 #, fuzzy, c-format
 msgid "%s: Can't sign v1 packaging\n"
 msgstr "%s: îÅ ÍÏÇÕ ĞÏÄĞÉÓÁÔØ RPM v1.0\n"
 
-#: lib/rpmchecksig.c:170
+#: lib/rpmchecksig.c:173
 #, fuzzy, c-format
 msgid "%s: Can't re-sign v2 packaging\n"
 msgstr "%s: îÅ ÍÏÇÕ ĞÅÒÅĞÏÄĞÉÓÁÔØ RPM v2.0\n"
 
-#: lib/rpmchecksig.c:239
+#: lib/rpmchecksig.c:244
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: ÏÛÉÂËÁ writeLead: %s\n"
 
-#: lib/rpmchecksig.c:245
+#: lib/rpmchecksig.c:250
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: ÏÛÉÂËÁ rpmWriteSignature: %s\n"
 
-#: lib/rpmchecksig.c:476
+#: lib/rpmchecksig.c:481
 #, fuzzy, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr "%s: ÏÛÉÂËÁ readLead\n"
 
-#: lib/rpmchecksig.c:547
+#: lib/rpmchecksig.c:554
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: ğÏÄĞÉÓÉ ÎÅÔ (RPM v1.0)\n"
 
-#: lib/rpmchecksig.c:773
+#: lib/rpmchecksig.c:801
 msgid "NOT OK"
 msgstr "îå Oë"
 
-#: lib/rpmchecksig.c:774 lib/rpmchecksig.c:788
+#: lib/rpmchecksig.c:802 lib/rpmchecksig.c:816
 msgid " (MISSING KEYS:"
 msgstr " (ïôóõôóô÷õàô ëìàşé:"
 
-#: lib/rpmchecksig.c:776 lib/rpmchecksig.c:790
+#: lib/rpmchecksig.c:804 lib/rpmchecksig.c:818
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:777 lib/rpmchecksig.c:791
+#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819
 msgid " (UNTRUSTED KEYS:"
 msgstr " (îåô äï÷åòéñ ë ëìàşáí:"
 
-#: lib/rpmchecksig.c:779 lib/rpmchecksig.c:793
+#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:787
+#: lib/rpmchecksig.c:815
 msgid "OK"
 msgstr "Oë"
 
@@ -2692,141 +2677,141 @@ msgstr "îÅ×ÏÚÍÏÖÎÏ ĞÒÏŞÉÔÁÔØ %s, ÚÎÁŞÅÎÉÅ HOME ÓÌÉÛËÏÍ ×ÅÌÉËÏ.\n"
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s ÄÌÑ ŞÔÅÎÉÑ: %s.\n"
 
-#: lib/signature.c:118
+#: lib/signature.c:119
 msgid "file is not regular -- skipping size check\n"
 msgstr "ÎÅÏÂÙŞÎÙÊ ÆÁÊÌ -- ĞÒÏĞÕÓËÁÀ ĞÒÏ×ÅÒËÕ ÒÁÚÍÅÒÁ\n"
 
-#: lib/signature.c:127
+#: lib/signature.c:128
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr "ïÖÉÄÁÅÍÙÊ ÒÁÚÍÅÒ: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 
-#: lib/signature.c:132
+#: lib/signature.c:133
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr "æÁËÔÉŞÅÓËÉÊ ÒÁÚÍÅÒ: %12d\n"
 
-#: lib/signature.c:152
+#: lib/signature.c:153
 msgid "No signature\n"
 msgstr "ğÏÄĞÉÓÉ ÎÅÔ\n"
 
-#: lib/signature.c:156
+#: lib/signature.c:157
 msgid "Old PGP signature\n"
 msgstr "óÔÁÒÁÑ ĞÏÄĞÉÓØ PGP\n"
 
-#: lib/signature.c:169
+#: lib/signature.c:170
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr ""
 "óÔÁÒÁÑ (ÔÏÌØËÏ ÄÌÑ ×ÎÕÔÒÅÎÎÅÇÏ ÉÓĞÏÌØÚÏ×ÁÎÉÑ) ĞÏÄĞÉÓØ! çÄÅ ×Ù üôï ×ÚÑÌÉ!?\n"
 
-#: lib/signature.c:225
+#: lib/signature.c:226
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "ğÏÄĞÉÓØ: ÒÁÚÍÅÒ(%d)+ÚÁĞÏÌÎÅÎÉÅ(%d)\n"
 
-#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:677
-#: lib/signature.c:710
+#: lib/signature.c:307 lib/signature.c:406 lib/signature.c:678
+#: lib/signature.c:711
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ×ÙÌÎÉÔØ %s: %s\n"
 
-#: lib/signature.c:322
+#: lib/signature.c:323
 msgid "pgp failed\n"
 msgstr "ÏÛÉÂËÁ pgp\n"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:329
+#: lib/signature.c:330
 msgid "pgp failed to write signature\n"
 msgstr "ÏÛÉÂËÁ pgp ĞÒÉ ÚÁĞÉÓÉ ĞÏÄĞÉÓÉ\n"
 
-#: lib/signature.c:334
+#: lib/signature.c:335
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr "òÁÚÍÅÒ ĞÏÄĞÉÓÉ PGP: %d\n"
 
-#: lib/signature.c:350 lib/signature.c:450
+#: lib/signature.c:351 lib/signature.c:451
 msgid "unable to read the signature\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ĞÒÏŞÅÓÔØ ĞÏÄĞÉÓØ\n"
 
-#: lib/signature.c:355
+#: lib/signature.c:356
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr "ğÏÌÕŞÅÎÏ %d ÂÁÊÔ ĞÏÄĞÉÓÉ PGP\n"
 
-#: lib/signature.c:422
+#: lib/signature.c:423
 msgid "gpg failed\n"
 msgstr "ÏÛÉÂËÁ gpg\n"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:429
+#: lib/signature.c:430
 msgid "gpg failed to write signature\n"
 msgstr "ÏÛÉÂËÁ gpg ĞÒÉ ÚÁĞÉÓÉ ĞÏÄĞÉÓÉ\n"
 
-#: lib/signature.c:434
+#: lib/signature.c:435
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr "òÁÚÍÅÒ ĞÏÄĞÉÓÉ GPG: %d\n"
 
-#: lib/signature.c:455
+#: lib/signature.c:456
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr "ğÏÌÕŞÅÎÏ %d ÂÁÊÔ ĞÏÄĞÉÓÉ GPG\n"
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:715 lib/signature.c:770
+#: lib/signature.c:716 lib/signature.c:771
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "îÅ×ÅÒÎÁÑ ÓĞÅÃÉÆÉËÁÃÉÑ %%_signature × ÍÁËÒÏÆÁÊÌÅ\n"
 
-#: lib/signature.c:749
+#: lib/signature.c:750
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "÷Ù ÄÏÌÖÎÙ ÕÓÔÁÎÏ×ÉÔØ \"%%_gpg_name\" × ×ÁÛÅÍ ÍÁËÒÏÆÁÊÌÅ\n"
 
-#: lib/signature.c:762
+#: lib/signature.c:763
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "÷Ù ÄÏÌÖÎÙ ÕÓÔÁÎÏ×ÉÔØ \"%%_pgp_name\" × ×ÁÛÅÍ ÍÁËÒÏÆÁÊÌÅ\n"
 
-#: lib/signature.c:806
+#: lib/signature.c:807
 #, fuzzy
 msgid "Header+Payload size: "
 msgstr "úÁÇÏÌÏ×ÏË ÓÌÉÛËÏÍ ×ÅÌÉË"
 
-#: lib/signature.c:846
+#: lib/signature.c:847
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:903
+#: lib/signature.c:906
 msgid "Header SHA1 digest: "
 msgstr ""
 
-#: lib/signature.c:1082
+#: lib/signature.c:1102
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "ĞÒÏĞÕÓÔÉÔØ ×ÓÅ MD5-ĞÏÄĞÉÓÉ"
 
-#: lib/signature.c:1199
+#: lib/signature.c:1221
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1200
+#: lib/signature.c:1222
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "ğÏÄĞÉÓÉ ÎÅÔ\n"
 
-#: lib/signature.c:1287
+#: lib/signature.c:1311
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1314
+#: lib/signature.c:1338
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1318
+#: lib/signature.c:1342
 #, fuzzy, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "ğÏÄĞÉÓØ: ÒÁÚÍÅÒ(%d)+ÚÁĞÏÌÎÅÎÉÅ(%d)\n"
@@ -3468,6 +3453,10 @@ msgstr "url ĞÏÒÔ ÄÏÌÖÅÎ ÂÙÔØ ŞÉÓÌÏÍ\n"
 msgid "failed to create %s: %s\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ %s: %s\n"
 
+#, fuzzy
+#~ msgid "sign a package, discarding all current signatures"
+#~ msgstr "ĞÏÄĞÉÓÁÔØ ĞÁËÅÔ (ÕÄÁÌÉ× ÔÅËÕİÕÀ ĞÏÄĞÉÓØ)"
+
 #~ msgid "Generating signature using PGP.\n"
 #~ msgstr "çÅÎÅÒÉÒÕÅÔÓÑ ĞÏÄĞÉÓØ PGP.\n"
 
diff --git a/po/sk.po b/po/sk.po
index e34987f30..e643ec4a2 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-03-07 17:53-0500\n"
+"POT-Creation-Date: 2002-03-08 17:22-0500\n"
 "PO-Revision-Date: 1999-04-08 21:37+02:00\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -1650,65 +1650,48 @@ msgstr "varovanie: %s vytvorené ako %s"
 msgid "error creating temporary file %s\n"
 msgstr "chyba pri vytváraní doèasného súboru %s"
 
-#: lib/package.c:181 lib/package.c:257
+#: lib/package.c:184 lib/package.c:260
 #, 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:202 lib/package.c:265
+#: lib/package.c:205 lib/package.c:268
 #, 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:243 lib/rpmchecksig.c:161 lib/rpmchecksig.c:541
+#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:548
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: readLead zlyhalo\n"
 
-#: lib/package.c:249
+#: lib/package.c:252
 #, fuzzy, c-format
 msgid "%s: bad magic\n"
 msgstr "Chybné magické èíslo"
 
-#: lib/package.c:274 lib/rpmchecksig.c:179 lib/rpmchecksig.c:557
+#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:564
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: rpmReadSignature zlyhalo\n"
 
-#: lib/package.c:278 lib/rpmchecksig.c:183 lib/rpmchecksig.c:562
+#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:569
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Podpis nie je k dispozícii\n"
 
-#: lib/package.c:308 lib/rpmchecksig.c:462
+#: lib/package.c:331 lib/rpmchecksig.c:467
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: readLead zlyhalo\n"
 
-#. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:338
-#, fuzzy
-msgid "========== Header RSA signature\n"
-msgstr "Nová hlavièka podpisu\n"
-
-#: lib/package.c:343 lib/package.c:371 lib/package.c:403 lib/rpmchecksig.c:631
+#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:642
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
-#. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:366
-#, fuzzy
-msgid "========== Header DSA signature\n"
-msgstr "Nová hlavièka podpisu\n"
-
-#. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:397
-msgid "========== Package DSA/RSA signature\n"
-msgstr ""
-
-#: lib/package.c:415 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
+#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:496
 #, fuzzy, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: readLead zlyhalo\n"
@@ -2073,7 +2056,7 @@ msgstr "zobrazii» stav danıch súborov"
 msgid "display a verbose file listing"
 msgstr "zobrazi» podrobnı zoznam súborov balíka"
 
-#: lib/poptQV.c:240 lib/poptQV.c:282 lib/poptQV.c:316
+#: lib/poptQV.c:240
 #, fuzzy
 msgid "don't verify MD5 digest of files"
 msgstr "zobrazi» súbory v balíku"
@@ -2122,46 +2105,46 @@ msgstr "neoverova» závislosti balíka"
 msgid "don't execute verify script(s)"
 msgstr "nevykona» ¾iadne etapy"
 
-#: lib/poptQV.c:275
+#: lib/poptQV.c:275 lib/poptQV.c:313
 #, fuzzy
 msgid "don't verify digest(s)"
 msgstr "zobrazi» súbory v balíku"
 
-#: lib/poptQV.c:278
+#: lib/poptQV.c:278 lib/poptQV.c:316
 #, fuzzy
 msgid "don't verify signature(s)"
 msgstr "zobrazi» súbory v balíku"
 
-#: lib/poptQV.c:286 lib/poptQV.c:320
+#: lib/poptQV.c:283
 #, fuzzy
 msgid "don't verify GPG V3 DSA signature(s)"
 msgstr "zobrazi» súbory v balíku"
 
-#: lib/poptQV.c:289 lib/poptQV.c:323
+#: lib/poptQV.c:286
 #, fuzzy
 msgid "don't verify PGP V3 RSA/MD5 signature(s)"
 msgstr "zobrazi» súbory v balíku"
 
-#: lib/poptQV.c:304
+#: lib/poptQV.c:301
 #, fuzzy
-msgid "sign a package, preserving other existing signatures"
+msgid "sign a package, preserving digests"
 msgstr "podpísa» balík (znièi» aktuálny podpis)"
 
-#: lib/poptQV.c:306
+#: lib/poptQV.c:303
 #, fuzzy
 msgid "verify package signature(s)"
 msgstr "overi» podpis balíka"
 
-#: lib/poptQV.c:308
+#: lib/poptQV.c:305
 msgid "import an armored public key"
 msgstr ""
 
-#: lib/poptQV.c:310
+#: lib/poptQV.c:307
 #, fuzzy
-msgid "sign a package, discarding all current signatures"
+msgid "sign a package, recomputing digests"
 msgstr "podpísa» balík (znièi» aktuálny podpis)"
 
-#: lib/poptQV.c:312
+#: lib/poptQV.c:309
 #, fuzzy
 msgid "generate signature"
 msgstr "vytvori» PGP/GPG podpis"
@@ -2331,131 +2314,131 @@ msgstr "%s zlyhalo"
 msgid "incorrect format: %s\n"
 msgstr "chyba formátu: %s\n"
 
-#: lib/query.c:221
+#: lib/query.c:220
 msgid "(contains no files)"
 msgstr "(neobsahuje ¾iadne súbory)"
 
-#: lib/query.c:282
+#: lib/query.c:281
 msgid "normal        "
 msgstr "normálny      "
 
-#: lib/query.c:285
+#: lib/query.c:284
 msgid "replaced      "
 msgstr "nahradenı     "
 
-#: lib/query.c:288
+#: lib/query.c:287
 msgid "not installed "
 msgstr "nein¹talovanı "
 
-#: lib/query.c:291
+#: lib/query.c:290
 msgid "net shared    "
 msgstr "zdieµanı      "
 
-#: lib/query.c:294
+#: lib/query.c:293
 #, c-format
 msgid "(unknown %3d) "
 msgstr "(neznámy %d)  "
 
-#: lib/query.c:299
+#: lib/query.c:298
 msgid "(no state)    "
 msgstr "(¾iadny stav) "
 
-#: lib/query.c:318 lib/query.c:374
+#: lib/query.c:317 lib/query.c:373
 #, 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:463
+#: lib/query.c:462
 #, fuzzy, c-format
 msgid "can't query %s: %s\n"
 msgstr "zmazanie %s zlyhalo: %s\n"
 
-#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:333 lib/rpminstall.c:475
+#: lib/query.c:616 lib/query.c:654 lib/rpminstall.c:333 lib/rpminstall.c:475
 #: lib/rpminstall.c:845
 #, fuzzy, c-format
 msgid "open of %s failed: %s\n"
 msgstr "otvorenie %s zlyhalo\n"
 
-#: lib/query.c:633
+#: lib/query.c:632
 #, c-format
 msgid "query of %s failed\n"
 msgstr "otázka na %s zlyhala\n"
 
-#: lib/query.c:639
+#: lib/query.c:638
 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:665 lib/rpminstall.c:488
+#: lib/query.c:664 lib/rpminstall.c:488
 #, fuzzy, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: readLead zlyhalo\n"
 
-#: lib/query.c:709
+#: lib/query.c:708
 #, 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:730
+#: lib/query.c:729
 #, fuzzy
 msgid "no packages\n"
 msgstr "nájdenıch %d balíkov\n"
 
-#: lib/query.c:750
+#: lib/query.c:749
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "skupina %s neobsahuje ¾iadne balíky\n"
 
-#: lib/query.c:760
+#: lib/query.c:759
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "¾iadny z balíkov nespú¹»a %s\n"
 
-#: lib/query.c:774 lib/query.c:796 lib/query.c:814 lib/query.c:845
+#: lib/query.c:773 lib/query.c:795 lib/query.c:813 lib/query.c:844
 #, fuzzy, c-format
 msgid "malformed %s: %s\n"
 msgstr "Nie je mo¾né preèíta» %s: %s."
 
-#: lib/query.c:784 lib/query.c:802 lib/query.c:820 lib/query.c:850
+#: lib/query.c:783 lib/query.c:801 lib/query.c:819 lib/query.c:849
 #, fuzzy, c-format
 msgid "no package matches %s: %s\n"
 msgstr "¾iadny z balíkov nespú¹»a %s\n"
 
-#: lib/query.c:861
+#: lib/query.c:860
 #, c-format
 msgid "no package requires %s\n"
 msgstr "¾iadny z balíkov nevy¾aduje %s\n"
 
-#: lib/query.c:872
+#: lib/query.c:871
 #, c-format
 msgid "no package provides %s\n"
 msgstr "¾iadny z balíkov neposkytuje %s\n"
 
-#: lib/query.c:906
+#: lib/query.c:905
 #, c-format
 msgid "file %s: %s\n"
 msgstr "súbor %s: %s\n"
 
-#: lib/query.c:910
+#: lib/query.c:909
 #, 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:937
+#: lib/query.c:936
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "chybné èíslo balíku: %s\n"
 
-#: lib/query.c:940
+#: lib/query.c:939
 #, fuzzy, c-format
 msgid "package record number: %u\n"
 msgstr "po¾aduje sa záznam èíslo %d\n"
 
-#: lib/query.c:945
+#: lib/query.c:944
 #, 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:956 lib/rpminstall.c:633
+#: lib/query.c:955 lib/rpminstall.c:633
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "balík %s nie je nain¹talovanı\n"
@@ -2470,72 +2453,72 @@ msgstr "chybnı stav súboru: %s"
 msgid "(added provide)"
 msgstr "Poskytuje:"
 
-#: lib/rpmchecksig.c:51
+#: lib/rpmchecksig.c:54
 #, fuzzy, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s: otvorenie zlyhalo\n"
 
-#: lib/rpmchecksig.c:63
+#: lib/rpmchecksig.c:66
 #, fuzzy
 msgid "makeTempFile failed\n"
 msgstr "vykonanie zlyhalo\n"
 
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:107
 #, fuzzy, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: readLead zlyhalo\n"
 
-#: lib/rpmchecksig.c:166
+#: lib/rpmchecksig.c:169
 #, fuzzy, c-format
 msgid "%s: Can't sign v1 packaging\n"
 msgstr "%s: Nie je mo¾né podpísa» v1.0 RPM\n"
 
-#: lib/rpmchecksig.c:170
+#: lib/rpmchecksig.c:173
 #, fuzzy, c-format
 msgid "%s: Can't re-sign v2 packaging\n"
 msgstr "%s: Nie je mo¾né znovu podpísa» v2.0 RPM\n"
 
-#: lib/rpmchecksig.c:239
+#: lib/rpmchecksig.c:244
 #, fuzzy, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: readLead zlyhalo\n"
 
-#: lib/rpmchecksig.c:245
+#: lib/rpmchecksig.c:250
 #, fuzzy, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmReadSignature zlyhalo\n"
 
-#: lib/rpmchecksig.c:476
+#: lib/rpmchecksig.c:481
 #, fuzzy, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr "%s: readLead zlyhalo\n"
 
-#: lib/rpmchecksig.c:547
+#: lib/rpmchecksig.c:554
 #, 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:773
+#: lib/rpmchecksig.c:801
 msgid "NOT OK"
 msgstr "NIE JE V PORIADKU"
 
-#: lib/rpmchecksig.c:774 lib/rpmchecksig.c:788
+#: lib/rpmchecksig.c:802 lib/rpmchecksig.c:816
 msgid " (MISSING KEYS:"
 msgstr " (CHİBAJÚCE K¥ÚÈE):"
 
-#: lib/rpmchecksig.c:776 lib/rpmchecksig.c:790
+#: lib/rpmchecksig.c:804 lib/rpmchecksig.c:818
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:777 lib/rpmchecksig.c:791
+#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819
 msgid " (UNTRUSTED KEYS:"
 msgstr " (NEDÔVERUJE SA K¥ÚÈOM: "
 
-#: lib/rpmchecksig.c:779 lib/rpmchecksig.c:793
+#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:787
+#: lib/rpmchecksig.c:815
 msgid "OK"
 msgstr "V PORIADKU"
 
@@ -2746,146 +2729,146 @@ msgstr ""
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "Nie je mo¾né otvori» %s pre èítanie: %s."
 
-#: lib/signature.c:118
+#: lib/signature.c:119
 msgid "file is not regular -- skipping size check\n"
 msgstr "nejde o be¾nı súbor - kontrola veµkosti vynechaná\n"
 
-#: lib/signature.c:127
+#: lib/signature.c:128
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:132
+#: lib/signature.c:133
 #, fuzzy, c-format
 msgid "  Actual size: %12d\n"
 msgstr "Veµkos» podpisu:   %d\n"
 
-#: lib/signature.c:152
+#: lib/signature.c:153
 msgid "No signature\n"
 msgstr "Podpis nie je k dispozícii\n"
 
-#: lib/signature.c:156
+#: lib/signature.c:157
 msgid "Old PGP signature\n"
 msgstr "Starı PGP podpis\n"
 
-#: lib/signature.c:169
+#: lib/signature.c:170
 #, fuzzy
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr "Starı (iba internı) podpis! Ako ste sa k tomu dostali?!"
 
-#: lib/signature.c:225
+#: lib/signature.c:226
 #, fuzzy, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "Veµkos» podpisu:   %d\n"
 
-#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:677
-#: lib/signature.c:710
+#: lib/signature.c:307 lib/signature.c:406 lib/signature.c:678
+#: lib/signature.c:711
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "Nie je mo¾né spusti» %s"
 
-#: lib/signature.c:322
+#: lib/signature.c:323
 #, fuzzy
 msgid "pgp failed\n"
 msgstr "pgp zlyhalo"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:329
+#: lib/signature.c:330
 #, fuzzy
 msgid "pgp failed to write signature\n"
 msgstr "pgp sa nepodarilo zapísa» podpis"
 
-#: lib/signature.c:334
+#: lib/signature.c:335
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr "Veµkos» PGP podpisu: %d\n"
 
-#: lib/signature.c:350 lib/signature.c:450
+#: lib/signature.c:351 lib/signature.c:451
 #, fuzzy
 msgid "unable to read the signature\n"
 msgstr "nie je mo¾né preèíta» podpis"
 
-#: lib/signature.c:355
+#: lib/signature.c:356
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr "Preèítanı PGP podpis obsahuje %d bajtov\n"
 
-#: lib/signature.c:422
+#: lib/signature.c:423
 #, fuzzy
 msgid "gpg failed\n"
 msgstr "gpg zlyhalo"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:429
+#: lib/signature.c:430
 #, fuzzy
 msgid "gpg failed to write signature\n"
 msgstr "gpg sa nepodarilo zapísa» podpis"
 
-#: lib/signature.c:434
+#: lib/signature.c:435
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr "Veµkos» GPG podpisu: %d\n"
 
-#: lib/signature.c:455
+#: lib/signature.c:456
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr "Preèítanı GPG podpis obsahuje %d bajtov\n"
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:715 lib/signature.c:770
+#: lib/signature.c:716 lib/signature.c:771
 #, fuzzy, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "Chybná ¹pecifikácia %%_signature v makro-súbore.\n"
 
-#: lib/signature.c:749
+#: lib/signature.c:750
 #, fuzzy, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "Musíte nastavi» \"%%gpg_name\" vo va¹om makro-súbore"
 
-#: lib/signature.c:762
+#: lib/signature.c:763
 #, fuzzy, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "Musíte nastavi» \"%%pgp_name\" vo va¹om makro-súbore"
 
-#: lib/signature.c:806
+#: lib/signature.c:807
 #, fuzzy
 msgid "Header+Payload size: "
 msgstr "Priveµká hlavièka"
 
-#: lib/signature.c:846
+#: lib/signature.c:847
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:903
+#: lib/signature.c:906
 msgid "Header SHA1 digest: "
 msgstr ""
 
-#: lib/signature.c:1082
+#: lib/signature.c:1102
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "vynecha» akékoµvek MD5 podpisy"
 
-#: lib/signature.c:1199
+#: lib/signature.c:1221
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1200
+#: lib/signature.c:1222
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "Podpis nie je k dispozícii\n"
 
-#: lib/signature.c:1287
+#: lib/signature.c:1311
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1314
+#: lib/signature.c:1338
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1318
+#: lib/signature.c:1342
 #, fuzzy, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Doplnenie podpisu: %d\n"
@@ -3531,6 +3514,18 @@ msgid "failed to create %s: %s\n"
 msgstr "nepodarilo sa vytvori» %s\n"
 
 #, fuzzy
+#~ msgid "========== Header RSA signature\n"
+#~ msgstr "Nová hlavièka podpisu\n"
+
+#, fuzzy
+#~ msgid "========== Header DSA signature\n"
+#~ msgstr "Nová hlavièka podpisu\n"
+
+#, fuzzy
+#~ msgid "sign a package, discarding all current signatures"
+#~ msgstr "podpísa» balík (znièi» aktuálny podpis)"
+
+#, fuzzy
 #~ msgid "Generating signature using PGP.\n"
 #~ msgstr "Vytvára sa PGP podpis: %d\n"
 
diff --git a/po/sl.po b/po/sl.po
index 4db5f5b49..dc8851b40 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.228 2002/03/07 22:55:06 jbj Exp $
+# $Id: sl.po,v 1.229 2002/03/08 22:25:04 jbj Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-03-07 17:53-0500\n"
+"POT-Creation-Date: 2002-03-08 17:22-0500\n"
 "PO-Revision-Date: 2000-10-08 19:05+0200\n"
 "Last-Translator: Grega Fajdiga <gregor.fajdiga@telemach.net>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -1651,65 +1651,48 @@ msgstr "opozorilo: %s ustvarjen kot %s"
 msgid "error creating temporary file %s\n"
 msgstr "napaka pri ustvarjanju zaèasne datoteke %s"
 
-#: lib/package.c:181 lib/package.c:257
+#: lib/package.c:184 lib/package.c:260
 #, 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:202 lib/package.c:265
+#: lib/package.c:205 lib/package.c:268
 #, 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:243 lib/rpmchecksig.c:161 lib/rpmchecksig.c:541
+#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:548
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: readLead je bil neuspe¹en\n"
 
-#: lib/package.c:249
+#: lib/package.c:252
 #, fuzzy, c-format
 msgid "%s: bad magic\n"
 msgstr "Napaèno magièno ¹tevilo"
 
-#: lib/package.c:274 lib/rpmchecksig.c:179 lib/rpmchecksig.c:557
+#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:564
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: rpmReadSignature je bil neuspe¹en\n"
 
-#: lib/package.c:278 lib/rpmchecksig.c:183 lib/rpmchecksig.c:562
+#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:569
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Podpis ni na voljo\n"
 
-#: lib/package.c:308 lib/rpmchecksig.c:462
+#: lib/package.c:331 lib/rpmchecksig.c:467
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: readLead je bil neuspe¹en\n"
 
-#. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:338
-#, fuzzy
-msgid "========== Header RSA signature\n"
-msgstr "Podpis v novi glavi\n"
-
-#: lib/package.c:343 lib/package.c:371 lib/package.c:403 lib/rpmchecksig.c:631
+#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:642
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
-#. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:366
-#, fuzzy
-msgid "========== Header DSA signature\n"
-msgstr "Podpis v novi glavi\n"
-
-#. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:397
-msgid "========== Package DSA/RSA signature\n"
-msgstr ""
-
-#: lib/package.c:415 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
+#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:496
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: branje Fread je bilo neuspe¹no: %s\n"
@@ -2072,7 +2055,7 @@ msgstr "izpis stanja seznama datotek"
 msgid "display a verbose file listing"
 msgstr "izpis ob¹irnega seznama datotek"
 
-#: lib/poptQV.c:240 lib/poptQV.c:282 lib/poptQV.c:316
+#: lib/poptQV.c:240
 #, fuzzy
 msgid "don't verify MD5 digest of files"
 msgstr "brez preverjanja datotek v paketu"
@@ -2120,46 +2103,46 @@ msgstr "brez preverjanja soodvisnosti paketa"
 msgid "don't execute verify script(s)"
 msgstr "brez izvajanja katerekoli stopen izgradnje"
 
-#: lib/poptQV.c:275
+#: lib/poptQV.c:275 lib/poptQV.c:313
 #, fuzzy
 msgid "don't verify digest(s)"
 msgstr "brez preverjanja datotek v paketu"
 
-#: lib/poptQV.c:278
+#: lib/poptQV.c:278 lib/poptQV.c:316
 #, fuzzy
 msgid "don't verify signature(s)"
 msgstr "brez preverjanja datotek v paketu"
 
-#: lib/poptQV.c:286 lib/poptQV.c:320
+#: lib/poptQV.c:283
 #, fuzzy
 msgid "don't verify GPG V3 DSA signature(s)"
 msgstr "brez preverjanja datotek v paketu"
 
-#: lib/poptQV.c:289 lib/poptQV.c:323
+#: lib/poptQV.c:286
 #, fuzzy
 msgid "don't verify PGP V3 RSA/MD5 signature(s)"
 msgstr "brez preverjanja datotek v paketu"
 
-#: lib/poptQV.c:304
+#: lib/poptQV.c:301
 #, fuzzy
-msgid "sign a package, preserving other existing signatures"
+msgid "sign a package, preserving digests"
 msgstr "podpi¹i paket(e) (trenutni podpis zavrzi)"
 
-#: lib/poptQV.c:306
+#: lib/poptQV.c:303
 #, fuzzy
 msgid "verify package signature(s)"
 msgstr "preveri podpis paketa(-ov)"
 
-#: lib/poptQV.c:308
+#: lib/poptQV.c:305
 msgid "import an armored public key"
 msgstr ""
 
-#: lib/poptQV.c:310
+#: lib/poptQV.c:307
 #, fuzzy
-msgid "sign a package, discarding all current signatures"
+msgid "sign a package, recomputing digests"
 msgstr "podpi¹i paket(e) (trenutni podpis zavrzi)"
 
-#: lib/poptQV.c:312
+#: lib/poptQV.c:309
 #, fuzzy
 msgid "generate signature"
 msgstr "izdelava podpisa PGP/GPG"
@@ -2330,131 +2313,131 @@ msgstr "%s neuspe¹en"
 msgid "incorrect format: %s\n"
 msgstr "napaka v obliki: %s\n"
 
-#: lib/query.c:221
+#: lib/query.c:220
 msgid "(contains no files)"
 msgstr "(ne vsebuje datotek)"
 
-#: lib/query.c:282
+#: lib/query.c:281
 msgid "normal        "
 msgstr "normalno      "
 
-#: lib/query.c:285
+#: lib/query.c:284
 msgid "replaced      "
 msgstr "nadome¹èeno   "
 
-#: lib/query.c:288
+#: lib/query.c:287
 msgid "not installed "
 msgstr "ni name¹èeno  "
 
-#: lib/query.c:291
+#: lib/query.c:290
 msgid "net shared    "
 msgstr "omre¾ni       "
 
-#: lib/query.c:294
+#: lib/query.c:293
 #, c-format
 msgid "(unknown %3d) "
 msgstr "(neznano %3d) "
 
-#: lib/query.c:299
+#: lib/query.c:298
 msgid "(no state)    "
 msgstr "(brez stanja) "
 
-#: lib/query.c:318 lib/query.c:374
+#: lib/query.c:317 lib/query.c:373
 #, fuzzy
 msgid "package has neither file owner or id lists\n"
 msgstr "paket ne vsebuje ne lastnika datotek niti seznamov id"
 
-#: lib/query.c:463
+#: lib/query.c:462
 #, fuzzy, c-format
 msgid "can't query %s: %s\n"
 msgstr "ni mo¾no poizvedeti o %s: %s\n"
 
-#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:333 lib/rpminstall.c:475
+#: lib/query.c:616 lib/query.c:654 lib/rpminstall.c:333 lib/rpminstall.c:475
 #: lib/rpminstall.c:845
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "odpiranje %s je bilo neuspe¹no: %s\n"
 
-#: lib/query.c:633
+#: lib/query.c:632
 #, c-format
 msgid "query of %s failed\n"
 msgstr "poizvedba po %s je bila neuspe¹na\n"
 
-#: lib/query.c:639
+#: lib/query.c:638
 msgid "old format source packages cannot be queried\n"
 msgstr "poizvedba po izvornih paketih v stari obliki ni mo¾na\n"
 
-#: lib/query.c:665 lib/rpminstall.c:488
+#: lib/query.c:664 lib/rpminstall.c:488
 #, fuzzy, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: branje Fread je bilo neuspe¹no: %s\n"
 
-#: lib/query.c:709
+#: lib/query.c:708
 #, 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:730
+#: lib/query.c:729
 #, fuzzy
 msgid "no packages\n"
 msgstr "ni paketov\n"
 
-#: lib/query.c:750
+#: lib/query.c:749
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "skupina %s ne vsebuje nobenega paketa\n"
 
-#: lib/query.c:760
+#: lib/query.c:759
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "noben paket ne pro¾i %s\n"
 
-#: lib/query.c:774 lib/query.c:796 lib/query.c:814 lib/query.c:845
+#: lib/query.c:773 lib/query.c:795 lib/query.c:813 lib/query.c:844
 #, fuzzy, c-format
 msgid "malformed %s: %s\n"
 msgstr "Neuspe¹no branje %s: %s."
 
-#: lib/query.c:784 lib/query.c:802 lib/query.c:820 lib/query.c:850
+#: lib/query.c:783 lib/query.c:801 lib/query.c:819 lib/query.c:849
 #, fuzzy, c-format
 msgid "no package matches %s: %s\n"
 msgstr "noben paket ne pro¾i %s\n"
 
-#: lib/query.c:861
+#: lib/query.c:860
 #, c-format
 msgid "no package requires %s\n"
 msgstr "noben paket ne potrebuje %s\n"
 
-#: lib/query.c:872
+#: lib/query.c:871
 #, c-format
 msgid "no package provides %s\n"
 msgstr "noben paket ne nudi %s\n"
 
-#: lib/query.c:906
+#: lib/query.c:905
 #, c-format
 msgid "file %s: %s\n"
 msgstr "datoteka %s: %s\n"
 
-#: lib/query.c:910
+#: lib/query.c:909
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "datoteka %s ni del nobenega paketa\n"
 
-#: lib/query.c:937
+#: lib/query.c:936
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "neveljavna ¹tevilka paketa: %s\n"
 
-#: lib/query.c:940
+#: lib/query.c:939
 #, fuzzy, c-format
 msgid "package record number: %u\n"
 msgstr "¹tevilka zapisa paketa: %d\n"
 
-#: lib/query.c:945
+#: lib/query.c:944
 #, fuzzy, c-format
 msgid "record %u could not be read\n"
 msgstr "zapisa %d ni mo¾no prebrati\n"
 
-#: lib/query.c:956 lib/rpminstall.c:633
+#: lib/query.c:955 lib/rpminstall.c:633
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "paket %s ni name¹èen\n"
@@ -2469,71 +2452,71 @@ msgstr "po¹kodovana zbirka podatkov %s"
 msgid "(added provide)"
 msgstr "%s: %-45s DA (db ponudbe)\n"
 
-#: lib/rpmchecksig.c:51
+#: lib/rpmchecksig.c:54
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s: odpiranje je bilo neuspe¹no: %s\n"
 
-#: lib/rpmchecksig.c:63
+#: lib/rpmchecksig.c:66
 msgid "makeTempFile failed\n"
 msgstr "makeTempFile je bil neuspe¹en\n"
 
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:107
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: pisanje Fwrite je bilo neuspe¹no: %s\n"
 
-#: lib/rpmchecksig.c:166
+#: lib/rpmchecksig.c:169
 #, fuzzy, c-format
 msgid "%s: Can't sign v1 packaging\n"
 msgstr "%s: Podpis RPM v1.0 ni mo¾en\n"
 
-#: lib/rpmchecksig.c:170
+#: lib/rpmchecksig.c:173
 #, fuzzy, c-format
 msgid "%s: Can't re-sign v2 packaging\n"
 msgstr "%s: Sprememba podpisa RPM v2.0 ni mo¾na\n"
 
-#: lib/rpmchecksig.c:239
+#: lib/rpmchecksig.c:244
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: writeLead je bil neuspe¹en: %s\n"
 
-#: lib/rpmchecksig.c:245
+#: lib/rpmchecksig.c:250
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmWriteSignature je bilo neuspe¹no: %s\n"
 
-#: lib/rpmchecksig.c:476
+#: lib/rpmchecksig.c:481
 #, fuzzy, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr "%s: readLead je bil neuspe¹en\n"
 
-#: lib/rpmchecksig.c:547
+#: lib/rpmchecksig.c:554
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: Podpis ni na voljo (RPM v1.0)\n"
 
-#: lib/rpmchecksig.c:773
+#: lib/rpmchecksig.c:801
 msgid "NOT OK"
 msgstr "NI DOBRO"
 
-#: lib/rpmchecksig.c:774 lib/rpmchecksig.c:788
+#: lib/rpmchecksig.c:802 lib/rpmchecksig.c:816
 msgid " (MISSING KEYS:"
 msgstr " (MANJKAJOÈI KLJUÈI:"
 
-#: lib/rpmchecksig.c:776 lib/rpmchecksig.c:790
+#: lib/rpmchecksig.c:804 lib/rpmchecksig.c:818
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:777 lib/rpmchecksig.c:791
+#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819
 msgid " (UNTRUSTED KEYS:"
 msgstr " (NEPREVERJENI KLJUÈI:"
 
-#: lib/rpmchecksig.c:779 lib/rpmchecksig.c:793
+#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:787
+#: lib/rpmchecksig.c:815
 msgid "OK"
 msgstr "V REDU"
 
@@ -2746,146 +2729,146 @@ msgstr "Ni mo¾no prebrati %s, HOME je prevelik."
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "%s ni mo¾no odpreti za branje: %s."
 
-#: lib/signature.c:118
+#: lib/signature.c:119
 msgid "file is not regular -- skipping size check\n"
 msgstr "datoteka ni navadna datoteka -- preskakujemo preverjanje velikosti\n"
 
-#: lib/signature.c:127
+#: lib/signature.c:128
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:132
+#: lib/signature.c:133
 #, fuzzy, c-format
 msgid "  Actual size: %12d\n"
 msgstr "Dol¾. podpisa : %d\n"
 
-#: lib/signature.c:152
+#: lib/signature.c:153
 msgid "No signature\n"
 msgstr "Podpis manjka\n"
 
-#: lib/signature.c:156
+#: lib/signature.c:157
 msgid "Old PGP signature\n"
 msgstr "Stari podpis PGP\n"
 
-#: lib/signature.c:169
+#: lib/signature.c:170
 #, fuzzy
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr "Podpis v (interni) stari obliki! Kje ste ga dobili?"
 
-#: lib/signature.c:225
+#: lib/signature.c:226
 #, fuzzy, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "Dol¾. podpisa : %d\n"
 
-#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:677
-#: lib/signature.c:710
+#: lib/signature.c:307 lib/signature.c:406 lib/signature.c:678
+#: lib/signature.c:711
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "Ni mo¾no izvesti %s: %s"
 
-#: lib/signature.c:322
+#: lib/signature.c:323
 #, fuzzy
 msgid "pgp failed\n"
 msgstr "pgp je bil neuspe¹en"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:329
+#: lib/signature.c:330
 #, fuzzy
 msgid "pgp failed to write signature\n"
 msgstr "pgp je bil neuspe¹en pri zapisu podpisa"
 
-#: lib/signature.c:334
+#: lib/signature.c:335
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr "Dol¾. podpisa PGP: %d\n"
 
-#: lib/signature.c:350 lib/signature.c:450
+#: lib/signature.c:351 lib/signature.c:451
 #, fuzzy
 msgid "unable to read the signature\n"
 msgstr "branje podpisa je bilo neuspe¹no"
 
-#: lib/signature.c:355
+#: lib/signature.c:356
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr "Prebrano %d bajtov podpisa PGP\n"
 
-#: lib/signature.c:422
+#: lib/signature.c:423
 #, fuzzy
 msgid "gpg failed\n"
 msgstr "gpg je bil neuspe¹en"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:429
+#: lib/signature.c:430
 #, fuzzy
 msgid "gpg failed to write signature\n"
 msgstr "gpg je boil neuspe¹en pri zapisu podpisa"
 
-#: lib/signature.c:434
+#: lib/signature.c:435
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr "Dol¾. podpisa GnuPG: %d\n"
 
-#: lib/signature.c:455
+#: lib/signature.c:456
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr "Prebrano %d bajtov podpisa GnuPG\n"
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:715 lib/signature.c:770
+#: lib/signature.c:716 lib/signature.c:771
 #, fuzzy, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "Neveljaven %%_signature v makro-datoteki.\n"
 
-#: lib/signature.c:749
+#: lib/signature.c:750
 #, fuzzy, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "V makrodatoteki morate nastaviti \"%%_pgp_name\""
 
-#: lib/signature.c:762
+#: lib/signature.c:763
 #, fuzzy, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "V makrodatoteki morate nastaviti \"%%_pgp_name\""
 
-#: lib/signature.c:806
+#: lib/signature.c:807
 #, fuzzy
 msgid "Header+Payload size: "
 msgstr "Glava je predolga"
 
-#: lib/signature.c:846
+#: lib/signature.c:847
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:903
+#: lib/signature.c:906
 msgid "Header SHA1 digest: "
 msgstr ""
 
-#: lib/signature.c:1082
+#: lib/signature.c:1102
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "preskoèi vse podpise MD5"
 
-#: lib/signature.c:1199
+#: lib/signature.c:1221
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1200
+#: lib/signature.c:1222
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "Podpis manjka\n"
 
-#: lib/signature.c:1287
+#: lib/signature.c:1311
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1314
+#: lib/signature.c:1338
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1318
+#: lib/signature.c:1342
 #, fuzzy, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Dol¾. polnila : %d\n"
@@ -3535,6 +3518,18 @@ msgstr "vrata URL morajo biti ¹tevilka\n"
 msgid "failed to create %s: %s\n"
 msgstr "neuspe¹no ustvarjanje %s: %s\n"
 
+#, fuzzy
+#~ msgid "========== Header RSA signature\n"
+#~ msgstr "Podpis v novi glavi\n"
+
+#, fuzzy
+#~ msgid "========== Header DSA signature\n"
+#~ msgstr "Podpis v novi glavi\n"
+
+#, fuzzy
+#~ msgid "sign a package, discarding all current signatures"
+#~ msgstr "podpi¹i paket(e) (trenutni podpis zavrzi)"
+
 #~ msgid "Generating signature using PGP.\n"
 #~ msgstr "Ustvarjanje podpisa s PGP.\n"
 
diff --git a/po/sr.po b/po/sr.po
index 04085c744..47b444ef0 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-03-07 17:53-0500\n"
+"POT-Creation-Date: 2002-03-08 17:22-0500\n"
 "Content-Type: text/plain; charset=\n"
 "Date: 1998-05-02 21:41:47-0400\n"
 
@@ -1634,65 +1634,48 @@ msgstr "Ne mogu da otvorim datoteku %s: "
 msgid "error creating temporary file %s\n"
 msgstr "gre¹ka kod kreiranja direktorijuma %s: %s"
 
-#: lib/package.c:181 lib/package.c:257
+#: lib/package.c:184 lib/package.c:260
 #, 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:202 lib/package.c:265
+#: lib/package.c:205 lib/package.c:268
 #, 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:243 lib/rpmchecksig.c:161 lib/rpmchecksig.c:541
+#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:548
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: Neuspeo 'readLead'\n"
 
-#: lib/package.c:249
+#: lib/package.c:252
 #, c-format
 msgid "%s: bad magic\n"
 msgstr ""
 
-#: lib/package.c:274 lib/rpmchecksig.c:179 lib/rpmchecksig.c:557
+#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:564
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: Neuspelo 'rpmReadSignature'\n"
 
-#: lib/package.c:278 lib/rpmchecksig.c:183 lib/rpmchecksig.c:562
+#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:569
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Potpis nije na raspolaganju\n"
 
-#: lib/package.c:308 lib/rpmchecksig.c:462
+#: lib/package.c:331 lib/rpmchecksig.c:467
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: Neuspeo 'readLead'\n"
 
-#. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:338
-#, fuzzy
-msgid "========== Header RSA signature\n"
-msgstr "ne mogu da proèitam potpis"
-
-#: lib/package.c:343 lib/package.c:371 lib/package.c:403 lib/rpmchecksig.c:631
+#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:642
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
-#. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:366
-#, fuzzy
-msgid "========== Header DSA signature\n"
-msgstr "ne mogu da proèitam potpis"
-
-#. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:397
-msgid "========== Package DSA/RSA signature\n"
-msgstr ""
-
-#: lib/package.c:415 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
+#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:496
 #, fuzzy, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Neuspeo 'readLead'\n"
@@ -2058,7 +2041,7 @@ msgstr ""
 msgid "display a verbose file listing"
 msgstr "prika¾i listu datoteka u paketu"
 
-#: lib/poptQV.c:240 lib/poptQV.c:282 lib/poptQV.c:316
+#: lib/poptQV.c:240
 #, fuzzy
 msgid "don't verify MD5 digest of files"
 msgstr "instaliraj paket"
@@ -2107,46 +2090,46 @@ msgstr "nemoj proveravati zavisnosti paketa"
 msgid "don't execute verify script(s)"
 msgstr "nemoj izvr¹iti nijednu fazu"
 
-#: lib/poptQV.c:275
+#: lib/poptQV.c:275 lib/poptQV.c:313
 #, fuzzy
 msgid "don't verify digest(s)"
 msgstr "instaliraj paket"
 
-#: lib/poptQV.c:278
+#: lib/poptQV.c:278 lib/poptQV.c:316
 #, fuzzy
 msgid "don't verify signature(s)"
 msgstr "instaliraj paket"
 
-#: lib/poptQV.c:286 lib/poptQV.c:320
+#: lib/poptQV.c:283
 #, fuzzy
 msgid "don't verify GPG V3 DSA signature(s)"
 msgstr "instaliraj paket"
 
-#: lib/poptQV.c:289 lib/poptQV.c:323
+#: lib/poptQV.c:286
 #, fuzzy
 msgid "don't verify PGP V3 RSA/MD5 signature(s)"
 msgstr "instaliraj paket"
 
-#: lib/poptQV.c:304
+#: lib/poptQV.c:301
 #, fuzzy
-msgid "sign a package, preserving other existing signatures"
+msgid "sign a package, preserving digests"
 msgstr "potpi¹i paket (ukloni tekuæi potpis)"
 
-#: lib/poptQV.c:306
+#: lib/poptQV.c:303
 #, fuzzy
 msgid "verify package signature(s)"
 msgstr "proveri potpis u paketu"
 
-#: lib/poptQV.c:308
+#: lib/poptQV.c:305
 msgid "import an armored public key"
 msgstr ""
 
-#: lib/poptQV.c:310
+#: lib/poptQV.c:307
 #, fuzzy
-msgid "sign a package, discarding all current signatures"
+msgid "sign a package, recomputing digests"
 msgstr "potpi¹i paket (ukloni tekuæi potpis)"
 
-#: lib/poptQV.c:312
+#: lib/poptQV.c:309
 #, fuzzy
 msgid "generate signature"
 msgstr "napravi PGP potpis"
@@ -2315,132 +2298,132 @@ msgstr "PGP omanuo"
 msgid "incorrect format: %s\n"
 msgstr "gre¹ka u formatu: %s\n"
 
-#: lib/query.c:221
+#: lib/query.c:220
 msgid "(contains no files)"
 msgstr "(nema datoteka)"
 
-#: lib/query.c:282
+#: lib/query.c:281
 msgid "normal        "
 msgstr ""
 
-#: lib/query.c:285
+#: lib/query.c:284
 msgid "replaced      "
 msgstr ""
 
-#: lib/query.c:288
+#: lib/query.c:287
 #, fuzzy
 msgid "not installed "
 msgstr "paket %s nije instaliran\n"
 
-#: lib/query.c:291
+#: lib/query.c:290
 msgid "net shared    "
 msgstr ""
 
-#: lib/query.c:294
+#: lib/query.c:293
 #, fuzzy, c-format
 msgid "(unknown %3d) "
 msgstr "(nepoznat tip)"
 
-#: lib/query.c:299
+#: lib/query.c:298
 msgid "(no state)    "
 msgstr ""
 
-#: lib/query.c:318 lib/query.c:374
+#: lib/query.c:317 lib/query.c:373
 #, fuzzy
 msgid "package has neither file owner or id lists\n"
 msgstr "paket nema imena"
 
-#: lib/query.c:463
+#: lib/query.c:462
 #, fuzzy, c-format
 msgid "can't query %s: %s\n"
 msgstr "gre¹ka: ne mogu da otvorim %s\n"
 
-#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:333 lib/rpminstall.c:475
+#: lib/query.c:616 lib/query.c:654 lib/rpminstall.c:333 lib/rpminstall.c:475
 #: lib/rpminstall.c:845
 #, fuzzy, c-format
 msgid "open of %s failed: %s\n"
 msgstr "neuspelo otvaranje %s: %s\n"
 
-#: lib/query.c:633
+#: lib/query.c:632
 #, c-format
 msgid "query of %s failed\n"
 msgstr "upit nad %s neuspeo\n"
 
-#: lib/query.c:639
+#: lib/query.c:638
 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:665 lib/rpminstall.c:488
+#: lib/query.c:664 lib/rpminstall.c:488
 #, fuzzy, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: Neuspeo 'readLead'\n"
 
-#: lib/query.c:709
+#: lib/query.c:708
 #, fuzzy, c-format
 msgid "query of specfile %s failed, can't parse\n"
 msgstr "upit nad %s neuspeo\n"
 
-#: lib/query.c:730
+#: lib/query.c:729
 #, fuzzy
 msgid "no packages\n"
 msgstr "upit nad svim paketima"
 
-#: lib/query.c:750
+#: lib/query.c:749
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "grupa %s ne sadr¾i nijedan paket\n"
 
-#: lib/query.c:760
+#: lib/query.c:759
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "nijedan paket ne aktivira %s\n"
 
-#: lib/query.c:774 lib/query.c:796 lib/query.c:814 lib/query.c:845
+#: lib/query.c:773 lib/query.c:795 lib/query.c:813 lib/query.c:844
 #, fuzzy, c-format
 msgid "malformed %s: %s\n"
 msgstr "Neuspelo èitanje %s: %s."
 
-#: lib/query.c:784 lib/query.c:802 lib/query.c:820 lib/query.c:850
+#: lib/query.c:783 lib/query.c:801 lib/query.c:819 lib/query.c:849
 #, fuzzy, c-format
 msgid "no package matches %s: %s\n"
 msgstr "nijedan paket ne aktivira %s\n"
 
-#: lib/query.c:861
+#: lib/query.c:860
 #, c-format
 msgid "no package requires %s\n"
 msgstr "nijedan paket ne zahteva %s\n"
 
-#: lib/query.c:872
+#: lib/query.c:871
 #, c-format
 msgid "no package provides %s\n"
 msgstr "nijedan paket ne obezbeğuje %s\n"
 
-#: lib/query.c:906
+#: lib/query.c:905
 #, fuzzy, c-format
 msgid "file %s: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
 
-#: lib/query.c:910
+#: lib/query.c:909
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "datoteka %s ne pripada nijednom paketu\n"
 
-#: lib/query.c:937
+#: lib/query.c:936
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "pogre¹an broj paketa: %s\n"
 
-#: lib/query.c:940
+#: lib/query.c:939
 #, fuzzy, c-format
 msgid "package record number: %u\n"
 msgstr "pogre¹an broj paketa: %s\n"
 
-#: lib/query.c:945
+#: lib/query.c:944
 #, fuzzy, c-format
 msgid "record %u could not be read\n"
 msgstr "ne mogu da proèitam slog %d\n"
 
-#: lib/query.c:956 lib/rpminstall.c:633
+#: lib/query.c:955 lib/rpminstall.c:633
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "paket %s nije instaliran\n"
@@ -2455,73 +2438,73 @@ msgstr "neuspelo otvaranje %s: %s"
 msgid "(added provide)"
 msgstr "datoteka %s ne pripada nijednom paketu\n"
 
-#: lib/rpmchecksig.c:51
+#: lib/rpmchecksig.c:54
 #, fuzzy, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s: Neuspelo otvaranje\n"
 
-#: lib/rpmchecksig.c:63
+#: lib/rpmchecksig.c:66
 #, fuzzy
 msgid "makeTempFile failed\n"
 msgstr "%s: Neuspelo otvaranje\n"
 
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:107
 #, fuzzy, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: Neuspeo 'readLead'\n"
 
-#: lib/rpmchecksig.c:166
+#: lib/rpmchecksig.c:169
 #, fuzzy, c-format
 msgid "%s: Can't sign v1 packaging\n"
 msgstr "%s: Ne mogu da potpi¹em v1.0 RPM\n"
 
-#: lib/rpmchecksig.c:170
+#: lib/rpmchecksig.c:173
 #, fuzzy, c-format
 msgid "%s: Can't re-sign v2 packaging\n"
 msgstr "%s: Ne mogu da ponovo potpi¹em v2.0 RPM\n"
 
-#: lib/rpmchecksig.c:239
+#: lib/rpmchecksig.c:244
 #, fuzzy, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: Neuspeo 'readLead'\n"
 
-#: lib/rpmchecksig.c:245
+#: lib/rpmchecksig.c:250
 #, fuzzy, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: Neuspelo 'rpmReadSignature'\n"
 
-#: lib/rpmchecksig.c:476
+#: lib/rpmchecksig.c:481
 #, fuzzy, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr "%s: Neuspeo 'readLead'\n"
 
-#: lib/rpmchecksig.c:547
+#: lib/rpmchecksig.c:554
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: Potpis nije na raspolaganju (RPM v1.0)\n"
 
-#: lib/rpmchecksig.c:773
+#: lib/rpmchecksig.c:801
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:774 lib/rpmchecksig.c:788
+#: lib/rpmchecksig.c:802 lib/rpmchecksig.c:816
 #, fuzzy
 msgid " (MISSING KEYS:"
 msgstr " (NEDOSTAJUÆI KLJUÈEVI)"
 
-#: lib/rpmchecksig.c:776 lib/rpmchecksig.c:790
+#: lib/rpmchecksig.c:804 lib/rpmchecksig.c:818
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:777 lib/rpmchecksig.c:791
+#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:779 lib/rpmchecksig.c:793
+#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:787
+#: lib/rpmchecksig.c:815
 msgid "OK"
 msgstr ""
 
@@ -2733,147 +2716,147 @@ msgstr ""
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "Ne mogu da otvorim %s za èitanje: %s"
 
-#: lib/signature.c:118
+#: lib/signature.c:119
 msgid "file is not regular -- skipping size check\n"
 msgstr ""
 
-#: lib/signature.c:127
+#: lib/signature.c:128
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:132
+#: lib/signature.c:133
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:152
+#: lib/signature.c:153
 #, fuzzy
 msgid "No signature\n"
 msgstr "%s: Potpis nije na raspolaganju\n"
 
-#: lib/signature.c:156
+#: lib/signature.c:157
 #, fuzzy
 msgid "Old PGP signature\n"
 msgstr "napravi PGP potpis"
 
-#: lib/signature.c:169
+#: lib/signature.c:170
 #, fuzzy
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr "Stari (interni) potpis!  Odakle vam!?"
 
-#: lib/signature.c:225
+#: lib/signature.c:226
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:677
-#: lib/signature.c:710
+#: lib/signature.c:307 lib/signature.c:406 lib/signature.c:678
+#: lib/signature.c:711
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "Ne mogu da izvr¹im PGP"
 
-#: lib/signature.c:322
+#: lib/signature.c:323
 #, fuzzy
 msgid "pgp failed\n"
 msgstr "PGP omanuo"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:329
+#: lib/signature.c:330
 #, fuzzy
 msgid "pgp failed to write signature\n"
 msgstr "PGP nije uspeo da zapi¹e potpis"
 
-#: lib/signature.c:334
+#: lib/signature.c:335
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:350 lib/signature.c:450
+#: lib/signature.c:351 lib/signature.c:451
 #, fuzzy
 msgid "unable to read the signature\n"
 msgstr "ne mogu da proèitam potpis"
 
-#: lib/signature.c:355
+#: lib/signature.c:356
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:422
+#: lib/signature.c:423
 #, fuzzy
 msgid "gpg failed\n"
 msgstr "PGP omanuo"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:429
+#: lib/signature.c:430
 #, fuzzy
 msgid "gpg failed to write signature\n"
 msgstr "PGP nije uspeo da zapi¹e potpis"
 
-#: lib/signature.c:434
+#: lib/signature.c:435
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:455
+#: lib/signature.c:456
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:715 lib/signature.c:770
+#: lib/signature.c:716 lib/signature.c:771
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:749
+#: lib/signature.c:750
 #, fuzzy, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "Morate podesiti \"pgp_name:\" u va¹oj rpmrc datoteci"
 
-#: lib/signature.c:762
+#: lib/signature.c:763
 #, fuzzy, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "Morate podesiti \"pgp_name:\" u va¹oj rpmrc datoteci"
 
-#: lib/signature.c:806
+#: lib/signature.c:807
 msgid "Header+Payload size: "
 msgstr ""
 
-#: lib/signature.c:846
+#: lib/signature.c:847
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:903
+#: lib/signature.c:906
 msgid "Header SHA1 digest: "
 msgstr ""
 
-#: lib/signature.c:1082
+#: lib/signature.c:1102
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "preskoèi sve MD5 potpise"
 
-#: lib/signature.c:1199
+#: lib/signature.c:1221
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1200
+#: lib/signature.c:1222
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "%s: Potpis nije na raspolaganju\n"
 
-#: lib/signature.c:1287
+#: lib/signature.c:1311
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1314
+#: lib/signature.c:1338
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1318
+#: lib/signature.c:1342
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
@@ -3517,6 +3500,18 @@ msgid "failed to create %s: %s\n"
 msgstr "neuspelo kreiranje %s\n"
 
 #, fuzzy
+#~ msgid "========== Header RSA signature\n"
+#~ msgstr "ne mogu da proèitam potpis"
+
+#, fuzzy
+#~ msgid "========== Header DSA signature\n"
+#~ msgstr "ne mogu da proèitam potpis"
+
+#, fuzzy
+#~ msgid "sign a package, discarding all current signatures"
+#~ msgstr "potpi¹i paket (ukloni tekuæi potpis)"
+
+#, fuzzy
 #~ msgid "Generating signature using PGP.\n"
 #~ msgstr "napravi PGP potpis"
 
diff --git a/po/sv.po b/po/sv.po
index a86396608..5f37a399e 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: 2002-03-07 17:53-0500\n"
+"POT-Creation-Date: 2002-03-08 17:22-0500\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"
@@ -1615,61 +1615,46 @@ msgstr "%s skapades som %s\n"
 msgid "error creating temporary file %s\n"
 msgstr "fel när tämporärfil %s skapades\n"
 
-#: lib/package.c:181 lib/package.c:257
+#: lib/package.c:184 lib/package.c:260
 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:202 lib/package.c:265
+#: lib/package.c:205 lib/package.c:268
 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:243 lib/rpmchecksig.c:161 lib/rpmchecksig.c:541
+#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:548
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: readLead misslyckades\n"
 
-#: lib/package.c:249
+#: lib/package.c:252
 #, fuzzy, c-format
 msgid "%s: bad magic\n"
 msgstr "Felaktigt magiskt tal"
 
-#: lib/package.c:274 lib/rpmchecksig.c:179 lib/rpmchecksig.c:557
+#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:564
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: rpmReadSignature misslyckades\n"
 
-#: lib/package.c:278 lib/rpmchecksig.c:183 lib/rpmchecksig.c:562
+#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:569
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Ingen signatur tillgänglig\n"
 
-#: lib/package.c:308 lib/rpmchecksig.c:462
+#: lib/package.c:331 lib/rpmchecksig.c:467
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: readLead misslyckades\n"
 
-#. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:338
-msgid "========== Header RSA signature\n"
-msgstr ""
-
-#: lib/package.c:343 lib/package.c:371 lib/package.c:403 lib/rpmchecksig.c:631
+#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:642
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
-#. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:366
-msgid "========== Header DSA signature\n"
-msgstr ""
-
-#. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:397
-msgid "========== Package DSA/RSA signature\n"
-msgstr ""
-
-#: lib/package.c:415 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
+#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:496
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Fread misslyckades: %s\n"
@@ -2015,7 +2000,7 @@ msgstr "visa tillstånd för de listade filerna"
 msgid "display a verbose file listing"
 msgstr "visa en utförlig fillistning"
 
-#: lib/poptQV.c:240 lib/poptQV.c:282 lib/poptQV.c:316
+#: lib/poptQV.c:240
 msgid "don't verify MD5 digest of files"
 msgstr "verifiera inte MD5-summor för filer"
 
@@ -2056,46 +2041,46 @@ msgstr "verifiera inte paketberoenden"
 msgid "don't execute verify script(s)"
 msgstr "utför inte (eventuellt) %verifyscript"
 
-#: lib/poptQV.c:275
+#: lib/poptQV.c:275 lib/poptQV.c:313
 #, fuzzy
 msgid "don't verify digest(s)"
 msgstr "verifiera inte MD5-summor för filer"
 
-#: lib/poptQV.c:278
+#: lib/poptQV.c:278 lib/poptQV.c:316
 #, fuzzy
 msgid "don't verify signature(s)"
 msgstr "verifiera inte sökvägen i symboliska länkar"
 
-#: lib/poptQV.c:286 lib/poptQV.c:320
+#: lib/poptQV.c:283
 #, fuzzy
 msgid "don't verify GPG V3 DSA signature(s)"
 msgstr "verifiera inte huvudets SHA1-summa"
 
-#: lib/poptQV.c:289 lib/poptQV.c:323
+#: lib/poptQV.c:286
 #, fuzzy
 msgid "don't verify PGP V3 RSA/MD5 signature(s)"
 msgstr "verifiera inte MD5-summor för filer"
 
-#: lib/poptQV.c:304
+#: lib/poptQV.c:301
 #, fuzzy
-msgid "sign a package, preserving other existing signatures"
+msgid "sign a package, preserving digests"
 msgstr "signera ett paket (släng nuvarande signatur)"
 
-#: lib/poptQV.c:306
+#: lib/poptQV.c:303
 #, fuzzy
 msgid "verify package signature(s)"
 msgstr "verifiera paketsignatur"
 
-#: lib/poptQV.c:308
+#: lib/poptQV.c:305
 msgid "import an armored public key"
 msgstr ""
 
-#: lib/poptQV.c:310
+#: lib/poptQV.c:307
 #, fuzzy
-msgid "sign a package, discarding all current signatures"
+msgid "sign a package, recomputing digests"
 msgstr "signera ett paket (släng nuvarande signatur)"
 
-#: lib/poptQV.c:312
+#: lib/poptQV.c:309
 msgid "generate signature"
 msgstr "generera signatur"
 
@@ -2263,129 +2248,129 @@ msgstr "%s misslyckades: %s\n"
 msgid "incorrect format: %s\n"
 msgstr "fel format: %s\n"
 
-#: lib/query.c:221
+#: lib/query.c:220
 msgid "(contains no files)"
 msgstr "(innehåller inga filer)"
 
-#: lib/query.c:282
+#: lib/query.c:281
 msgid "normal        "
 msgstr "normal        "
 
-#: lib/query.c:285
+#: lib/query.c:284
 msgid "replaced      "
 msgstr "ersatt        "
 
-#: lib/query.c:288
+#: lib/query.c:287
 msgid "not installed "
 msgstr "oinstallerat  "
 
-#: lib/query.c:291
+#: lib/query.c:290
 msgid "net shared    "
 msgstr "nätdelad      "
 
-#: lib/query.c:294
+#: lib/query.c:293
 #, c-format
 msgid "(unknown %3d) "
 msgstr "(okänd %3d)   "
 
-#: lib/query.c:299
+#: lib/query.c:298
 msgid "(no state)    "
 msgstr "(ej tillstnd) "
 
-#: lib/query.c:318 lib/query.c:374
+#: lib/query.c:317 lib/query.c:373
 msgid "package has neither file owner or id lists\n"
 msgstr "paketet har varken filägare eller id-listor\n"
 
-#: lib/query.c:463
+#: lib/query.c:462
 #, c-format
 msgid "can't query %s: %s\n"
 msgstr "kan inte fråga %s: %s\n"
 
-#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:333 lib/rpminstall.c:475
+#: lib/query.c:616 lib/query.c:654 lib/rpminstall.c:333 lib/rpminstall.c:475
 #: lib/rpminstall.c:845
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "misslyckades med att öppna %s: %s\n"
 
-#: lib/query.c:633
+#: lib/query.c:632
 #, c-format
 msgid "query of %s failed\n"
 msgstr "fråga av %s misslyckades\n"
 
-#: lib/query.c:639
+#: lib/query.c:638
 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:665 lib/rpminstall.c:488
+#: lib/query.c:664 lib/rpminstall.c:488
 #, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: läsning av paketlista misslyckades: %s\n"
 
-#: lib/query.c:709
+#: lib/query.c:708
 #, 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:730
+#: lib/query.c:729
 msgid "no packages\n"
 msgstr "inga paket\n"
 
-#: lib/query.c:750
+#: lib/query.c:749
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "grupp %s innehåller inga paket\n"
 
-#: lib/query.c:760
+#: lib/query.c:759
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "inga paketutlösare %s\n"
 
-#: lib/query.c:774 lib/query.c:796 lib/query.c:814 lib/query.c:845
+#: lib/query.c:773 lib/query.c:795 lib/query.c:813 lib/query.c:844
 #, fuzzy, c-format
 msgid "malformed %s: %s\n"
 msgstr "Misslyckades med att läsa %s: %s.\n"
 
-#: lib/query.c:784 lib/query.c:802 lib/query.c:820 lib/query.c:850
+#: lib/query.c:783 lib/query.c:801 lib/query.c:819 lib/query.c:849
 #, fuzzy, c-format
 msgid "no package matches %s: %s\n"
 msgstr "inga paketutlösare %s\n"
 
-#: lib/query.c:861
+#: lib/query.c:860
 #, c-format
 msgid "no package requires %s\n"
 msgstr "inget paket behöver %s\n"
 
-#: lib/query.c:872
+#: lib/query.c:871
 #, c-format
 msgid "no package provides %s\n"
 msgstr "inget paket tillhandahåller %s\n"
 
-#: lib/query.c:906
+#: lib/query.c:905
 #, c-format
 msgid "file %s: %s\n"
 msgstr "fil %s: %s\n"
 
-#: lib/query.c:910
+#: lib/query.c:909
 #, c-format
 msgid "file %s is not owned by any package\n"
 msgstr "filen %s tillhör inget paket\n"
 
-#: lib/query.c:937
+#: lib/query.c:936
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "felaktigt paketnummer: %s\n"
 
-#: lib/query.c:940
+#: lib/query.c:939
 #, c-format
 msgid "package record number: %u\n"
 msgstr "paketpost nummer: %u\n"
 
-#: lib/query.c:945
+#: lib/query.c:944
 #, c-format
 msgid "record %u could not be read\n"
 msgstr "post %u kunde inte läsas\n"
 
-#: lib/query.c:956 lib/rpminstall.c:633
+#: lib/query.c:955 lib/rpminstall.c:633
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "paket %s är inte installerat\n"
@@ -2400,71 +2385,71 @@ msgstr "felaktig db-fil %s\n"
 msgid "(added provide)"
 msgstr "%s: %-45s JA (db-tillhandahållande)\n"
 
-#: lib/rpmchecksig.c:51
+#: lib/rpmchecksig.c:54
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s: open misslyckades: %s\n"
 
-#: lib/rpmchecksig.c:63
+#: lib/rpmchecksig.c:66
 msgid "makeTempFile failed\n"
 msgstr "makeTempFile misslyckades\n"
 
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:107
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: Fwrite misslyckades: %s\n"
 
-#: lib/rpmchecksig.c:166
+#: lib/rpmchecksig.c:169
 #, fuzzy, c-format
 msgid "%s: Can't sign v1 packaging\n"
 msgstr "%s: Kan inte signera v1.0 RPM\n"
 
-#: lib/rpmchecksig.c:170
+#: lib/rpmchecksig.c:173
 #, fuzzy, c-format
 msgid "%s: Can't re-sign v2 packaging\n"
 msgstr "%s: Kan inte signera om v2.0 RPM\n"
 
-#: lib/rpmchecksig.c:239
+#: lib/rpmchecksig.c:244
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: writeLead misslyckades: %s\n"
 
-#: lib/rpmchecksig.c:245
+#: lib/rpmchecksig.c:250
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmWriteSignature misslyckades: %s\n"
 
-#: lib/rpmchecksig.c:476
+#: lib/rpmchecksig.c:481
 #, fuzzy, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr "%s: readLead misslyckades\n"
 
-#: lib/rpmchecksig.c:547
+#: lib/rpmchecksig.c:554
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: Ingen signatur tillgänglig (v1.0 RPM)\n"
 
-#: lib/rpmchecksig.c:773
+#: lib/rpmchecksig.c:801
 msgid "NOT OK"
 msgstr "EJ OK"
 
-#: lib/rpmchecksig.c:774 lib/rpmchecksig.c:788
+#: lib/rpmchecksig.c:802 lib/rpmchecksig.c:816
 msgid " (MISSING KEYS:"
 msgstr " (SAKNADE NYCKLAR:"
 
-#: lib/rpmchecksig.c:776 lib/rpmchecksig.c:790
+#: lib/rpmchecksig.c:804 lib/rpmchecksig.c:818
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:777 lib/rpmchecksig.c:791
+#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819
 msgid " (UNTRUSTED KEYS:"
 msgstr " (EJ BETRODDA NYCKLAR:"
 
-#: lib/rpmchecksig.c:779 lib/rpmchecksig.c:793
+#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:787
+#: lib/rpmchecksig.c:815
 msgid "OK"
 msgstr "OK"
 
@@ -2676,142 +2661,142 @@ msgstr "Kan inte läsa %s, HOME är för stor.\n"
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "Kan inte öppna %s för läsning: %s.\n"
 
-#: lib/signature.c:118
+#: lib/signature.c:119
 msgid "file is not regular -- skipping size check\n"
 msgstr "filen är inte en vanlig fil -- hoppar över storlekskontroll\n"
 
-#: lib/signature.c:127
+#: lib/signature.c:128
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 "Förväntad storlek: %12d = inledning(%d)+signaturer(%d)+utfyllnad(%d)+data(%"
 "d)\n"
 
-#: lib/signature.c:132
+#: lib/signature.c:133
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr "  Faktisk storlek: %12d\n"
 
-#: lib/signature.c:152
+#: lib/signature.c:153
 msgid "No signature\n"
 msgstr "Ingen signatur\n"
 
-#: lib/signature.c:156
+#: lib/signature.c:157
 msgid "Old PGP signature\n"
 msgstr "Gammal PGP-signatur\n"
 
-#: lib/signature.c:169
+#: lib/signature.c:170
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr "Gammal (endast intern) signatur!  Hur fick du tag i den!?\n"
 
-#: lib/signature.c:225
+#: lib/signature.c:226
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "Signatur: storlek(%d)+utfyllnad(%d)\n"
 
-#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:677
-#: lib/signature.c:710
+#: lib/signature.c:307 lib/signature.c:406 lib/signature.c:678
+#: lib/signature.c:711
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "Kunde inte köra %s: %s\n"
 
-#: lib/signature.c:322
+#: lib/signature.c:323
 msgid "pgp failed\n"
 msgstr "pgp misslyckades\n"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:329
+#: lib/signature.c:330
 msgid "pgp failed to write signature\n"
 msgstr "pgp misslyckades att skriva en signatur\n"
 
-#: lib/signature.c:334
+#: lib/signature.c:335
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr "PGP signaturstorlek: %d\n"
 
-#: lib/signature.c:350 lib/signature.c:450
+#: lib/signature.c:351 lib/signature.c:451
 msgid "unable to read the signature\n"
 msgstr "kan inte läsa signaturen\n"
 
-#: lib/signature.c:355
+#: lib/signature.c:356
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr "Fick %d byte PGP-signatur\n"
 
-#: lib/signature.c:422
+#: lib/signature.c:423
 msgid "gpg failed\n"
 msgstr "gpg misslyckades\n"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:429
+#: lib/signature.c:430
 msgid "gpg failed to write signature\n"
 msgstr "gpg kunde inte skriva signatur\n"
 
-#: lib/signature.c:434
+#: lib/signature.c:435
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr "GPG-signaturstorlek: %d\n"
 
-#: lib/signature.c:455
+#: lib/signature.c:456
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr "Fick %d byte GPG-signatur\n"
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:715 lib/signature.c:770
+#: lib/signature.c:716 lib/signature.c:771
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "Felaktig %%_signature-spec i makrofil\n"
 
-#: lib/signature.c:749
+#: lib/signature.c:750
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "Du måste sätta \"%%_gpg_name\" i din makrofil\n"
 
-#: lib/signature.c:762
+#: lib/signature.c:763
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "Du måste sätta \"%%_pgp_name\" i din makrofil\n"
 
-#: lib/signature.c:806
+#: lib/signature.c:807
 #, fuzzy
 msgid "Header+Payload size: "
 msgstr "Huvudstorleken för stor"
 
-#: lib/signature.c:846
+#: lib/signature.c:847
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:903
+#: lib/signature.c:906
 msgid "Header SHA1 digest: "
 msgstr ""
 
-#: lib/signature.c:1082
+#: lib/signature.c:1102
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "hoppa över eventuella MD5-signaturer"
 
-#: lib/signature.c:1199
+#: lib/signature.c:1221
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1200
+#: lib/signature.c:1222
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "Ingen signatur\n"
 
-#: lib/signature.c:1287
+#: lib/signature.c:1311
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1314
+#: lib/signature.c:1338
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1318
+#: lib/signature.c:1342
 #, fuzzy, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Signatur: storlek(%d)+utfyllnad(%d)\n"
@@ -3448,6 +3433,10 @@ msgstr "url-port måste vara ett tal\n"
 msgid "failed to create %s: %s\n"
 msgstr "kunde inte skapa %s: %s\n"
 
+#, fuzzy
+#~ msgid "sign a package, discarding all current signatures"
+#~ msgstr "signera ett paket (släng nuvarande signatur)"
+
 #~ msgid "Generating signature using PGP.\n"
 #~ msgstr "Genererar signatur med PGP.\n"
 
diff --git a/po/tr.po b/po/tr.po
index 21df14ca9..1b65f5488 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-03-07 17:53-0500\n"
+"POT-Creation-Date: 2002-03-08 17:22-0500\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"
@@ -1635,63 +1635,48 @@ msgstr "%s %s olarak oluşturuldu\n"
 msgid "error creating temporary file %s\n"
 msgstr "%s geçici dosyası oluşturulurken hata\n"
 
-#: lib/package.c:181 lib/package.c:257
+#: lib/package.c:184 lib/package.c:260
 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:202 lib/package.c:265
+#: lib/package.c:205 lib/package.c:268
 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:243 lib/rpmchecksig.c:161 lib/rpmchecksig.c:541
+#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:548
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: readLead başarısız\n"
 
-#: lib/package.c:249
+#: lib/package.c:252
 #, fuzzy, c-format
 msgid "%s: bad magic\n"
 msgstr "Magic hatalı"
 
-#: lib/package.c:274 lib/rpmchecksig.c:179 lib/rpmchecksig.c:557
+#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:564
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: rpmReadSignature başarısız\n"
 
-#: lib/package.c:278 lib/rpmchecksig.c:183 lib/rpmchecksig.c:562
+#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:569
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: İmza bulundurmuyor\n"
 
-#: lib/package.c:308 lib/rpmchecksig.c:462
+#: lib/package.c:331 lib/rpmchecksig.c:467
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: readLead başarısız\n"
 
-#. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:338
-msgid "========== Header RSA signature\n"
-msgstr ""
-
-#: lib/package.c:343 lib/package.c:371 lib/package.c:403 lib/rpmchecksig.c:631
+#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:642
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
-#. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:366
-msgid "========== Header DSA signature\n"
-msgstr ""
-
-#. Parse the parameters from the OpenPGP packets that will be needed.
-#: lib/package.c:397
-msgid "========== Package DSA/RSA signature\n"
-msgstr ""
-
-#: lib/package.c:415 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
+#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:496
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Fread başarısız: %s\n"
@@ -2039,7 +2024,7 @@ msgstr "listelenmiş dosyaların durumunu gösterir"
 msgid "display a verbose file listing"
 msgstr "ayrıntılı dosya listesi gösterir"
 
-#: lib/poptQV.c:240 lib/poptQV.c:282 lib/poptQV.c:316
+#: lib/poptQV.c:240
 msgid "don't verify MD5 digest of files"
 msgstr "dosyaların MD5 özümlemesi doğrulanmaz"
 
@@ -2080,46 +2065,46 @@ msgstr "paket bağımlılıkları doğrulanmaz"
 msgid "don't execute verify script(s)"
 msgstr "(varsa) %verifyscript çalıştırılmaz"
 
-#: lib/poptQV.c:275
+#: lib/poptQV.c:275 lib/poptQV.c:313
 #, fuzzy
 msgid "don't verify digest(s)"
 msgstr "dosyaların MD5 özümlemesi doğrulanmaz"
 
-#: lib/poptQV.c:278
+#: lib/poptQV.c:278 lib/poptQV.c:316
 #, fuzzy
 msgid "don't verify signature(s)"
 msgstr "dosyaların sembolik bağ dosya yolları doğrulanmaz"
 
-#: lib/poptQV.c:286 lib/poptQV.c:320
+#: lib/poptQV.c:283
 #, fuzzy
 msgid "don't verify GPG V3 DSA signature(s)"
 msgstr "Başlık SHA1 özümlemesi doğrulanmaz"
 
-#: lib/poptQV.c:289 lib/poptQV.c:323
+#: lib/poptQV.c:286
 #, fuzzy
 msgid "don't verify PGP V3 RSA/MD5 signature(s)"
 msgstr "dosyaların MD5 özümlemesi doğrulanmaz"
 
-#: lib/poptQV.c:304
+#: lib/poptQV.c:301
 #, fuzzy
-msgid "sign a package, preserving other existing signatures"
+msgid "sign a package, preserving digests"
 msgstr "paketi imzalar (mevcut imza kaldırılır)"
 
-#: lib/poptQV.c:306
+#: lib/poptQV.c:303
 #, fuzzy
 msgid "verify package signature(s)"
 msgstr "paket imzasını denetler"
 
-#: lib/poptQV.c:308
+#: lib/poptQV.c:305
 msgid "import an armored public key"
 msgstr ""
 
-#: lib/poptQV.c:310
+#: lib/poptQV.c:307
 #, fuzzy
-msgid "sign a package, discarding all current signatures"
+msgid "sign a package, recomputing digests"
 msgstr "paketi imzalar (mevcut imza kaldırılır)"
 
-#: lib/poptQV.c:312
+#: lib/poptQV.c:309
 msgid "generate signature"
 msgstr "imza üretir"
 
@@ -2286,129 +2271,129 @@ msgstr "%s başarısız\n"
 msgid "incorrect format: %s\n"
 msgstr "biçem yanlış: %s\n"
 
-#: lib/query.c:221
+#: lib/query.c:220
 msgid "(contains no files)"
 msgstr "(hiç dosya içermiyor)"
 
-#: lib/query.c:282
+#: lib/query.c:281
 msgid "normal        "
 msgstr "normal        "
 
-#: lib/query.c:285
+#: lib/query.c:284
 msgid "replaced      "
 msgstr "yerine        "
 
-#: lib/query.c:288
+#: lib/query.c:287
 msgid "not installed "
 msgstr "yüklenmedi "
 
-#: lib/query.c:291
+#: lib/query.c:290
 msgid "net shared    "
 msgstr "ağ paylaşımlı "
 
-#: lib/query.c:294
+#: lib/query.c:293
 #, c-format
 msgid "(unknown %3d) "
 msgstr "(bilinmeyen %3d)"
 
-#: lib/query.c:299
+#: lib/query.c:298
 msgid "(no state)    "
 msgstr "(durumsuz)    "
 
-#: lib/query.c:318 lib/query.c:374
+#: lib/query.c:317 lib/query.c:373
 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:463
+#: lib/query.c:462
 #, c-format
 msgid "can't query %s: %s\n"
 msgstr "%s sorgulanamıyor: %s\n"
 
-#: lib/query.c:617 lib/query.c:655 lib/rpminstall.c:333 lib/rpminstall.c:475
+#: lib/query.c:616 lib/query.c:654 lib/rpminstall.c:333 lib/rpminstall.c:475
 #: lib/rpminstall.c:845
 #, c-format
 msgid "open of %s failed: %s\n"
 msgstr "%s açılamadı: %s\n"
 
-#: lib/query.c:633
+#: lib/query.c:632
 #, c-format
 msgid "query of %s failed\n"
 msgstr "%s 'nin sorgulaması başarısızlıkla sonuçlandı\n"
 
-#: lib/query.c:639
+#: lib/query.c:638
 msgid "old format source packages cannot be queried\n"
 msgstr "eski biçem kaynak paketleri sorgulanamaz\n"
 
-#: lib/query.c:665 lib/rpminstall.c:488
+#: lib/query.c:664 lib/rpminstall.c:488
 #, fuzzy, c-format
 msgid "%s: read manifest failed: %s\n"
 msgstr "%s: bildirge okuma başarısız: %s\n"
 
-#: lib/query.c:709
+#: lib/query.c:708
 #, 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:730
+#: lib/query.c:729
 msgid "no packages\n"
 msgstr "paket yok\n"
 
-#: lib/query.c:750
+#: lib/query.c:749
 #, c-format
 msgid "group %s does not contain any packages\n"
 msgstr "%s grubu hiç paket içermiyor\n"
 
-#: lib/query.c:760
+#: lib/query.c:759
 #, c-format
 msgid "no package triggers %s\n"
 msgstr "%s tetikleyen paket yok\n"
 
-#: lib/query.c:774 lib/query.c:796 lib/query.c:814 lib/query.c:845
+#: lib/query.c:773 lib/query.c:795 lib/query.c:813 lib/query.c:844
 #, fuzzy, c-format
 msgid "malformed %s: %s\n"
 msgstr "%s okunamadı: %s.\n"
 
-#: lib/query.c:784 lib/query.c:802 lib/query.c:820 lib/query.c:850
+#: lib/query.c:783 lib/query.c:801 lib/query.c:819 lib/query.c:849
 #, fuzzy, c-format
 msgid "no package matches %s: %s\n"
 msgstr "%s tetikleyen paket yok\n"
 
-#: lib/query.c:861
+#: lib/query.c:860
 #, c-format
 msgid "no package requires %s\n"
 msgstr "%s gerektiren paket yok\n"
 
-#: lib/query.c:872
+#: lib/query.c:871
 #, c-format
 msgid "no package provides %s\n"
 msgstr "%s sağlayan paket yok\n"
 
-#: lib/query.c:906
+#: lib/query.c:905
 #, c-format
 msgid "file %s: %s\n"
 msgstr "dosya %s: %s\n"
 
-#: lib/query.c:910
+#: lib/query.c:909
 #, 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:937
+#: lib/query.c:936
 #, c-format
 msgid "invalid package number: %s\n"
 msgstr "geçersiz paket numarası: %s\n"
 
-#: lib/query.c:940
+#: lib/query.c:939
 #, c-format
 msgid "package record number: %u\n"
 msgstr "paket kayıt numarası: %u\n"
 
-#: lib/query.c:945
+#: lib/query.c:944
 #, c-format
 msgid "record %u could not be read\n"
 msgstr "%u. kayıt okunamadı\n"
 
-#: lib/query.c:956 lib/rpminstall.c:633
+#: lib/query.c:955 lib/rpminstall.c:633
 #, c-format
 msgid "package %s is not installed\n"
 msgstr "%s paketi kurulu değil\n"
@@ -2423,71 +2408,71 @@ msgstr "db dosyası %s hatalı\n"
 msgid "(added provide)"
 msgstr "%s: %-45s EVET (db sağlar)\n"
 
-#: lib/rpmchecksig.c:51
+#: lib/rpmchecksig.c:54
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s: açılamadı: %s\n"
 
-#: lib/rpmchecksig.c:63
+#: lib/rpmchecksig.c:66
 msgid "makeTempFile failed\n"
 msgstr "makeTempFile başarısız\n"
 
-#: lib/rpmchecksig.c:104
+#: lib/rpmchecksig.c:107
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: Fwrite başarısız: %s\n"
 
-#: lib/rpmchecksig.c:166
+#: lib/rpmchecksig.c:169
 #, fuzzy, c-format
 msgid "%s: Can't sign v1 packaging\n"
 msgstr "%s: v1.0 RPM (eski sürüm) imzalanamaz\n"
 
-#: lib/rpmchecksig.c:170
+#: lib/rpmchecksig.c:173
 #, fuzzy, c-format
 msgid "%s: Can't re-sign v2 packaging\n"
 msgstr "%s: v2.0 RPM (eski sürüm) yeniden imzalanamaz\n"
 
-#: lib/rpmchecksig.c:239
+#: lib/rpmchecksig.c:244
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: writeLead başarısız: %s\n"
 
-#: lib/rpmchecksig.c:245
+#: lib/rpmchecksig.c:250
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmWriteSignature başarısız: %s\n"
 
-#: lib/rpmchecksig.c:476
+#: lib/rpmchecksig.c:481
 #, fuzzy, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr "%s: readLead başarısız\n"
 
-#: lib/rpmchecksig.c:547
+#: lib/rpmchecksig.c:554
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: İmza bulundurmuyor (v1.0 RPM)\n"
 
-#: lib/rpmchecksig.c:773
+#: lib/rpmchecksig.c:801
 msgid "NOT OK"
 msgstr "TAMAM DEĞİL"
 
-#: lib/rpmchecksig.c:774 lib/rpmchecksig.c:788
+#: lib/rpmchecksig.c:802 lib/rpmchecksig.c:816
 msgid " (MISSING KEYS:"
 msgstr " (EKSİK ANAHTARLAR:"
 
-#: lib/rpmchecksig.c:776 lib/rpmchecksig.c:790
+#: lib/rpmchecksig.c:804 lib/rpmchecksig.c:818
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:777 lib/rpmchecksig.c:791
+#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819
 msgid " (UNTRUSTED KEYS:"
 msgstr " (GÜVENCESİZ ANAHTARLAR:"
 
-#: lib/rpmchecksig.c:779 lib/rpmchecksig.c:793
+#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:787
+#: lib/rpmchecksig.c:815
 msgid "OK"
 msgstr "Tamam"
 
@@ -2699,140 +2684,140 @@ msgstr "%s okunamıyor, EV çok büyük\n"
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "%s okuma erişimi için açılamadı: %s.\n"
 
-#: lib/signature.c:118
+#: lib/signature.c:119
 msgid "file is not regular -- skipping size check\n"
 msgstr "dosya normal değil -- uzunluk denetimi atlanıyor\n"
 
-#: lib/signature.c:127
+#: lib/signature.c:128
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr "gereken boyut: %12d = (%d)uç+(%d)imza+(%d)iz+(%d)veri\n"
 
-#: lib/signature.c:132
+#: lib/signature.c:133
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr "  Gerçek boyut: %12d\n"
 
-#: lib/signature.c:152
+#: lib/signature.c:153
 msgid "No signature\n"
 msgstr "İmza yok\n"
 
-#: lib/signature.c:156
+#: lib/signature.c:157
 msgid "Old PGP signature\n"
 msgstr "Eski PGP imzası\n"
 
-#: lib/signature.c:169
+#: lib/signature.c:170
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr "Eski imza !!! Bunu nasıl aldın!?\n"
 
-#: lib/signature.c:225
+#: lib/signature.c:226
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "İmza: boyut(%d)+iz(%d)\n"
 
-#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:677
-#: lib/signature.c:710
+#: lib/signature.c:307 lib/signature.c:406 lib/signature.c:678
+#: lib/signature.c:711
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "%s icra edilemedi: %s\n"
 
-#: lib/signature.c:322
+#: lib/signature.c:323
 msgid "pgp failed\n"
 msgstr "pgp hata verdi\n"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:329
+#: lib/signature.c:330
 msgid "pgp failed to write signature\n"
 msgstr "pgp imzasının yazılması başarısız\n"
 
-#: lib/signature.c:334
+#: lib/signature.c:335
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr "PGP imza uzunluğu: %d\n"
 
-#: lib/signature.c:350 lib/signature.c:450
+#: lib/signature.c:351 lib/signature.c:451
 msgid "unable to read the signature\n"
 msgstr "imza okunamadı\n"
 
-#: lib/signature.c:355
+#: lib/signature.c:356
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr "GPG imzasının %d baytı alındı\n"
 
-#: lib/signature.c:422
+#: lib/signature.c:423
 msgid "gpg failed\n"
 msgstr "gpg hata verdi\n"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:429
+#: lib/signature.c:430
 msgid "gpg failed to write signature\n"
 msgstr "imzanın yazılması sırasında gpg hata verdi\n"
 
-#: lib/signature.c:434
+#: lib/signature.c:435
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr "GPG imza uzunluğu: %d\n"
 
-#: lib/signature.c:455
+#: lib/signature.c:456
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr "GPG imzasının %d baytı alındı\n"
 
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:715 lib/signature.c:770
+#: lib/signature.c:716 lib/signature.c:771
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "Makro dosyasında %%_signature spec geçersiz\n"
 
-#: lib/signature.c:749
+#: lib/signature.c:750
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "Makro dosyanızda \"%%_pgp_name\" tanımlanmış olmalı\n"
 
-#: lib/signature.c:762
+#: lib/signature.c:763
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "Makro dosyanızda \"%%_pgp_name\" belirtmelisiniz\n"
 
-#: lib/signature.c:806
+#: lib/signature.c:807
 #, fuzzy
 msgid "Header+Payload size: "
 msgstr "Başlık çok uzun"
 
-#: lib/signature.c:846
+#: lib/signature.c:847
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:903
+#: lib/signature.c:906
 msgid "Header SHA1 digest: "
 msgstr ""
 
-#: lib/signature.c:1082
+#: lib/signature.c:1102
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "tüm MD5 imzalarını atlar"
 
-#: lib/signature.c:1199
+#: lib/signature.c:1221
 msgid "Header "
 msgstr ""
 
-#: lib/signature.c:1200
+#: lib/signature.c:1222
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "İmza yok\n"
 
-#: lib/signature.c:1287
+#: lib/signature.c:1311
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:1314
+#: lib/signature.c:1338
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:1318
+#: lib/signature.c:1342
 #, fuzzy, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "İmza: boyut(%d)+iz(%d)\n"
@@ -3472,6 +3457,10 @@ msgstr "url portu bir sayı olmalı\n"
 msgid "failed to create %s: %s\n"
 msgstr "%s oluşturulamadı: %s\n"
 
+#, fuzzy
+#~ msgid "sign a package, discarding all current signatures"
+#~ msgstr "paketi imzalar (mevcut imza kaldırılır)"
+
 #~ msgid "Generating signature using PGP.\n"
 #~ msgstr "PGP kullanarak imza üretiliyor.\n"
 
diff --git a/rpm.spec b/rpm.spec
index 7ab2c4b54..5d8d17a56 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -656,4 +656,7 @@ fi
 - retrieve pubkey(s) from rpmdb, not from detached signature file.
 - reapply Berkeley DB patch #4491.
 - add header DSA signature.
-- add header RSA signature (untested).
+- add header RSA signature (untested, disabled for now).
+- don't bother with signing check if 16 bits of hash don't match.
+- only V3 signatures for now.
+- wire --nodigest/--nosignature options to checksig/query/verify modes.
diff --git a/rpm.spec.in b/rpm.spec.in
index f7911f6a7..dd57af80a 100644
--- a/rpm.spec.in
+++ b/rpm.spec.in
@@ -659,3 +659,4 @@ fi
 - add header RSA signature (untested, disabled for now).
 - don't bother with signing check if 16 bits of hash don't match.
 - only V3 signatures for now.
+- wire --nodigest/--nosignature options to checksig/query/verify modes.
diff --git a/rpmio/rpmpgp.c b/rpmio/rpmpgp.c
index 817aa53bc..97ec3e492 100644
--- a/rpmio/rpmpgp.c
+++ b/rpmio/rpmpgp.c
@@ -1034,6 +1034,9 @@ void pgpCleanDig(struct pgpDig_s * dig)
 	mp32nfree(&dig->c);
 	mp32nfree(&dig->rsahm);
     }
+    /*@-nullstate@*/
+    return;
+    /*@=nullstate@*/
 }
 
 struct pgpDig_s * pgpFreeDig(/*@only@*/ /*@null@*/ struct pgpDig_s * dig)