34 files changed, 913 insertions, 695 deletions

diff --git a/CHANGES b/CHANGES
index e28ae6409..c845a9682 100644
--- a/CHANGES
+++ b/CHANGES
@@ -165,6 +165,7 @@
 	- fix: repair 2ndary match criteria with rpmdb iterators.
 	- update for sv.po.
 	- display signature details using rpm -qi.
+	- skip signing packages already signed with same key (#62118).
 
 4.0.3 -> 4.0.4:
 	- solaris: translate i86pc to i386 (#57182).
diff --git a/lib/rpmchecksig.c b/lib/rpmchecksig.c
index 4594b0f43..28e732059 100644
--- a/lib/rpmchecksig.c
+++ b/lib/rpmchecksig.c
@@ -132,6 +132,35 @@ exit:
 }
 /*@=boundsread@*/
 
+/**
+ * Retrieve signer fingerprint from an OpenPGP signature tag.
+ * @param sig		signature header
+ * @param sigtag	signature tag
+ * @retval signid	signer fingerprint
+ * @return		0 on success
+ */
+static int getSignid(Header sig, int sigtag, byte * signid)
+	/*@modifies *signid @*/
+{
+    void * pkt = NULL;
+    int_32 pkttyp = 0;
+    int_32 pktlen = 0;
+    int rc = 1;
+
+    if (headerGetEntry(sig, sigtag, &pkttyp, &pkt, &pktlen) && pkt != NULL) {
+	struct pgpDig_s * dig = pgpNewDig();
+
+	if (!pgpPrtPkts(pkt, pktlen, dig, 0)) {
+	    memcpy(signid, dig->signature.signid, sizeof(dig->signature.signid));
+	    rc = 0;
+	}
+     
+	dig = pgpFreeDig(dig);
+    }
+    pkt = headerFreeData(pkt, pkttyp);
+    return rc;
+}
+
 /** \ingroup rpmcli
  * Create/modify elements in signature header.
  * @param ts		transaction set
@@ -256,6 +285,12 @@ static int rpmReSign(/*@unused@*/ rpmts ts,
 
 	/* If gpg/pgp is configured, replace the signature. */
 	if ((sigtag = rpmLookupSignatureType(RPMLOOKUPSIG_QUERY)) > 0) {
+	    byte oldsignid[8], newsignid[8];
+
+	    /* Grab the old signature fingerprint (if any) */
+	    memset(oldsignid, 0, sizeof(oldsignid));
+	    xx = getSignid(sig, sigtag, oldsignid);
+
 	    switch (sigtag) {
 	    case RPMSIGTAG_GPG:
 		xx = headerRemoveEntry(sig, RPMSIGTAG_DSA);
@@ -265,8 +300,31 @@ static int rpmReSign(/*@unused@*/ rpmts ts,
 		xx = headerRemoveEntry(sig, RPMSIGTAG_RSA);
 		/*@switchbreak@*/ break;
 	    }
+
 	    xx = headerRemoveEntry(sig, sigtag);
 	    xx = rpmAddSignature(sig, sigtarget, sigtag, qva->passPhrase);
+
+	    /* If package was previously signed, check for same signer. */
+	    memset(newsignid, 0, sizeof(newsignid));
+	    if (memcmp(oldsignid, newsignid, sizeof(oldsignid))) {
+
+		/* Grab the new signature fingerprint */
+		xx = getSignid(sig, sigtag, newsignid);
+
+		/* If same signer, skip resigning the package. */
+		if (!memcmp(oldsignid, newsignid, sizeof(oldsignid))) {
+
+		    rpmMessage(RPMMESS_WARNING,
+			_("%s: was already signed by key ID %s, skipping\n"),
+			rpm, pgpHexStr(newsignid, sizeof(newsignid)));
+
+		    /* Clean up intermediate target */
+		    xx = unlink(sigtarget);
+		    sigtarget = _free(sigtarget);
+		    continue;
+		}
+	    }
+
 	}
 
 	/* Reallocate the signature into one contiguous region. */
@@ -305,14 +363,14 @@ static int rpmReSign(/*@unused@*/ rpmts ts,
 	/* Both fd and ofd are now closed. */
 	/* ASSERT: fd == NULL && ofd == NULL */
 
-	/* Clean up intermediate target */
-	xx = unlink(sigtarget);
-	sigtarget = _free(sigtarget);
-
 	/* Move final target into place. */
 	xx = unlink(rpm);
 	xx = rename(trpm, rpm);
 	tmprpm[0] = '\0';
+
+	/* Clean up intermediate target */
+	xx = unlink(sigtarget);
+	sigtarget = _free(sigtarget);
     }
     /*@=branchstate@*/
 
diff --git a/po/cs.po b/po/cs.po
index b6328deef..ccfdf82ae 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-12 14:51-0400\n"
+"POT-Creation-Date: 2002-07-12 18:01-0400\n"
 "PO-Revision-Date: 2001-07-24 10:02+0100\n"
 "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -1621,7 +1621,7 @@ msgstr "nemohu zapsat do %%%s %s\n"
 msgid "error creating temporary file %s\n"
 msgstr "chyba pøi vytváøení doèasného souboru %s\n"
 
-#: lib/package.c:216 lib/rpmchecksig.c:180 lib/rpmchecksig.c:608
+#: lib/package.c:216 lib/rpmchecksig.c:209 lib/rpmchecksig.c:666
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: readLead selhalo\n"
@@ -1635,27 +1635,27 @@ 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:248 lib/rpmchecksig.c:198 lib/rpmchecksig.c:624
+#: lib/package.c:248 lib/rpmchecksig.c:227 lib/rpmchecksig.c:682
 #, fuzzy, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: readLead selhalo\n"
 
-#: lib/package.c:252 lib/rpmchecksig.c:202 lib/rpmchecksig.c:629
+#: lib/package.c:252 lib/rpmchecksig.c:231 lib/rpmchecksig.c:687
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/package.c:298 lib/rpmchecksig.c:527
+#: lib/package.c:298 lib/rpmchecksig.c:585
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: readLead selhalo\n"
 
-#: lib/package.c:333 lib/package.c:358 lib/package.c:388 lib/rpmchecksig.c:700
+#: lib/package.c:333 lib/package.c:358 lib/package.c:388 lib/rpmchecksig.c:758
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
-#: lib/package.c:400 lib/rpmchecksig.c:122 lib/rpmchecksig.c:556
+#: lib/package.c:400 lib/rpmchecksig.c:122 lib/rpmchecksig.c:614
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Fread selhalo: %s\n"
@@ -2335,73 +2335,78 @@ msgstr "makeTempFile selhalo\n"
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: Fwrite selhalo: %s\n"
 
-#: lib/rpmchecksig.c:185
+#: lib/rpmchecksig.c:214
 #, c-format
 msgid "%s: Can't sign v1 packaging\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:189
+#: lib/rpmchecksig.c:218
 #, c-format
 msgid "%s: Can't re-sign v2 packaging\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:290
+#: lib/rpmchecksig.c:318
+#, c-format
+msgid "%s: was already signed by key ID %s, skipping\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:348
 #, fuzzy, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: Fwrite selhalo: %s\n"
 
-#: lib/rpmchecksig.c:296
+#: lib/rpmchecksig.c:354
 #, fuzzy, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: Fwrite selhalo: %s\n"
 
-#: lib/rpmchecksig.c:389
+#: lib/rpmchecksig.c:447
 #, fuzzy, c-format
 msgid "%s: import read failed.\n"
 msgstr "%s: readLead selhalo\n"
 
-#: lib/rpmchecksig.c:394
+#: lib/rpmchecksig.c:452
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:399
+#: lib/rpmchecksig.c:457
 #, fuzzy, c-format
 msgid "%s: base64 encode failed.\n"
 msgstr "%s: readLead selhalo\n"
 
-#: lib/rpmchecksig.c:541
+#: lib/rpmchecksig.c:599
 #, fuzzy, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr "%s: readLead selhalo\n"
 
-#: lib/rpmchecksig.c:614
+#: lib/rpmchecksig.c:672
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:862
+#: lib/rpmchecksig.c:920
 #, fuzzy
 msgid "NOT OK"
 msgstr "NE "
 
-#: lib/rpmchecksig.c:863 lib/rpmchecksig.c:877
+#: lib/rpmchecksig.c:921 lib/rpmchecksig.c:935
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:865 lib/rpmchecksig.c:879
+#: lib/rpmchecksig.c:923 lib/rpmchecksig.c:937
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:866 lib/rpmchecksig.c:880
+#: lib/rpmchecksig.c:924 lib/rpmchecksig.c:938
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:868 lib/rpmchecksig.c:882
+#: lib/rpmchecksig.c:926 lib/rpmchecksig.c:940
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:876
+#: lib/rpmchecksig.c:934
 msgid "OK"
 msgstr ""
 
diff --git a/po/da.po b/po/da.po
index 45c5b16d2..70d8ec7f8 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-12 14:51-0400\n"
+"POT-Creation-Date: 2002-07-12 18:01-0400\n"
 "PO-Revision-Date: 2001-04-05 23:03GMT\n"
 "Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -1619,7 +1619,7 @@ msgstr "kunne ikke skrive til %s\n"
 msgid "error creating temporary file %s\n"
 msgstr "fejl ved oprettelse af midlertidig fil %s\n"
 
-#: lib/package.c:216 lib/rpmchecksig.c:180 lib/rpmchecksig.c:608
+#: lib/package.c:216 lib/rpmchecksig.c:209 lib/rpmchecksig.c:666
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: readLead mislykkedes\n"
@@ -1634,27 +1634,27 @@ msgid ""
 msgstr ""
 "kun indpakninger med hovedversion <= 4 understøttes af denne udgave af RPM\n"
 
-#: lib/package.c:248 lib/rpmchecksig.c:198 lib/rpmchecksig.c:624
+#: lib/package.c:248 lib/rpmchecksig.c:227 lib/rpmchecksig.c:682
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: rpmReadSignature mislykkedes\n"
 
-#: lib/package.c:252 lib/rpmchecksig.c:202 lib/rpmchecksig.c:629
+#: lib/package.c:252 lib/rpmchecksig.c:231 lib/rpmchecksig.c:687
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Ingen tilgængelig signatur\n"
 
-#: lib/package.c:298 lib/rpmchecksig.c:527
+#: lib/package.c:298 lib/rpmchecksig.c:585
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: readLead mislykkedes\n"
 
-#: lib/package.c:333 lib/package.c:358 lib/package.c:388 lib/rpmchecksig.c:700
+#: lib/package.c:333 lib/package.c:358 lib/package.c:388 lib/rpmchecksig.c:758
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
-#: lib/package.c:400 lib/rpmchecksig.c:122 lib/rpmchecksig.c:556
+#: lib/package.c:400 lib/rpmchecksig.c:122 lib/rpmchecksig.c:614
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Fread mislykkedes: %s\n"
@@ -2351,72 +2351,77 @@ msgstr "makeTempFile mislykkedes\n"
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: Fwrite mislykkedes: %s\n"
 
-#: lib/rpmchecksig.c:185
+#: lib/rpmchecksig.c:214
 #, fuzzy, c-format
 msgid "%s: Can't sign v1 packaging\n"
 msgstr "%s: Kan ikke underskrive v1.0 RPM\n"
 
-#: lib/rpmchecksig.c:189
+#: lib/rpmchecksig.c:218
 #, fuzzy, c-format
 msgid "%s: Can't re-sign v2 packaging\n"
 msgstr "%s: Kan ikke genunderskrive v2.0 RPM\n"
 
-#: lib/rpmchecksig.c:290
+#: lib/rpmchecksig.c:318
+#, c-format
+msgid "%s: was already signed by key ID %s, skipping\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:348
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: writeLead mislykkedes: %s\n"
 
-#: lib/rpmchecksig.c:296
+#: lib/rpmchecksig.c:354
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmWriteSignature mislykkedes: %s\n"
 
-#: lib/rpmchecksig.c:389
+#: lib/rpmchecksig.c:447
 #, fuzzy, c-format
 msgid "%s: import read failed.\n"
 msgstr "%s: readLead mislykkedes\n"
 
-#: lib/rpmchecksig.c:394
+#: lib/rpmchecksig.c:452
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:399
+#: lib/rpmchecksig.c:457
 #, fuzzy, c-format
 msgid "%s: base64 encode failed.\n"
 msgstr "%s: readLead mislykkedes\n"
 
-#: lib/rpmchecksig.c:541
+#: lib/rpmchecksig.c:599
 #, fuzzy, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr "%s: readLead mislykkedes\n"
 
-#: lib/rpmchecksig.c:614
+#: lib/rpmchecksig.c:672
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: Ingen tilgængelig signatur (v1.0 RPM)\n"
 
-#: lib/rpmchecksig.c:862
+#: lib/rpmchecksig.c:920
 msgid "NOT OK"
 msgstr "IKKE O.K."
 
-#: lib/rpmchecksig.c:863 lib/rpmchecksig.c:877
+#: lib/rpmchecksig.c:921 lib/rpmchecksig.c:935
 msgid " (MISSING KEYS:"
 msgstr " (MANGLENDE NØGLER:    "
 
-#: lib/rpmchecksig.c:865 lib/rpmchecksig.c:879
+#: lib/rpmchecksig.c:923 lib/rpmchecksig.c:937
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:866 lib/rpmchecksig.c:880
+#: lib/rpmchecksig.c:924 lib/rpmchecksig.c:938
 msgid " (UNTRUSTED KEYS:"
 msgstr " (IKKE-BETROEDE NØGLER:"
 
-#: lib/rpmchecksig.c:868 lib/rpmchecksig.c:882
+#: lib/rpmchecksig.c:926 lib/rpmchecksig.c:940
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:876
+#: lib/rpmchecksig.c:934
 msgid "OK"
 msgstr "O.K."
 
diff --git a/po/de.po b/po/de.po
index 08a6e13f9..6ccf3b5ff 100644
--- a/po/de.po
+++ b/po/de.po
@@ -37,7 +37,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-12 14:51-0400\n"
+"POT-Creation-Date: 2002-07-12 18:01-0400\n"
 "PO-Revision-Date: 1998-08-03 18:02+02:00\n"
 "Last-Translator: Karl Eichwalder <ke@SuSE.DE>\n"
 "Language-Team: German <de@li.org>\n"
@@ -1755,7 +1755,7 @@ msgstr "kann Datei %s nicht öffnen: "
 msgid "error creating temporary file %s\n"
 msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
 
-#: lib/package.c:216 lib/rpmchecksig.c:180 lib/rpmchecksig.c:608
+#: lib/package.c:216 lib/rpmchecksig.c:209 lib/rpmchecksig.c:666
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: »readLead« fehlgeschlagen\n"
@@ -1773,27 +1773,27 @@ msgid ""
 msgstr ""
 "Nur Pakete mit Hauptnummern <= 3 werden von dieser RPM-Version unterstützt"
 
-#: lib/package.c:248 lib/rpmchecksig.c:198 lib/rpmchecksig.c:624
+#: lib/package.c:248 lib/rpmchecksig.c:227 lib/rpmchecksig.c:682
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: »rpmReadSignature« fehlgeschlagen\n"
 
-#: lib/package.c:252 lib/rpmchecksig.c:202 lib/rpmchecksig.c:629
+#: lib/package.c:252 lib/rpmchecksig.c:231 lib/rpmchecksig.c:687
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Keine Signatur verfügbar\n"
 
-#: lib/package.c:298 lib/rpmchecksig.c:527
+#: lib/package.c:298 lib/rpmchecksig.c:585
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: »readLead« fehlgeschlagen\n"
 
-#: lib/package.c:333 lib/package.c:358 lib/package.c:388 lib/rpmchecksig.c:700
+#: lib/package.c:333 lib/package.c:358 lib/package.c:388 lib/rpmchecksig.c:758
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
-#: lib/package.c:400 lib/rpmchecksig.c:122 lib/rpmchecksig.c:556
+#: lib/package.c:400 lib/rpmchecksig.c:122 lib/rpmchecksig.c:614
 #, fuzzy, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: »readLead« fehlgeschlagen\n"
@@ -2519,73 +2519,78 @@ msgstr "%s: Öffnen fehlgeschlagen\n"
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: »readLead« fehlgeschlagen\n"
 
-#: lib/rpmchecksig.c:185
+#: lib/rpmchecksig.c:214
 #, fuzzy, c-format
 msgid "%s: Can't sign v1 packaging\n"
 msgstr "%s: Kann v1.0-RPM nicht signieren\n"
 
-#: lib/rpmchecksig.c:189
+#: lib/rpmchecksig.c:218
 #, 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:290
+#: lib/rpmchecksig.c:318
+#, c-format
+msgid "%s: was already signed by key ID %s, skipping\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:348
 #, fuzzy, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: »readLead« fehlgeschlagen\n"
 
-#: lib/rpmchecksig.c:296
+#: lib/rpmchecksig.c:354
 #, fuzzy, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: »rpmReadSignature« fehlgeschlagen\n"
 
-#: lib/rpmchecksig.c:389
+#: lib/rpmchecksig.c:447
 #, fuzzy, c-format
 msgid "%s: import read failed.\n"
 msgstr "%s: »readLead« fehlgeschlagen\n"
 
-#: lib/rpmchecksig.c:394
+#: lib/rpmchecksig.c:452
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:399
+#: lib/rpmchecksig.c:457
 #, fuzzy, c-format
 msgid "%s: base64 encode failed.\n"
 msgstr "%s: »readLead« fehlgeschlagen\n"
 
-#: lib/rpmchecksig.c:541
+#: lib/rpmchecksig.c:599
 #, fuzzy, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr "%s: »readLead« fehlgeschlagen\n"
 
-#: lib/rpmchecksig.c:614
+#: lib/rpmchecksig.c:672
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: Keine Signatur verfügbar (v1.0 RPM)\n"
 
-#: lib/rpmchecksig.c:862
+#: lib/rpmchecksig.c:920
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:863 lib/rpmchecksig.c:877
+#: lib/rpmchecksig.c:921 lib/rpmchecksig.c:935
 #, fuzzy
 msgid " (MISSING KEYS:"
 msgstr " (FEHLENDE SCHLüSSEL)"
 
-#: lib/rpmchecksig.c:865 lib/rpmchecksig.c:879
+#: lib/rpmchecksig.c:923 lib/rpmchecksig.c:937
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:866 lib/rpmchecksig.c:880
+#: lib/rpmchecksig.c:924 lib/rpmchecksig.c:938
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:868 lib/rpmchecksig.c:882
+#: lib/rpmchecksig.c:926 lib/rpmchecksig.c:940
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:876
+#: lib/rpmchecksig.c:934
 msgid "OK"
 msgstr ""
 
diff --git a/po/en_RN.po b/po/en_RN.po
index c80d4ee57..a9f56752a 100644
--- a/po/en_RN.po
+++ b/po/en_RN.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-12 14:51-0400\n"
+"POT-Creation-Date: 2002-07-12 18:01-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1584,7 +1584,7 @@ msgstr ""
 msgid "error creating temporary file %s\n"
 msgstr ""
 
-#: lib/package.c:216 lib/rpmchecksig.c:180 lib/rpmchecksig.c:608
+#: lib/package.c:216 lib/rpmchecksig.c:209 lib/rpmchecksig.c:666
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
@@ -1598,27 +1598,27 @@ msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:248 lib/rpmchecksig.c:198 lib/rpmchecksig.c:624
+#: lib/package.c:248 lib/rpmchecksig.c:227 lib/rpmchecksig.c:682
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/package.c:252 lib/rpmchecksig.c:202 lib/rpmchecksig.c:629
+#: lib/package.c:252 lib/rpmchecksig.c:231 lib/rpmchecksig.c:687
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/package.c:298 lib/rpmchecksig.c:527
+#: lib/package.c:298 lib/rpmchecksig.c:585
 #, c-format
 msgid "%s: headerRead failed\n"
 msgstr ""
 
-#: lib/package.c:333 lib/package.c:358 lib/package.c:388 lib/rpmchecksig.c:700
+#: lib/package.c:333 lib/package.c:358 lib/package.c:388 lib/rpmchecksig.c:758
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
-#: lib/package.c:400 lib/rpmchecksig.c:122 lib/rpmchecksig.c:556
+#: lib/package.c:400 lib/rpmchecksig.c:122 lib/rpmchecksig.c:614
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr ""
@@ -2272,72 +2272,77 @@ msgstr ""
 msgid "%s: Fwrite failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:185
+#: lib/rpmchecksig.c:214
 #, c-format
 msgid "%s: Can't sign v1 packaging\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:189
+#: lib/rpmchecksig.c:218
 #, c-format
 msgid "%s: Can't re-sign v2 packaging\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:290
+#: lib/rpmchecksig.c:318
+#, c-format
+msgid "%s: was already signed by key ID %s, skipping\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:348
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:296
+#: lib/rpmchecksig.c:354
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:389
+#: lib/rpmchecksig.c:447
 #, c-format
 msgid "%s: import read failed.\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:394
+#: lib/rpmchecksig.c:452
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:399
+#: lib/rpmchecksig.c:457
 #, c-format
 msgid "%s: base64 encode failed.\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:541
+#: lib/rpmchecksig.c:599
 #, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:614
+#: lib/rpmchecksig.c:672
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:862
+#: lib/rpmchecksig.c:920
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:863 lib/rpmchecksig.c:877
+#: lib/rpmchecksig.c:921 lib/rpmchecksig.c:935
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:865 lib/rpmchecksig.c:879
+#: lib/rpmchecksig.c:923 lib/rpmchecksig.c:937
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:866 lib/rpmchecksig.c:880
+#: lib/rpmchecksig.c:924 lib/rpmchecksig.c:938
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:868 lib/rpmchecksig.c:882
+#: lib/rpmchecksig.c:926 lib/rpmchecksig.c:940
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:876
+#: lib/rpmchecksig.c:934
 msgid "OK"
 msgstr ""
 
diff --git a/po/es.po b/po/es.po
index c80d4ee57..a9f56752a 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-12 14:51-0400\n"
+"POT-Creation-Date: 2002-07-12 18:01-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1584,7 +1584,7 @@ msgstr ""
 msgid "error creating temporary file %s\n"
 msgstr ""
 
-#: lib/package.c:216 lib/rpmchecksig.c:180 lib/rpmchecksig.c:608
+#: lib/package.c:216 lib/rpmchecksig.c:209 lib/rpmchecksig.c:666
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
@@ -1598,27 +1598,27 @@ msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:248 lib/rpmchecksig.c:198 lib/rpmchecksig.c:624
+#: lib/package.c:248 lib/rpmchecksig.c:227 lib/rpmchecksig.c:682
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/package.c:252 lib/rpmchecksig.c:202 lib/rpmchecksig.c:629
+#: lib/package.c:252 lib/rpmchecksig.c:231 lib/rpmchecksig.c:687
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/package.c:298 lib/rpmchecksig.c:527
+#: lib/package.c:298 lib/rpmchecksig.c:585
 #, c-format
 msgid "%s: headerRead failed\n"
 msgstr ""
 
-#: lib/package.c:333 lib/package.c:358 lib/package.c:388 lib/rpmchecksig.c:700
+#: lib/package.c:333 lib/package.c:358 lib/package.c:388 lib/rpmchecksig.c:758
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
-#: lib/package.c:400 lib/rpmchecksig.c:122 lib/rpmchecksig.c:556
+#: lib/package.c:400 lib/rpmchecksig.c:122 lib/rpmchecksig.c:614
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr ""
@@ -2272,72 +2272,77 @@ msgstr ""
 msgid "%s: Fwrite failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:185
+#: lib/rpmchecksig.c:214
 #, c-format
 msgid "%s: Can't sign v1 packaging\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:189
+#: lib/rpmchecksig.c:218
 #, c-format
 msgid "%s: Can't re-sign v2 packaging\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:290
+#: lib/rpmchecksig.c:318
+#, c-format
+msgid "%s: was already signed by key ID %s, skipping\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:348
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:296
+#: lib/rpmchecksig.c:354
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:389
+#: lib/rpmchecksig.c:447
 #, c-format
 msgid "%s: import read failed.\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:394
+#: lib/rpmchecksig.c:452
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:399
+#: lib/rpmchecksig.c:457
 #, c-format
 msgid "%s: base64 encode failed.\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:541
+#: lib/rpmchecksig.c:599
 #, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:614
+#: lib/rpmchecksig.c:672
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:862
+#: lib/rpmchecksig.c:920
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:863 lib/rpmchecksig.c:877
+#: lib/rpmchecksig.c:921 lib/rpmchecksig.c:935
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:865 lib/rpmchecksig.c:879
+#: lib/rpmchecksig.c:923 lib/rpmchecksig.c:937
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:866 lib/rpmchecksig.c:880
+#: lib/rpmchecksig.c:924 lib/rpmchecksig.c:938
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:868 lib/rpmchecksig.c:882
+#: lib/rpmchecksig.c:926 lib/rpmchecksig.c:940
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:876
+#: lib/rpmchecksig.c:934
 msgid "OK"
 msgstr ""
 
diff --git a/po/eu_ES.po b/po/eu_ES.po
index c80d4ee57..a9f56752a 100644
--- a/po/eu_ES.po
+++ b/po/eu_ES.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-12 14:51-0400\n"
+"POT-Creation-Date: 2002-07-12 18:01-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1584,7 +1584,7 @@ msgstr ""
 msgid "error creating temporary file %s\n"
 msgstr ""
 
-#: lib/package.c:216 lib/rpmchecksig.c:180 lib/rpmchecksig.c:608
+#: lib/package.c:216 lib/rpmchecksig.c:209 lib/rpmchecksig.c:666
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
@@ -1598,27 +1598,27 @@ msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:248 lib/rpmchecksig.c:198 lib/rpmchecksig.c:624
+#: lib/package.c:248 lib/rpmchecksig.c:227 lib/rpmchecksig.c:682
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/package.c:252 lib/rpmchecksig.c:202 lib/rpmchecksig.c:629
+#: lib/package.c:252 lib/rpmchecksig.c:231 lib/rpmchecksig.c:687
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/package.c:298 lib/rpmchecksig.c:527
+#: lib/package.c:298 lib/rpmchecksig.c:585
 #, c-format
 msgid "%s: headerRead failed\n"
 msgstr ""
 
-#: lib/package.c:333 lib/package.c:358 lib/package.c:388 lib/rpmchecksig.c:700
+#: lib/package.c:333 lib/package.c:358 lib/package.c:388 lib/rpmchecksig.c:758
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
-#: lib/package.c:400 lib/rpmchecksig.c:122 lib/rpmchecksig.c:556
+#: lib/package.c:400 lib/rpmchecksig.c:122 lib/rpmchecksig.c:614
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr ""
@@ -2272,72 +2272,77 @@ msgstr ""
 msgid "%s: Fwrite failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:185
+#: lib/rpmchecksig.c:214
 #, c-format
 msgid "%s: Can't sign v1 packaging\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:189
+#: lib/rpmchecksig.c:218
 #, c-format
 msgid "%s: Can't re-sign v2 packaging\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:290
+#: lib/rpmchecksig.c:318
+#, c-format
+msgid "%s: was already signed by key ID %s, skipping\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:348
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:296
+#: lib/rpmchecksig.c:354
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:389
+#: lib/rpmchecksig.c:447
 #, c-format
 msgid "%s: import read failed.\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:394
+#: lib/rpmchecksig.c:452
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:399
+#: lib/rpmchecksig.c:457
 #, c-format
 msgid "%s: base64 encode failed.\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:541
+#: lib/rpmchecksig.c:599
 #, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:614
+#: lib/rpmchecksig.c:672
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:862
+#: lib/rpmchecksig.c:920
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:863 lib/rpmchecksig.c:877
+#: lib/rpmchecksig.c:921 lib/rpmchecksig.c:935
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:865 lib/rpmchecksig.c:879
+#: lib/rpmchecksig.c:923 lib/rpmchecksig.c:937
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:866 lib/rpmchecksig.c:880
+#: lib/rpmchecksig.c:924 lib/rpmchecksig.c:938
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:868 lib/rpmchecksig.c:882
+#: lib/rpmchecksig.c:926 lib/rpmchecksig.c:940
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:876
+#: lib/rpmchecksig.c:934
 msgid "OK"
 msgstr ""
 
diff --git a/po/fi.po b/po/fi.po
index 145bc030b..a61b0e9e0 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-12 14:51-0400\n"
+"POT-Creation-Date: 2002-07-12 18:01-0400\n"
 "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
 "Language-Team: Finnish <linux@sot.com>\n"
 "Content-Type: text/plain; charset=\n"
@@ -1641,7 +1641,7 @@ msgstr "en voinut avata tiedostoa %s: "
 msgid "error creating temporary file %s\n"
 msgstr "virhe luotaessa hakemistoa %s: %s"
 
-#: lib/package.c:216 lib/rpmchecksig.c:180 lib/rpmchecksig.c:608
+#: lib/package.c:216 lib/rpmchecksig.c:209 lib/rpmchecksig.c:666
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: readLead  epäonnistui\n"
@@ -1659,27 +1659,27 @@ msgid ""
 msgstr ""
 "tämä versio RPM:stä tukee vain suuremmman kuin 3 versionumeron paketteja"
 
-#: lib/package.c:248 lib/rpmchecksig.c:198 lib/rpmchecksig.c:624
+#: lib/package.c:248 lib/rpmchecksig.c:227 lib/rpmchecksig.c:682
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: rpmReadSignature epäonnistui\n"
 
-#: lib/package.c:252 lib/rpmchecksig.c:202 lib/rpmchecksig.c:629
+#: lib/package.c:252 lib/rpmchecksig.c:231 lib/rpmchecksig.c:687
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Ei allekirjoitusta saatavilla\n"
 
-#: lib/package.c:298 lib/rpmchecksig.c:527
+#: lib/package.c:298 lib/rpmchecksig.c:585
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: readLead  epäonnistui\n"
 
-#: lib/package.c:333 lib/package.c:358 lib/package.c:388 lib/rpmchecksig.c:700
+#: lib/package.c:333 lib/package.c:358 lib/package.c:388 lib/rpmchecksig.c:758
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
-#: lib/package.c:400 lib/rpmchecksig.c:122 lib/rpmchecksig.c:556
+#: lib/package.c:400 lib/rpmchecksig.c:122 lib/rpmchecksig.c:614
 #, fuzzy, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: readLead  epäonnistui\n"
@@ -2396,73 +2396,78 @@ msgstr "%s: avaus ei onnistunut\n"
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: readLead  epäonnistui\n"
 
-#: lib/rpmchecksig.c:185
+#: lib/rpmchecksig.c:214
 #, fuzzy, c-format
 msgid "%s: Can't sign v1 packaging\n"
 msgstr "%s: En voi allekirjoittaa v1.0 RPM:ää\n"
 
-#: lib/rpmchecksig.c:189
+#: lib/rpmchecksig.c:218
 #, 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:290
+#: lib/rpmchecksig.c:318
+#, c-format
+msgid "%s: was already signed by key ID %s, skipping\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:348
 #, fuzzy, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: readLead  epäonnistui\n"
 
-#: lib/rpmchecksig.c:296
+#: lib/rpmchecksig.c:354
 #, fuzzy, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmReadSignature epäonnistui\n"
 
-#: lib/rpmchecksig.c:389
+#: lib/rpmchecksig.c:447
 #, fuzzy, c-format
 msgid "%s: import read failed.\n"
 msgstr "%s: readLead  epäonnistui\n"
 
-#: lib/rpmchecksig.c:394
+#: lib/rpmchecksig.c:452
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:399
+#: lib/rpmchecksig.c:457
 #, fuzzy, c-format
 msgid "%s: base64 encode failed.\n"
 msgstr "%s: readLead  epäonnistui\n"
 
-#: lib/rpmchecksig.c:541
+#: lib/rpmchecksig.c:599
 #, fuzzy, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr "%s: readLead  epäonnistui\n"
 
-#: lib/rpmchecksig.c:614
+#: lib/rpmchecksig.c:672
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: Ei allekirjoitusta saatavilla (v1.0 RPM)\n"
 
-#: lib/rpmchecksig.c:862
+#: lib/rpmchecksig.c:920
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:863 lib/rpmchecksig.c:877
+#: lib/rpmchecksig.c:921 lib/rpmchecksig.c:935
 #, fuzzy
 msgid " (MISSING KEYS:"
 msgstr "(PUUTTUVAT AVAIMET)"
 
-#: lib/rpmchecksig.c:865 lib/rpmchecksig.c:879
+#: lib/rpmchecksig.c:923 lib/rpmchecksig.c:937
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:866 lib/rpmchecksig.c:880
+#: lib/rpmchecksig.c:924 lib/rpmchecksig.c:938
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:868 lib/rpmchecksig.c:882
+#: lib/rpmchecksig.c:926 lib/rpmchecksig.c:940
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:876
+#: lib/rpmchecksig.c:934
 msgid "OK"
 msgstr ""
 
diff --git a/po/fr.po b/po/fr.po
index a52b86e95..4b5a4d4d7 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-12 14:51-0400\n"
+"POT-Creation-Date: 2002-07-12 18:01-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1669,7 +1669,7 @@ msgstr "impossible d'ouvrir: %s\n"
 msgid "error creating temporary file %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/package.c:216 lib/rpmchecksig.c:180 lib/rpmchecksig.c:608
+#: lib/package.c:216 lib/rpmchecksig.c:209 lib/rpmchecksig.c:666
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
@@ -1683,27 +1683,27 @@ msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:248 lib/rpmchecksig.c:198 lib/rpmchecksig.c:624
+#: lib/package.c:248 lib/rpmchecksig.c:227 lib/rpmchecksig.c:682
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/package.c:252 lib/rpmchecksig.c:202 lib/rpmchecksig.c:629
+#: lib/package.c:252 lib/rpmchecksig.c:231 lib/rpmchecksig.c:687
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/package.c:298 lib/rpmchecksig.c:527
+#: lib/package.c:298 lib/rpmchecksig.c:585
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/package.c:333 lib/package.c:358 lib/package.c:388 lib/rpmchecksig.c:700
+#: lib/package.c:333 lib/package.c:358 lib/package.c:388 lib/rpmchecksig.c:758
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
-#: lib/package.c:400 lib/rpmchecksig.c:122 lib/rpmchecksig.c:556
+#: lib/package.c:400 lib/rpmchecksig.c:122 lib/rpmchecksig.c:614
 #, fuzzy, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
@@ -2441,72 +2441,77 @@ msgstr "La construction a chou.\n"
 msgid "%s: Fwrite failed: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmchecksig.c:185
+#: lib/rpmchecksig.c:214
 #, c-format
 msgid "%s: Can't sign v1 packaging\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:189
+#: lib/rpmchecksig.c:218
 #, c-format
 msgid "%s: Can't re-sign v2 packaging\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:290
+#: lib/rpmchecksig.c:318
+#, c-format
+msgid "%s: was already signed by key ID %s, skipping\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:348
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:296
+#: lib/rpmchecksig.c:354
 #, fuzzy, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmchecksig.c:389
+#: lib/rpmchecksig.c:447
 #, fuzzy, c-format
 msgid "%s: import read failed.\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmchecksig.c:394
+#: lib/rpmchecksig.c:452
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:399
+#: lib/rpmchecksig.c:457
 #, fuzzy, c-format
 msgid "%s: base64 encode failed.\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmchecksig.c:541
+#: lib/rpmchecksig.c:599
 #, fuzzy, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmchecksig.c:614
+#: lib/rpmchecksig.c:672
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:862
+#: lib/rpmchecksig.c:920
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:863 lib/rpmchecksig.c:877
+#: lib/rpmchecksig.c:921 lib/rpmchecksig.c:935
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:865 lib/rpmchecksig.c:879
+#: lib/rpmchecksig.c:923 lib/rpmchecksig.c:937
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:866 lib/rpmchecksig.c:880
+#: lib/rpmchecksig.c:924 lib/rpmchecksig.c:938
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:868 lib/rpmchecksig.c:882
+#: lib/rpmchecksig.c:926 lib/rpmchecksig.c:940
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:876
+#: lib/rpmchecksig.c:934
 msgid "OK"
 msgstr ""
 
diff --git a/po/gl.po b/po/gl.po
index 2ba25b08c..8a6ba45f6 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2002-07-12 14:51-0400\n"
+"POT-Creation-Date: 2002-07-12 18:01-0400\n"
 "PO-Revision-Date: 2001-01-13 22:31+0100\n"
 "Last-Translator: Jesús Bravo Álvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -1579,7 +1579,7 @@ msgstr ""
 msgid "error creating temporary file %s\n"
 msgstr ""
 
-#: lib/package.c:216 lib/rpmchecksig.c:180 lib/rpmchecksig.c:608
+#: lib/package.c:216 lib/rpmchecksig.c:209 lib/rpmchecksig.c:666
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
@@ -1593,27 +1593,27 @@ msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:248 lib/rpmchecksig.c:198 lib/rpmchecksig.c:624
+#: lib/package.c:248 lib/rpmchecksig.c:227 lib/rpmchecksig.c:682
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/package.c:252 lib/rpmchecksig.c:202 lib/rpmchecksig.c:629
+#: lib/package.c:252 lib/rpmchecksig.c:231 lib/rpmchecksig.c:687
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/package.c:298 lib/rpmchecksig.c:527
+#: lib/package.c:298 lib/rpmchecksig.c:585
 #, c-format
 msgid "%s: headerRead failed\n"
 msgstr ""
 
-#: lib/package.c:333 lib/package.c:358 lib/package.c:388 lib/rpmchecksig.c:700
+#: lib/package.c:333 lib/package.c:358 lib/package.c:388 lib/rpmchecksig.c:758
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
-#: lib/package.c:400 lib/rpmchecksig.c:122 lib/rpmchecksig.c:556
+#: lib/package.c:400 lib/rpmchecksig.c:122 lib/rpmchecksig.c:614
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr ""
@@ -2267,72 +2267,77 @@ msgstr ""
 msgid "%s: Fwrite failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:185
+#: lib/rpmchecksig.c:214
 #, c-format
 msgid "%s: Can't sign v1 packaging\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:189
+#: lib/rpmchecksig.c:218
 #, c-format
 msgid "%s: Can't re-sign v2 packaging\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:290
+#: lib/rpmchecksig.c:318
+#, c-format
+msgid "%s: was already signed by key ID %s, skipping\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:348
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:296
+#: lib/rpmchecksig.c:354
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:389
+#: lib/rpmchecksig.c:447
 #, c-format
 msgid "%s: import read failed.\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:394
+#: lib/rpmchecksig.c:452
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:399
+#: lib/rpmchecksig.c:457
 #, c-format
 msgid "%s: base64 encode failed.\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:541
+#: lib/rpmchecksig.c:599
 #, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:614
+#: lib/rpmchecksig.c:672
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:862
+#: lib/rpmchecksig.c:920
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:863 lib/rpmchecksig.c:877
+#: lib/rpmchecksig.c:921 lib/rpmchecksig.c:935
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:865 lib/rpmchecksig.c:879
+#: lib/rpmchecksig.c:923 lib/rpmchecksig.c:937
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:866 lib/rpmchecksig.c:880
+#: lib/rpmchecksig.c:924 lib/rpmchecksig.c:938
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:868 lib/rpmchecksig.c:882
+#: lib/rpmchecksig.c:926 lib/rpmchecksig.c:940
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:876
+#: lib/rpmchecksig.c:934
 msgid "OK"
 msgstr ""
 
diff --git a/po/hu.po b/po/hu.po
index c80d4ee57..a9f56752a 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-12 14:51-0400\n"
+"POT-Creation-Date: 2002-07-12 18:01-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1584,7 +1584,7 @@ msgstr ""
 msgid "error creating temporary file %s\n"
 msgstr ""
 
-#: lib/package.c:216 lib/rpmchecksig.c:180 lib/rpmchecksig.c:608
+#: lib/package.c:216 lib/rpmchecksig.c:209 lib/rpmchecksig.c:666
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
@@ -1598,27 +1598,27 @@ msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:248 lib/rpmchecksig.c:198 lib/rpmchecksig.c:624
+#: lib/package.c:248 lib/rpmchecksig.c:227 lib/rpmchecksig.c:682
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/package.c:252 lib/rpmchecksig.c:202 lib/rpmchecksig.c:629
+#: lib/package.c:252 lib/rpmchecksig.c:231 lib/rpmchecksig.c:687
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/package.c:298 lib/rpmchecksig.c:527
+#: lib/package.c:298 lib/rpmchecksig.c:585
 #, c-format
 msgid "%s: headerRead failed\n"
 msgstr ""
 
-#: lib/package.c:333 lib/package.c:358 lib/package.c:388 lib/rpmchecksig.c:700
+#: lib/package.c:333 lib/package.c:358 lib/package.c:388 lib/rpmchecksig.c:758
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
-#: lib/package.c:400 lib/rpmchecksig.c:122 lib/rpmchecksig.c:556
+#: lib/package.c:400 lib/rpmchecksig.c:122 lib/rpmchecksig.c:614
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr ""
@@ -2272,72 +2272,77 @@ msgstr ""
 msgid "%s: Fwrite failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:185
+#: lib/rpmchecksig.c:214
 #, c-format
 msgid "%s: Can't sign v1 packaging\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:189
+#: lib/rpmchecksig.c:218
 #, c-format
 msgid "%s: Can't re-sign v2 packaging\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:290
+#: lib/rpmchecksig.c:318
+#, c-format
+msgid "%s: was already signed by key ID %s, skipping\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:348
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:296
+#: lib/rpmchecksig.c:354
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:389
+#: lib/rpmchecksig.c:447
 #, c-format
 msgid "%s: import read failed.\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:394
+#: lib/rpmchecksig.c:452
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:399
+#: lib/rpmchecksig.c:457
 #, c-format
 msgid "%s: base64 encode failed.\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:541
+#: lib/rpmchecksig.c:599
 #, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:614
+#: lib/rpmchecksig.c:672
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:862
+#: lib/rpmchecksig.c:920
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:863 lib/rpmchecksig.c:877
+#: lib/rpmchecksig.c:921 lib/rpmchecksig.c:935
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:865 lib/rpmchecksig.c:879
+#: lib/rpmchecksig.c:923 lib/rpmchecksig.c:937
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:866 lib/rpmchecksig.c:880
+#: lib/rpmchecksig.c:924 lib/rpmchecksig.c:938
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:868 lib/rpmchecksig.c:882
+#: lib/rpmchecksig.c:926 lib/rpmchecksig.c:940
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:876
+#: lib/rpmchecksig.c:934
 msgid "OK"
 msgstr ""
 
diff --git a/po/id.po b/po/id.po
index c80d4ee57..a9f56752a 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-12 14:51-0400\n"
+"POT-Creation-Date: 2002-07-12 18:01-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1584,7 +1584,7 @@ msgstr ""
 msgid "error creating temporary file %s\n"
 msgstr ""
 
-#: lib/package.c:216 lib/rpmchecksig.c:180 lib/rpmchecksig.c:608
+#: lib/package.c:216 lib/rpmchecksig.c:209 lib/rpmchecksig.c:666
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
@@ -1598,27 +1598,27 @@ msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:248 lib/rpmchecksig.c:198 lib/rpmchecksig.c:624
+#: lib/package.c:248 lib/rpmchecksig.c:227 lib/rpmchecksig.c:682
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/package.c:252 lib/rpmchecksig.c:202 lib/rpmchecksig.c:629
+#: lib/package.c:252 lib/rpmchecksig.c:231 lib/rpmchecksig.c:687
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/package.c:298 lib/rpmchecksig.c:527
+#: lib/package.c:298 lib/rpmchecksig.c:585
 #, c-format
 msgid "%s: headerRead failed\n"
 msgstr ""
 
-#: lib/package.c:333 lib/package.c:358 lib/package.c:388 lib/rpmchecksig.c:700
+#: lib/package.c:333 lib/package.c:358 lib/package.c:388 lib/rpmchecksig.c:758
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
-#: lib/package.c:400 lib/rpmchecksig.c:122 lib/rpmchecksig.c:556
+#: lib/package.c:400 lib/rpmchecksig.c:122 lib/rpmchecksig.c:614
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr ""
@@ -2272,72 +2272,77 @@ msgstr ""
 msgid "%s: Fwrite failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:185
+#: lib/rpmchecksig.c:214
 #, c-format
 msgid "%s: Can't sign v1 packaging\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:189
+#: lib/rpmchecksig.c:218
 #, c-format
 msgid "%s: Can't re-sign v2 packaging\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:290
+#: lib/rpmchecksig.c:318
+#, c-format
+msgid "%s: was already signed by key ID %s, skipping\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:348
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:296
+#: lib/rpmchecksig.c:354
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:389
+#: lib/rpmchecksig.c:447
 #, c-format
 msgid "%s: import read failed.\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:394
+#: lib/rpmchecksig.c:452
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:399
+#: lib/rpmchecksig.c:457
 #, c-format
 msgid "%s: base64 encode failed.\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:541
+#: lib/rpmchecksig.c:599
 #, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:614
+#: lib/rpmchecksig.c:672
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:862
+#: lib/rpmchecksig.c:920
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:863 lib/rpmchecksig.c:877
+#: lib/rpmchecksig.c:921 lib/rpmchecksig.c:935
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:865 lib/rpmchecksig.c:879
+#: lib/rpmchecksig.c:923 lib/rpmchecksig.c:937
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:866 lib/rpmchecksig.c:880
+#: lib/rpmchecksig.c:924 lib/rpmchecksig.c:938
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:868 lib/rpmchecksig.c:882
+#: lib/rpmchecksig.c:926 lib/rpmchecksig.c:940
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:876
+#: lib/rpmchecksig.c:934
 msgid "OK"
 msgstr ""
 
diff --git a/po/is.po b/po/is.po
index 0f306b6c1..e85dbce68 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-12 14:51-0400\n"
+"POT-Creation-Date: 2002-07-12 18:01-0400\n"
 "PO-Revision-Date: 2001-07-12 13:25+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
@@ -1589,7 +1589,7 @@ msgstr "get ekki ritağ í %%%s %s\n"
 msgid "error creating temporary file %s\n"
 msgstr ""
 
-#: lib/package.c:216 lib/rpmchecksig.c:180 lib/rpmchecksig.c:608
+#: lib/package.c:216 lib/rpmchecksig.c:209 lib/rpmchecksig.c:666
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
@@ -1603,27 +1603,27 @@ msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:248 lib/rpmchecksig.c:198 lib/rpmchecksig.c:624
+#: lib/package.c:248 lib/rpmchecksig.c:227 lib/rpmchecksig.c:682
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/package.c:252 lib/rpmchecksig.c:202 lib/rpmchecksig.c:629
+#: lib/package.c:252 lib/rpmchecksig.c:231 lib/rpmchecksig.c:687
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/package.c:298 lib/rpmchecksig.c:527
+#: lib/package.c:298 lib/rpmchecksig.c:585
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: Fseek brást: %s\n"
 
-#: lib/package.c:333 lib/package.c:358 lib/package.c:388 lib/rpmchecksig.c:700
+#: lib/package.c:333 lib/package.c:358 lib/package.c:388 lib/rpmchecksig.c:758
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
-#: lib/package.c:400 lib/rpmchecksig.c:122 lib/rpmchecksig.c:556
+#: lib/package.c:400 lib/rpmchecksig.c:122 lib/rpmchecksig.c:614
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr ""
@@ -2288,72 +2288,77 @@ msgstr ""
 msgid "%s: Fwrite failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:185
+#: lib/rpmchecksig.c:214
 #, c-format
 msgid "%s: Can't sign v1 packaging\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:189
+#: lib/rpmchecksig.c:218
 #, c-format
 msgid "%s: Can't re-sign v2 packaging\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:290
+#: lib/rpmchecksig.c:318
+#, c-format
+msgid "%s: was already signed by key ID %s, skipping\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:348
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:296
+#: lib/rpmchecksig.c:354
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:389
+#: lib/rpmchecksig.c:447
 #, fuzzy, c-format
 msgid "%s: import read failed.\n"
 msgstr "%s: Fseek brást: %s\n"
 
-#: lib/rpmchecksig.c:394
+#: lib/rpmchecksig.c:452
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:399
+#: lib/rpmchecksig.c:457
 #, fuzzy, c-format
 msgid "%s: base64 encode failed.\n"
 msgstr "%s: Fseek brást: %s\n"
 
-#: lib/rpmchecksig.c:541
+#: lib/rpmchecksig.c:599
 #, fuzzy, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr "%s: gat ekki lesiğ manifest: %s\n"
 
-#: lib/rpmchecksig.c:614
+#: lib/rpmchecksig.c:672
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:862
+#: lib/rpmchecksig.c:920
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:863 lib/rpmchecksig.c:877
+#: lib/rpmchecksig.c:921 lib/rpmchecksig.c:935
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:865 lib/rpmchecksig.c:879
+#: lib/rpmchecksig.c:923 lib/rpmchecksig.c:937
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:866 lib/rpmchecksig.c:880
+#: lib/rpmchecksig.c:924 lib/rpmchecksig.c:938
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:868 lib/rpmchecksig.c:882
+#: lib/rpmchecksig.c:926 lib/rpmchecksig.c:940
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:876
+#: lib/rpmchecksig.c:934
 msgid "OK"
 msgstr ""
 
diff --git a/po/it.po b/po/it.po
index c80d4ee57..a9f56752a 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-12 14:51-0400\n"
+"POT-Creation-Date: 2002-07-12 18:01-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1584,7 +1584,7 @@ msgstr ""
 msgid "error creating temporary file %s\n"
 msgstr ""
 
-#: lib/package.c:216 lib/rpmchecksig.c:180 lib/rpmchecksig.c:608
+#: lib/package.c:216 lib/rpmchecksig.c:209 lib/rpmchecksig.c:666
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
@@ -1598,27 +1598,27 @@ msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:248 lib/rpmchecksig.c:198 lib/rpmchecksig.c:624
+#: lib/package.c:248 lib/rpmchecksig.c:227 lib/rpmchecksig.c:682
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/package.c:252 lib/rpmchecksig.c:202 lib/rpmchecksig.c:629
+#: lib/package.c:252 lib/rpmchecksig.c:231 lib/rpmchecksig.c:687
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/package.c:298 lib/rpmchecksig.c:527
+#: lib/package.c:298 lib/rpmchecksig.c:585
 #, c-format
 msgid "%s: headerRead failed\n"
 msgstr ""
 
-#: lib/package.c:333 lib/package.c:358 lib/package.c:388 lib/rpmchecksig.c:700
+#: lib/package.c:333 lib/package.c:358 lib/package.c:388 lib/rpmchecksig.c:758
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
-#: lib/package.c:400 lib/rpmchecksig.c:122 lib/rpmchecksig.c:556
+#: lib/package.c:400 lib/rpmchecksig.c:122 lib/rpmchecksig.c:614
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr ""
@@ -2272,72 +2272,77 @@ msgstr ""
 msgid "%s: Fwrite failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:185
+#: lib/rpmchecksig.c:214
 #, c-format
 msgid "%s: Can't sign v1 packaging\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:189
+#: lib/rpmchecksig.c:218
 #, c-format
 msgid "%s: Can't re-sign v2 packaging\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:290
+#: lib/rpmchecksig.c:318
+#, c-format
+msgid "%s: was already signed by key ID %s, skipping\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:348
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:296
+#: lib/rpmchecksig.c:354
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:389
+#: lib/rpmchecksig.c:447
 #, c-format
 msgid "%s: import read failed.\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:394
+#: lib/rpmchecksig.c:452
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:399
+#: lib/rpmchecksig.c:457
 #, c-format
 msgid "%s: base64 encode failed.\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:541
+#: lib/rpmchecksig.c:599
 #, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:614
+#: lib/rpmchecksig.c:672
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:862
+#: lib/rpmchecksig.c:920
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:863 lib/rpmchecksig.c:877
+#: lib/rpmchecksig.c:921 lib/rpmchecksig.c:935
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:865 lib/rpmchecksig.c:879
+#: lib/rpmchecksig.c:923 lib/rpmchecksig.c:937
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:866 lib/rpmchecksig.c:880
+#: lib/rpmchecksig.c:924 lib/rpmchecksig.c:938
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:868 lib/rpmchecksig.c:882
+#: lib/rpmchecksig.c:926 lib/rpmchecksig.c:940
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:876
+#: lib/rpmchecksig.c:934
 msgid "OK"
 msgstr ""
 
diff --git a/po/ja.po b/po/ja.po
index 254eeaaf1..f55a64e71 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-12 14:51-0400\n"
+"POT-Creation-Date: 2002-07-12 18:01-0400\n"
 "PO-Revision-Date: 1999-12-01 22:49 +JST\n"
 "Last-Translator: Kanda Mitsuru <kanda@nn.iij4u.or.jp>\n"
 "Language-Team: JRPM <jrpm@linux.or.jp>\n"
@@ -1666,7 +1666,7 @@ msgstr "%s ¤Ø½ñ¤­¹ş¤á¤Ş¤»¤ó"
 msgid "error creating temporary file %s\n"
 msgstr "°ì»ş¥Õ¥¡¥¤¥ë %s ¤ÎºîÀ®¥¨¥é¡¼"
 
-#: lib/package.c:216 lib/rpmchecksig.c:180 lib/rpmchecksig.c:608
+#: lib/package.c:216 lib/rpmchecksig.c:209 lib/rpmchecksig.c:666
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: readLead ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿\n"
@@ -1684,27 +1684,27 @@ msgid ""
 msgstr ""
 "¥á¥¸¥ã¡¼ÈÖ¹æ <=3 ¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î¤ß¤³¤Î¥Ğ¡¼¥¸¥ç¥ó¤Î RPM ¤Ï¥µ¥İ¡¼¥È¤µ¤ì¤Æ¤¤¤Ş¤¹"
 
-#: lib/package.c:248 lib/rpmchecksig.c:198 lib/rpmchecksig.c:624
+#: lib/package.c:248 lib/rpmchecksig.c:227 lib/rpmchecksig.c:682
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: rpmReadSignature ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿\n"
 
-#: lib/package.c:252 lib/rpmchecksig.c:202 lib/rpmchecksig.c:629
+#: lib/package.c:252 lib/rpmchecksig.c:231 lib/rpmchecksig.c:687
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Í­¸ú¤Ê½ğ̾¤Ï¤¢¤ê¤Ş¤»¤ó\n"
 
-#: lib/package.c:298 lib/rpmchecksig.c:527
+#: lib/package.c:298 lib/rpmchecksig.c:585
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: readLead ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿\n"
 
-#: lib/package.c:333 lib/package.c:358 lib/package.c:388 lib/rpmchecksig.c:700
+#: lib/package.c:333 lib/package.c:358 lib/package.c:388 lib/rpmchecksig.c:758
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
-#: lib/package.c:400 lib/rpmchecksig.c:122 lib/rpmchecksig.c:556
+#: lib/package.c:400 lib/rpmchecksig.c:122 lib/rpmchecksig.c:614
 #, fuzzy, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Fread ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿: %s\n"
@@ -2434,73 +2434,78 @@ msgstr "makeTempFile ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿\n"
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: Fwrite ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿: %s\n"
 
-#: lib/rpmchecksig.c:185
+#: lib/rpmchecksig.c:214
 #, fuzzy, c-format
 msgid "%s: Can't sign v1 packaging\n"
 msgstr "%s: v1.0 ¤Î RPM ¤Ë¤Ï½ğ̾¤Ç¤­¤Ş¤»¤ó\n"
 
-#: lib/rpmchecksig.c:189
+#: lib/rpmchecksig.c:218
 #, fuzzy, c-format
 msgid "%s: Can't re-sign v2 packaging\n"
 msgstr "%s: v2.0 ¤Î RPM ¤Ë¤ÏºÆ½ğ̾¤Ç¤­¤Ş¤»¤ó\n"
 
-#: lib/rpmchecksig.c:290
+#: lib/rpmchecksig.c:318
+#, c-format
+msgid "%s: was already signed by key ID %s, skipping\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:348
 #, fuzzy, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: writedLead ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿: %s\n"
 
-#: lib/rpmchecksig.c:296
+#: lib/rpmchecksig.c:354
 #, fuzzy, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmWriteSignature ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿\n"
 
-#: lib/rpmchecksig.c:389
+#: lib/rpmchecksig.c:447
 #, fuzzy, c-format
 msgid "%s: import read failed.\n"
 msgstr "%s: readLead ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿\n"
 
-#: lib/rpmchecksig.c:394
+#: lib/rpmchecksig.c:452
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:399
+#: lib/rpmchecksig.c:457
 #, fuzzy, c-format
 msgid "%s: base64 encode failed.\n"
 msgstr "%s: readLead ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿\n"
 
-#: lib/rpmchecksig.c:541
+#: lib/rpmchecksig.c:599
 #, fuzzy, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr "%s: readLead ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿\n"
 
-#: lib/rpmchecksig.c:614
+#: lib/rpmchecksig.c:672
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: Í­¸ú¤Ê½ğ̾¤Ï¤¢¤ê¤Ş¤»¤ó(v1.0 RPM)\n"
 
-#: lib/rpmchecksig.c:862
+#: lib/rpmchecksig.c:920
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:863 lib/rpmchecksig.c:877
+#: lib/rpmchecksig.c:921 lib/rpmchecksig.c:935
 #, fuzzy
 msgid " (MISSING KEYS:"
 msgstr " (¥­¡¼¤Îʶ¼º) "
 
-#: lib/rpmchecksig.c:865 lib/rpmchecksig.c:879
+#: lib/rpmchecksig.c:923 lib/rpmchecksig.c:937
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:866 lib/rpmchecksig.c:880
+#: lib/rpmchecksig.c:924 lib/rpmchecksig.c:938
 msgid " (UNTRUSTED KEYS:"
 msgstr " (¿®Íê¤Ç¤­¤Ê¤¤¸°:"
 
-#: lib/rpmchecksig.c:868 lib/rpmchecksig.c:882
+#: lib/rpmchecksig.c:926 lib/rpmchecksig.c:940
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:876
+#: lib/rpmchecksig.c:934
 msgid "OK"
 msgstr ""
 
diff --git a/po/ko.po b/po/ko.po
index 5ccabeef7..b71d149a1 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.4\n"
-"POT-Creation-Date: 2002-07-12 14:51-0400\n"
+"POT-Creation-Date: 2002-07-12 18:01-0400\n"
 "PO-Revision-Date: 2002-03-04 17:17+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
@@ -558,13 +558,16 @@ msgstr "À߸øµÈ ¸ğµå spec: %s(%s)\n"
 msgid "Bad dirmode spec: %s(%s)\n"
 msgstr "À߸øµÈ dir¸ğµå spec: %s(%s)\n"
 
-#, fuzzy
-#~ msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n"
-#~ msgstr "ºñÁ¤»óÀûÀÎ ·ÎÄÉÀÏ ±æÀÌ: %%lang(%2$s)¿¡ \"%1$.*s\"\n"
+#: build/files.c:780
+#, fuzzy, c-format
+msgid "Unusual locale length: \"%.*s\" in %%lang(%s)\n"
+msgstr "ºñÁ¤»óÀûÀÎ ·ÎÄÉÀÏ ±æÀÌ: %%lang(%2$s)¿¡ \"%1$.*s\"\n"
 
-#, fuzzy
-#~ msgid "Duplicate locale %.*s in %%lang(%s)\n"
-#~ msgstr "%%lang(%2$s)¿¡ Áߺ¹µÈ ·ÎÄÉÀÏ %1$.*s°¡ Á¸ÀçÇÕ´Ï´Ù\n"
+#. @innercontinue@
+#: build/files.c:791
+#, fuzzy, c-format
+msgid "Duplicate locale %.*s in %%lang(%s)\n"
+msgstr "%%lang(%2$s)¿¡ Áߺ¹µÈ ·ÎÄÉÀÏ %1$.*s°¡ Á¸ÀçÇÕ´Ï´Ù\n"
 
 #: build/files.c:954
 #, c-format
@@ -1602,7 +1605,7 @@ msgstr "%%%s %s(À»)¸¦ ÀÛ¼ºÇÒ ¼ö ¾ø½À´Ï´Ù\n"
 msgid "error creating temporary file %s\n"
 msgstr "Àӽà ÆÄÀÏ %s(À»)¸¦ »ı¼ºÇÏ´Â µµÁß ¿À·ù°¡ ¹ß»ıÇß½À´Ï´Ù\n"
 
-#: lib/package.c:216 lib/rpmchecksig.c:180 lib/rpmchecksig.c:608
+#: lib/package.c:216 lib/rpmchecksig.c:209 lib/rpmchecksig.c:666
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: readLeadÀÌ ½ÇÆĞÇß½À´Ï´Ù\n"
@@ -1616,27 +1619,27 @@ msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr "ÀÌ RPM ¹öÀüÀº ÁÖ ¹øÈ£(major number)°¡ <= 4 ÀÎ ÆĞŰ¡ ¸¸À» Áö¿øÇÕ´Ï´Ù\n"
 
-#: lib/package.c:248 lib/rpmchecksig.c:198 lib/rpmchecksig.c:624
+#: lib/package.c:248 lib/rpmchecksig.c:227 lib/rpmchecksig.c:682
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: rpmReadSignatureÀÌ ½ÇÆĞÇß½À´Ï´Ù\n"
 
-#: lib/package.c:252 lib/rpmchecksig.c:202 lib/rpmchecksig.c:629
+#: lib/package.c:252 lib/rpmchecksig.c:231 lib/rpmchecksig.c:687
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: À¯È¿ÇÑ ¼­¸íÀÌ ¾ø½À´Ï´Ù\n"
 
-#: lib/package.c:298 lib/rpmchecksig.c:527
+#: lib/package.c:298 lib/rpmchecksig.c:585
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: readLeadÀÌ ½ÇÆĞÇß½À´Ï´Ù\n"
 
-#: lib/package.c:333 lib/package.c:358 lib/package.c:388 lib/rpmchecksig.c:700
+#: lib/package.c:333 lib/package.c:358 lib/package.c:388 lib/rpmchecksig.c:758
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
-#: lib/package.c:400 lib/rpmchecksig.c:122 lib/rpmchecksig.c:556
+#: lib/package.c:400 lib/rpmchecksig.c:122 lib/rpmchecksig.c:614
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: FreadÀÌ ½ÇÆĞÇß½À´Ï´Ù: %s\n"
@@ -2322,72 +2325,77 @@ msgstr "makeTempFileÀÌ ½ÇÆĞÇß½À´Ï´Ù\n"
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: FwriteÀÌ ½ÇÆĞÇß½À´Ï´Ù: %s\n"
 
-#: lib/rpmchecksig.c:185
+#: lib/rpmchecksig.c:214
 #, fuzzy, c-format
 msgid "%s: Can't sign v1 packaging\n"
 msgstr "%s: v1.0 RPMÀº ¼­¸íÇÒ ¼ö ¾ø½À´Ï´Ù\n"
 
-#: lib/rpmchecksig.c:189
+#: lib/rpmchecksig.c:218
 #, fuzzy, c-format
 msgid "%s: Can't re-sign v2 packaging\n"
 msgstr "%s: v2.0 RPMÀº Àç-¼­¸íÇÒ ¼ö ¾ø½À´Ï´Ù\n"
 
-#: lib/rpmchecksig.c:290
+#: lib/rpmchecksig.c:318
+#, c-format
+msgid "%s: was already signed by key ID %s, skipping\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:348
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: writeLeadÀÌ ½ÇÆĞÇß½À´Ï´Ù: %s\n"
 
-#: lib/rpmchecksig.c:296
+#: lib/rpmchecksig.c:354
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmWriteSignatureÀÌ ½ÇÆĞÇß½À´Ï´Ù: %s\n"
 
-#: lib/rpmchecksig.c:389
+#: lib/rpmchecksig.c:447
 #, fuzzy, c-format
 msgid "%s: import read failed.\n"
 msgstr "%s: readLeadÀÌ ½ÇÆĞÇß½À´Ï´Ù\n"
 
-#: lib/rpmchecksig.c:394
+#: lib/rpmchecksig.c:452
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:399
+#: lib/rpmchecksig.c:457
 #, fuzzy, c-format
 msgid "%s: base64 encode failed.\n"
 msgstr "%s: readLeadÀÌ ½ÇÆĞÇß½À´Ï´Ù\n"
 
-#: lib/rpmchecksig.c:541
+#: lib/rpmchecksig.c:599
 #, fuzzy, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr "%s: readLeadÀÌ ½ÇÆĞÇß½À´Ï´Ù\n"
 
-#: lib/rpmchecksig.c:614
+#: lib/rpmchecksig.c:672
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: À¯È¿ÇÑ ¼­¸íÀÌ ¾ø½À´Ï´Ù (v1.0 RPM)\n"
 
-#: lib/rpmchecksig.c:862
+#: lib/rpmchecksig.c:920
 msgid "NOT OK"
 msgstr "¿Ã¹Ù¸£Áö ¾ÊÀ½"
 
-#: lib/rpmchecksig.c:863 lib/rpmchecksig.c:877
+#: lib/rpmchecksig.c:921 lib/rpmchecksig.c:935
 msgid " (MISSING KEYS:"
 msgstr " (Å°¸¦ ãÀ» ¼ö ¾øÀ½:"
 
-#: lib/rpmchecksig.c:865 lib/rpmchecksig.c:879
+#: lib/rpmchecksig.c:923 lib/rpmchecksig.c:937
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:866 lib/rpmchecksig.c:880
+#: lib/rpmchecksig.c:924 lib/rpmchecksig.c:938
 msgid " (UNTRUSTED KEYS:"
 msgstr " (Å°¸¦ ½Å·ÚÇÒ ¼ö ¾øÀ½:"
 
-#: lib/rpmchecksig.c:868 lib/rpmchecksig.c:882
+#: lib/rpmchecksig.c:926 lib/rpmchecksig.c:940
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:876
+#: lib/rpmchecksig.c:934
 msgid "OK"
 msgstr "È®ÀÎ"
 
diff --git a/po/no.po b/po/no.po
index b1843e767..31cbe7f73 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-12 14:51-0400\n"
+"POT-Creation-Date: 2002-07-12 18:01-0400\n"
 "PO-Revision-Date: 2001-06-27 12:24+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -1604,7 +1604,7 @@ msgstr "kan ikke skrive til %%%s %s\n"
 msgid "error creating temporary file %s\n"
 msgstr "feil under oppretting av midlertidig fil %s\n"
 
-#: lib/package.c:216 lib/rpmchecksig.c:180 lib/rpmchecksig.c:608
+#: lib/package.c:216 lib/rpmchecksig.c:209 lib/rpmchecksig.c:666
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: readLead feilet\n"
@@ -1618,27 +1618,27 @@ msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:248 lib/rpmchecksig.c:198 lib/rpmchecksig.c:624
+#: lib/package.c:248 lib/rpmchecksig.c:227 lib/rpmchecksig.c:682
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: rpmReadSignature feilet\n"
 
-#: lib/package.c:252 lib/rpmchecksig.c:202 lib/rpmchecksig.c:629
+#: lib/package.c:252 lib/rpmchecksig.c:231 lib/rpmchecksig.c:687
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Ingen signatur tilgjengelig\n"
 
-#: lib/package.c:298 lib/rpmchecksig.c:527
+#: lib/package.c:298 lib/rpmchecksig.c:585
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: readLead feilet\n"
 
-#: lib/package.c:333 lib/package.c:358 lib/package.c:388 lib/rpmchecksig.c:700
+#: lib/package.c:333 lib/package.c:358 lib/package.c:388 lib/rpmchecksig.c:758
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
-#: lib/package.c:400 lib/rpmchecksig.c:122 lib/rpmchecksig.c:556
+#: lib/package.c:400 lib/rpmchecksig.c:122 lib/rpmchecksig.c:614
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Fread feilet: %s\n"
@@ -2313,72 +2313,77 @@ msgstr "makeTempFile feilet\n"
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: Fwrite feilet: %s\n"
 
-#: lib/rpmchecksig.c:185
+#: lib/rpmchecksig.c:214
 #, fuzzy, c-format
 msgid "%s: Can't sign v1 packaging\n"
 msgstr "%s: kan ikke signere v1.0 RPM\n"
 
-#: lib/rpmchecksig.c:189
+#: lib/rpmchecksig.c:218
 #, 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:290
+#: lib/rpmchecksig.c:318
+#, c-format
+msgid "%s: was already signed by key ID %s, skipping\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:348
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: writeLead feilet: %s\n"
 
-#: lib/rpmchecksig.c:296
+#: lib/rpmchecksig.c:354
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmWriteSignature feilet: %s\n"
 
-#: lib/rpmchecksig.c:389
+#: lib/rpmchecksig.c:447
 #, fuzzy, c-format
 msgid "%s: import read failed.\n"
 msgstr "%s: readLead feilet\n"
 
-#: lib/rpmchecksig.c:394
+#: lib/rpmchecksig.c:452
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:399
+#: lib/rpmchecksig.c:457
 #, fuzzy, c-format
 msgid "%s: base64 encode failed.\n"
 msgstr "%s: readLead feilet\n"
 
-#: lib/rpmchecksig.c:541
+#: lib/rpmchecksig.c:599
 #, fuzzy, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr "%s: readLead feilet\n"
 
-#: lib/rpmchecksig.c:614
+#: lib/rpmchecksig.c:672
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: Ingen signatur tilgjengelig (v1.0 RPM)\n"
 
-#: lib/rpmchecksig.c:862
+#: lib/rpmchecksig.c:920
 msgid "NOT OK"
 msgstr "IKKE OK"
 
-#: lib/rpmchecksig.c:863 lib/rpmchecksig.c:877
+#: lib/rpmchecksig.c:921 lib/rpmchecksig.c:935
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:865 lib/rpmchecksig.c:879
+#: lib/rpmchecksig.c:923 lib/rpmchecksig.c:937
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:866 lib/rpmchecksig.c:880
+#: lib/rpmchecksig.c:924 lib/rpmchecksig.c:938
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:868 lib/rpmchecksig.c:882
+#: lib/rpmchecksig.c:926 lib/rpmchecksig.c:940
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:876
+#: lib/rpmchecksig.c:934
 msgid "OK"
 msgstr "OK"
 
diff --git a/po/pl.po b/po/pl.po
index b92c298d0..e9b8d80ca 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-12 14:51-0400\n"
+"POT-Creation-Date: 2002-07-12 18:01-0400\n"
 "PO-Revision-Date: 1999-05-25 17:00+0100\n"
 "Last-Translator: Pawe³ Dziekoñski <pdziekonski@mml.ch.pwr.wroc.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -1648,7 +1648,7 @@ msgstr "nie mo¿na zapisaæ do %s"
 msgid "error creating temporary file %s\n"
 msgstr "b³±d w tworzeniu pliku tymczasowego %s"
 
-#: lib/package.c:216 lib/rpmchecksig.c:180 lib/rpmchecksig.c:608
+#: lib/package.c:216 lib/rpmchecksig.c:209 lib/rpmchecksig.c:666
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: readLead nie powiod³o siê\n"
@@ -1666,27 +1666,27 @@ msgid ""
 msgstr ""
 "tylko pakiety z numerem g³ównym <= 3 s± obs³ugiwane przez t± wersjê RPM'a"
 
-#: lib/package.c:248 lib/rpmchecksig.c:198 lib/rpmchecksig.c:624
+#: lib/package.c:248 lib/rpmchecksig.c:227 lib/rpmchecksig.c:682
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: rpmReadSignature nie powiod³o siê\n"
 
-#: lib/package.c:252 lib/rpmchecksig.c:202 lib/rpmchecksig.c:629
+#: lib/package.c:252 lib/rpmchecksig.c:231 lib/rpmchecksig.c:687
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Sygnatura nie jest dostêpna\n"
 
-#: lib/package.c:298 lib/rpmchecksig.c:527
+#: lib/package.c:298 lib/rpmchecksig.c:585
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: readLead nie powiod³o siê\n"
 
-#: lib/package.c:333 lib/package.c:358 lib/package.c:388 lib/rpmchecksig.c:700
+#: lib/package.c:333 lib/package.c:358 lib/package.c:388 lib/rpmchecksig.c:758
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
-#: lib/package.c:400 lib/rpmchecksig.c:122 lib/rpmchecksig.c:556
+#: lib/package.c:400 lib/rpmchecksig.c:122 lib/rpmchecksig.c:614
 #, fuzzy, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: readLead nie powiod³o siê\n"
@@ -2396,72 +2396,77 @@ msgstr "wykonanie nie powiod³o siê\n"
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: readLead nie powiod³o siê\n"
 
-#: lib/rpmchecksig.c:185
+#: lib/rpmchecksig.c:214
 #, fuzzy, c-format
 msgid "%s: Can't sign v1 packaging\n"
 msgstr "%s: Nie mo¿na podpisaæ v1.0 RPM\n"
 
-#: lib/rpmchecksig.c:189
+#: lib/rpmchecksig.c:218
 #, 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:290
+#: lib/rpmchecksig.c:318
+#, c-format
+msgid "%s: was already signed by key ID %s, skipping\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:348
 #, fuzzy, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: readLead nie powiod³o siê\n"
 
-#: lib/rpmchecksig.c:296
+#: lib/rpmchecksig.c:354
 #, fuzzy, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmReadSignature nie powiod³o siê\n"
 
-#: lib/rpmchecksig.c:389
+#: lib/rpmchecksig.c:447
 #, fuzzy, c-format
 msgid "%s: import read failed.\n"
 msgstr "%s: readLead nie powiod³o siê\n"
 
-#: lib/rpmchecksig.c:394
+#: lib/rpmchecksig.c:452
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:399
+#: lib/rpmchecksig.c:457
 #, fuzzy, c-format
 msgid "%s: base64 encode failed.\n"
 msgstr "%s: readLead nie powiod³o siê\n"
 
-#: lib/rpmchecksig.c:541
+#: lib/rpmchecksig.c:599
 #, fuzzy, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr "%s: readLead nie powiod³o siê\n"
 
-#: lib/rpmchecksig.c:614
+#: lib/rpmchecksig.c:672
 #, 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:862
+#: lib/rpmchecksig.c:920
 msgid "NOT OK"
 msgstr "NIE DOBRZE"
 
-#: lib/rpmchecksig.c:863 lib/rpmchecksig.c:877
+#: lib/rpmchecksig.c:921 lib/rpmchecksig.c:935
 msgid " (MISSING KEYS:"
 msgstr " (BRAK KLUCZY:"
 
-#: lib/rpmchecksig.c:865 lib/rpmchecksig.c:879
+#: lib/rpmchecksig.c:923 lib/rpmchecksig.c:937
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:866 lib/rpmchecksig.c:880
+#: lib/rpmchecksig.c:924 lib/rpmchecksig.c:938
 msgid " (UNTRUSTED KEYS:"
 msgstr "(NIEWIARYGODNE KLUCZE:"
 
-#: lib/rpmchecksig.c:868 lib/rpmchecksig.c:882
+#: lib/rpmchecksig.c:926 lib/rpmchecksig.c:940
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:876
+#: lib/rpmchecksig.c:934
 msgid "OK"
 msgstr "OK"
 
diff --git a/po/pt.po b/po/pt.po
index 124cceb22..140248e84 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm\n"
-"POT-Creation-Date: 2002-07-12 14:51-0400\n"
+"POT-Creation-Date: 2002-07-12 18:01-0400\n"
 "PO-Revision-Date: 2002-02-14 10:51+0000\n"
 "Last-Translator: José Nuno Coelho Sanarra Pires <jncp@rnl.ist.utl.pt>\n"
 "Language-Team: pt <morais@kde.org\n"
@@ -1622,7 +1622,7 @@ msgstr "não consigo escrever em %%%s %s\n"
 msgid "error creating temporary file %s\n"
 msgstr "erro ao criar o ficheiro temporário %s\n"
 
-#: lib/package.c:216 lib/rpmchecksig.c:180 lib/rpmchecksig.c:608
+#: lib/package.c:216 lib/rpmchecksig.c:209 lib/rpmchecksig.c:666
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ":%s: o readLead falhou\n"
@@ -1636,27 +1636,27 @@ 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:248 lib/rpmchecksig.c:198 lib/rpmchecksig.c:624
+#: lib/package.c:248 lib/rpmchecksig.c:227 lib/rpmchecksig.c:682
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: o rpmReadSignature falhou\n"
 
-#: lib/package.c:252 lib/rpmchecksig.c:202 lib/rpmchecksig.c:629
+#: lib/package.c:252 lib/rpmchecksig.c:231 lib/rpmchecksig.c:687
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Nenhuma assinatura disponível\n"
 
-#: lib/package.c:298 lib/rpmchecksig.c:527
+#: lib/package.c:298 lib/rpmchecksig.c:585
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr ":%s: o readLead falhou\n"
 
-#: lib/package.c:333 lib/package.c:358 lib/package.c:388 lib/rpmchecksig.c:700
+#: lib/package.c:333 lib/package.c:358 lib/package.c:388 lib/rpmchecksig.c:758
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
-#: lib/package.c:400 lib/rpmchecksig.c:122 lib/rpmchecksig.c:556
+#: lib/package.c:400 lib/rpmchecksig.c:122 lib/rpmchecksig.c:614
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: O fread falhou: %s\n"
@@ -2337,72 +2337,77 @@ msgstr "o makeTempFile falhou\n"
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: O fwrite falhou: %s\n"
 
-#: lib/rpmchecksig.c:185
+#: lib/rpmchecksig.c:214
 #, 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:189
+#: lib/rpmchecksig.c:218
 #, 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:290
+#: lib/rpmchecksig.c:318
+#, c-format
+msgid "%s: was already signed by key ID %s, skipping\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:348
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: o writeLead falhou: %s\n"
 
-#: lib/rpmchecksig.c:296
+#: lib/rpmchecksig.c:354
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: o rpmWriteSignature falhou: %s\n"
 
-#: lib/rpmchecksig.c:389
+#: lib/rpmchecksig.c:447
 #, fuzzy, c-format
 msgid "%s: import read failed.\n"
 msgstr ":%s: o readLead falhou\n"
 
-#: lib/rpmchecksig.c:394
+#: lib/rpmchecksig.c:452
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:399
+#: lib/rpmchecksig.c:457
 #, fuzzy, c-format
 msgid "%s: base64 encode failed.\n"
 msgstr ":%s: o readLead falhou\n"
 
-#: lib/rpmchecksig.c:541
+#: lib/rpmchecksig.c:599
 #, fuzzy, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr ":%s: o readLead falhou\n"
 
-#: lib/rpmchecksig.c:614
+#: lib/rpmchecksig.c:672
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: Nenhuma assinatura disponível (RPM v1.0)\n"
 
-#: lib/rpmchecksig.c:862
+#: lib/rpmchecksig.c:920
 msgid "NOT OK"
 msgstr "NÃO-OK"
 
-#: lib/rpmchecksig.c:863 lib/rpmchecksig.c:877
+#: lib/rpmchecksig.c:921 lib/rpmchecksig.c:935
 msgid " (MISSING KEYS:"
 msgstr " (FALTAM AS CHAVES:"
 
-#: lib/rpmchecksig.c:865 lib/rpmchecksig.c:879
+#: lib/rpmchecksig.c:923 lib/rpmchecksig.c:937
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:866 lib/rpmchecksig.c:880
+#: lib/rpmchecksig.c:924 lib/rpmchecksig.c:938
 msgid " (UNTRUSTED KEYS:"
 msgstr " (CHAVES SUSPEITAS:"
 
-#: lib/rpmchecksig.c:868 lib/rpmchecksig.c:882
+#: lib/rpmchecksig.c:926 lib/rpmchecksig.c:940
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:876
+#: lib/rpmchecksig.c:934
 msgid "OK"
 msgstr "OK"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 2f0c8fcd6..7fb0dfd51 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-12 14:51-0400\n"
+"POT-Creation-Date: 2002-07-12 18:01-0400\n"
 
 #: build.c:40
 #, fuzzy
@@ -1768,7 +1768,7 @@ msgstr "No consegui abrir: %s\n"
 msgid "error creating temporary file %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/package.c:216 lib/rpmchecksig.c:180 lib/rpmchecksig.c:608
+#: lib/package.c:216 lib/rpmchecksig.c:209 lib/rpmchecksig.c:666
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
@@ -1782,29 +1782,29 @@ msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:248 lib/rpmchecksig.c:198 lib/rpmchecksig.c:624
+#: lib/package.c:248 lib/rpmchecksig.c:227 lib/rpmchecksig.c:682
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/package.c:252 lib/rpmchecksig.c:202 lib/rpmchecksig.c:629
+#: lib/package.c:252 lib/rpmchecksig.c:231 lib/rpmchecksig.c:687
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
 # , c-format
-#: lib/package.c:298 lib/rpmchecksig.c:527
+#: lib/package.c:298 lib/rpmchecksig.c:585
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/package.c:333 lib/package.c:358 lib/package.c:388 lib/rpmchecksig.c:700
+#: lib/package.c:333 lib/package.c:358 lib/package.c:388 lib/rpmchecksig.c:758
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
 # , c-format
-#: lib/package.c:400 lib/rpmchecksig.c:122 lib/rpmchecksig.c:556
+#: lib/package.c:400 lib/rpmchecksig.c:122 lib/rpmchecksig.c:614
 #, fuzzy, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "No consegui abrir: %s\n"
@@ -2529,76 +2529,81 @@ msgstr "Construo falhou.\n"
 msgid "%s: Fwrite failed: %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/rpmchecksig.c:185
+#: lib/rpmchecksig.c:214
 #, c-format
 msgid "%s: Can't sign v1 packaging\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:189
+#: lib/rpmchecksig.c:218
 #, c-format
 msgid "%s: Can't re-sign v2 packaging\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:290
+#: lib/rpmchecksig.c:318
+#, c-format
+msgid "%s: was already signed by key ID %s, skipping\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:348
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
 # , c-format
-#: lib/rpmchecksig.c:296
+#: lib/rpmchecksig.c:354
 #, fuzzy, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: lib/rpmchecksig.c:389
+#: lib/rpmchecksig.c:447
 #, fuzzy, c-format
 msgid "%s: import read failed.\n"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/rpmchecksig.c:394
+#: lib/rpmchecksig.c:452
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
 
 # , c-format
-#: lib/rpmchecksig.c:399
+#: lib/rpmchecksig.c:457
 #, fuzzy, c-format
 msgid "%s: base64 encode failed.\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: lib/rpmchecksig.c:541
+#: lib/rpmchecksig.c:599
 #, fuzzy, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/rpmchecksig.c:614
+#: lib/rpmchecksig.c:672
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:862
+#: lib/rpmchecksig.c:920
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:863 lib/rpmchecksig.c:877
+#: lib/rpmchecksig.c:921 lib/rpmchecksig.c:935
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:865 lib/rpmchecksig.c:879
+#: lib/rpmchecksig.c:923 lib/rpmchecksig.c:937
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:866 lib/rpmchecksig.c:880
+#: lib/rpmchecksig.c:924 lib/rpmchecksig.c:938
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:868 lib/rpmchecksig.c:882
+#: lib/rpmchecksig.c:926 lib/rpmchecksig.c:940
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:876
+#: lib/rpmchecksig.c:934
 msgid "OK"
 msgstr ""
 
diff --git a/po/ro.po b/po/ro.po
index 51a002bfe..048ce4888 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-12 14:51-0400\n"
+"POT-Creation-Date: 2002-07-12 18:01-0400\n"
 "PO-Revision-Date: 1999-04-10 12:00+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
@@ -1579,7 +1579,7 @@ msgstr ""
 msgid "error creating temporary file %s\n"
 msgstr ""
 
-#: lib/package.c:216 lib/rpmchecksig.c:180 lib/rpmchecksig.c:608
+#: lib/package.c:216 lib/rpmchecksig.c:209 lib/rpmchecksig.c:666
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
@@ -1593,27 +1593,27 @@ msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:248 lib/rpmchecksig.c:198 lib/rpmchecksig.c:624
+#: lib/package.c:248 lib/rpmchecksig.c:227 lib/rpmchecksig.c:682
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/package.c:252 lib/rpmchecksig.c:202 lib/rpmchecksig.c:629
+#: lib/package.c:252 lib/rpmchecksig.c:231 lib/rpmchecksig.c:687
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/package.c:298 lib/rpmchecksig.c:527
+#: lib/package.c:298 lib/rpmchecksig.c:585
 #, c-format
 msgid "%s: headerRead failed\n"
 msgstr ""
 
-#: lib/package.c:333 lib/package.c:358 lib/package.c:388 lib/rpmchecksig.c:700
+#: lib/package.c:333 lib/package.c:358 lib/package.c:388 lib/rpmchecksig.c:758
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
-#: lib/package.c:400 lib/rpmchecksig.c:122 lib/rpmchecksig.c:556
+#: lib/package.c:400 lib/rpmchecksig.c:122 lib/rpmchecksig.c:614
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr ""
@@ -2267,72 +2267,77 @@ msgstr ""
 msgid "%s: Fwrite failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:185
+#: lib/rpmchecksig.c:214
 #, c-format
 msgid "%s: Can't sign v1 packaging\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:189
+#: lib/rpmchecksig.c:218
 #, c-format
 msgid "%s: Can't re-sign v2 packaging\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:290
+#: lib/rpmchecksig.c:318
+#, c-format
+msgid "%s: was already signed by key ID %s, skipping\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:348
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:296
+#: lib/rpmchecksig.c:354
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:389
+#: lib/rpmchecksig.c:447
 #, c-format
 msgid "%s: import read failed.\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:394
+#: lib/rpmchecksig.c:452
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:399
+#: lib/rpmchecksig.c:457
 #, c-format
 msgid "%s: base64 encode failed.\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:541
+#: lib/rpmchecksig.c:599
 #, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:614
+#: lib/rpmchecksig.c:672
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:862
+#: lib/rpmchecksig.c:920
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:863 lib/rpmchecksig.c:877
+#: lib/rpmchecksig.c:921 lib/rpmchecksig.c:935
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:865 lib/rpmchecksig.c:879
+#: lib/rpmchecksig.c:923 lib/rpmchecksig.c:937
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:866 lib/rpmchecksig.c:880
+#: lib/rpmchecksig.c:924 lib/rpmchecksig.c:938
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:868 lib/rpmchecksig.c:882
+#: lib/rpmchecksig.c:926 lib/rpmchecksig.c:940
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:876
+#: lib/rpmchecksig.c:934
 msgid "OK"
 msgstr ""
 
diff --git a/po/rpm.pot b/po/rpm.pot
index 25e704692..ebc77d7bb 100644
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-07-12 14:51-0400\n"
+"POT-Creation-Date: 2002-07-12 18:01-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1585,7 +1585,7 @@ msgstr ""
 msgid "error creating temporary file %s\n"
 msgstr ""
 
-#: lib/package.c:216 lib/rpmchecksig.c:180 lib/rpmchecksig.c:608
+#: lib/package.c:216 lib/rpmchecksig.c:209 lib/rpmchecksig.c:666
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
@@ -1599,27 +1599,27 @@ msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:248 lib/rpmchecksig.c:198 lib/rpmchecksig.c:624
+#: lib/package.c:248 lib/rpmchecksig.c:227 lib/rpmchecksig.c:682
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/package.c:252 lib/rpmchecksig.c:202 lib/rpmchecksig.c:629
+#: lib/package.c:252 lib/rpmchecksig.c:231 lib/rpmchecksig.c:687
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/package.c:298 lib/rpmchecksig.c:527
+#: lib/package.c:298 lib/rpmchecksig.c:585
 #, c-format
 msgid "%s: headerRead failed\n"
 msgstr ""
 
-#: lib/package.c:333 lib/package.c:358 lib/package.c:388 lib/rpmchecksig.c:700
+#: lib/package.c:333 lib/package.c:358 lib/package.c:388 lib/rpmchecksig.c:758
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
-#: lib/package.c:400 lib/rpmchecksig.c:122 lib/rpmchecksig.c:556
+#: lib/package.c:400 lib/rpmchecksig.c:122 lib/rpmchecksig.c:614
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr ""
@@ -2273,72 +2273,77 @@ msgstr ""
 msgid "%s: Fwrite failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:185
+#: lib/rpmchecksig.c:214
 #, c-format
 msgid "%s: Can't sign v1 packaging\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:189
+#: lib/rpmchecksig.c:218
 #, c-format
 msgid "%s: Can't re-sign v2 packaging\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:290
+#: lib/rpmchecksig.c:318
+#, c-format
+msgid "%s: was already signed by key ID %s, skipping\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:348
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:296
+#: lib/rpmchecksig.c:354
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:389
+#: lib/rpmchecksig.c:447
 #, c-format
 msgid "%s: import read failed.\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:394
+#: lib/rpmchecksig.c:452
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:399
+#: lib/rpmchecksig.c:457
 #, c-format
 msgid "%s: base64 encode failed.\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:541
+#: lib/rpmchecksig.c:599
 #, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:614
+#: lib/rpmchecksig.c:672
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:862
+#: lib/rpmchecksig.c:920
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:863 lib/rpmchecksig.c:877
+#: lib/rpmchecksig.c:921 lib/rpmchecksig.c:935
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:865 lib/rpmchecksig.c:879
+#: lib/rpmchecksig.c:923 lib/rpmchecksig.c:937
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:866 lib/rpmchecksig.c:880
+#: lib/rpmchecksig.c:924 lib/rpmchecksig.c:938
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:868 lib/rpmchecksig.c:882
+#: lib/rpmchecksig.c:926 lib/rpmchecksig.c:940
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:876
+#: lib/rpmchecksig.c:934
 msgid "OK"
 msgstr ""
 
diff --git a/po/ru.po b/po/ru.po
index c2c99bc77..10c9a6b41 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-12 14:51-0400\n"
+"POT-Creation-Date: 2002-07-12 18:01-0400\n"
 "PO-Revision-Date: 2002-04-09 16:44-0400\n"
 "Last-Translator: Eugene Kanter, <eugene@bcl.bz>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
@@ -1627,7 +1627,7 @@ msgstr "ÎÅ×ÏÚÍÏÖÎÏ ĞÉÓÁÔØ × %%%s %s\n"
 msgid "error creating temporary file %s\n"
 msgstr "ÏÛÉÂËÁ ÓÏÚÄÁÎÉÑ ×ÒÅÍÅÎÎÏÇÏ ÆÁÊÌÁ %s\n"
 
-#: lib/package.c:216 lib/rpmchecksig.c:180 lib/rpmchecksig.c:608
+#: lib/package.c:216 lib/rpmchecksig.c:209 lib/rpmchecksig.c:666
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: ÏÛÉÂËÁ readLead\n"
@@ -1641,27 +1641,27 @@ msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr "ÜÔÁ ×ÅÒÓÉÑ RPM ĞÏÄÄÅÒÖÉ×ÁÅÔ ÔÏÌØËÏ ĞÁËÅÔÙ ×ÅÒÓÉÉ <= 4\n"
 
-#: lib/package.c:248 lib/rpmchecksig.c:198 lib/rpmchecksig.c:624
+#: lib/package.c:248 lib/rpmchecksig.c:227 lib/rpmchecksig.c:682
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: ÏÛÉÂËÁ rpmReadSignature\n"
 
-#: lib/package.c:252 lib/rpmchecksig.c:202 lib/rpmchecksig.c:629
+#: lib/package.c:252 lib/rpmchecksig.c:231 lib/rpmchecksig.c:687
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: ğÏÄĞÉÓØ ÎÅÄÏÓÔÕĞÎÁ\n"
 
-#: lib/package.c:298 lib/rpmchecksig.c:527
+#: lib/package.c:298 lib/rpmchecksig.c:585
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: ÏÛÉÂËÁ readLead\n"
 
-#: lib/package.c:333 lib/package.c:358 lib/package.c:388 lib/rpmchecksig.c:700
+#: lib/package.c:333 lib/package.c:358 lib/package.c:388 lib/rpmchecksig.c:758
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
-#: lib/package.c:400 lib/rpmchecksig.c:122 lib/rpmchecksig.c:556
+#: lib/package.c:400 lib/rpmchecksig.c:122 lib/rpmchecksig.c:614
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: ÏÛÉÂËÁ Fread: %s\n"
@@ -2338,72 +2338,77 @@ msgstr "ÏÛÉÂËÁ makeTempFile\n"
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: ÏÛÉÂËÁ Fwrite: %s\n"
 
-#: lib/rpmchecksig.c:185
+#: lib/rpmchecksig.c:214
 #, fuzzy, c-format
 msgid "%s: Can't sign v1 packaging\n"
 msgstr "%s: îÅ ÍÏÇÕ ĞÏÄĞÉÓÁÔØ RPM v1.0\n"
 
-#: lib/rpmchecksig.c:189
+#: lib/rpmchecksig.c:218
 #, fuzzy, c-format
 msgid "%s: Can't re-sign v2 packaging\n"
 msgstr "%s: îÅ ÍÏÇÕ ĞÅÒÅĞÏÄĞÉÓÁÔØ RPM v2.0\n"
 
-#: lib/rpmchecksig.c:290
+#: lib/rpmchecksig.c:318
+#, c-format
+msgid "%s: was already signed by key ID %s, skipping\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:348
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: ÏÛÉÂËÁ writeLead: %s\n"
 
-#: lib/rpmchecksig.c:296
+#: lib/rpmchecksig.c:354
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: ÏÛÉÂËÁ rpmWriteSignature: %s\n"
 
-#: lib/rpmchecksig.c:389
+#: lib/rpmchecksig.c:447
 #, fuzzy, c-format
 msgid "%s: import read failed.\n"
 msgstr "%s: ÏÛÉÂËÁ readLead\n"
 
-#: lib/rpmchecksig.c:394
+#: lib/rpmchecksig.c:452
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:399
+#: lib/rpmchecksig.c:457
 #, fuzzy, c-format
 msgid "%s: base64 encode failed.\n"
 msgstr "%s: ÏÛÉÂËÁ readLead\n"
 
-#: lib/rpmchecksig.c:541
+#: lib/rpmchecksig.c:599
 #, fuzzy, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr "%s: ÏÛÉÂËÁ readLead\n"
 
-#: lib/rpmchecksig.c:614
+#: lib/rpmchecksig.c:672
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: ğÏÄĞÉÓÉ ÎÅÔ (RPM v1.0)\n"
 
-#: lib/rpmchecksig.c:862
+#: lib/rpmchecksig.c:920
 msgid "NOT OK"
 msgstr "îå ïë"
 
-#: lib/rpmchecksig.c:863 lib/rpmchecksig.c:877
+#: lib/rpmchecksig.c:921 lib/rpmchecksig.c:935
 msgid " (MISSING KEYS:"
 msgstr " (ïôóõôóô÷õàô ëìàşé:"
 
-#: lib/rpmchecksig.c:865 lib/rpmchecksig.c:879
+#: lib/rpmchecksig.c:923 lib/rpmchecksig.c:937
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:866 lib/rpmchecksig.c:880
+#: lib/rpmchecksig.c:924 lib/rpmchecksig.c:938
 msgid " (UNTRUSTED KEYS:"
 msgstr " (îåô äï÷åòéñ ë ëìàşáí:"
 
-#: lib/rpmchecksig.c:868 lib/rpmchecksig.c:882
+#: lib/rpmchecksig.c:926 lib/rpmchecksig.c:940
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:876
+#: lib/rpmchecksig.c:934
 msgid "OK"
 msgstr "ïë"
 
diff --git a/po/sk.po b/po/sk.po
index 4c3262a95..4a16404ba 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-12 14:51-0400\n"
+"POT-Creation-Date: 2002-07-12 18:01-0400\n"
 "PO-Revision-Date: 1999-04-08 21:37+02:00\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -1646,7 +1646,7 @@ msgstr "nie je mo¾né zapísa» do %s: "
 msgid "error creating temporary file %s\n"
 msgstr "chyba pri vytváraní doèasného súboru %s"
 
-#: lib/package.c:216 lib/rpmchecksig.c:180 lib/rpmchecksig.c:608
+#: lib/package.c:216 lib/rpmchecksig.c:209 lib/rpmchecksig.c:666
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: readLead zlyhalo\n"
@@ -1662,27 +1662,27 @@ 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:248 lib/rpmchecksig.c:198 lib/rpmchecksig.c:624
+#: lib/package.c:248 lib/rpmchecksig.c:227 lib/rpmchecksig.c:682
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: rpmReadSignature zlyhalo\n"
 
-#: lib/package.c:252 lib/rpmchecksig.c:202 lib/rpmchecksig.c:629
+#: lib/package.c:252 lib/rpmchecksig.c:231 lib/rpmchecksig.c:687
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Podpis nie je k dispozícii\n"
 
-#: lib/package.c:298 lib/rpmchecksig.c:527
+#: lib/package.c:298 lib/rpmchecksig.c:585
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: readLead zlyhalo\n"
 
-#: lib/package.c:333 lib/package.c:358 lib/package.c:388 lib/rpmchecksig.c:700
+#: lib/package.c:333 lib/package.c:358 lib/package.c:388 lib/rpmchecksig.c:758
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
-#: lib/package.c:400 lib/rpmchecksig.c:122 lib/rpmchecksig.c:556
+#: lib/package.c:400 lib/rpmchecksig.c:122 lib/rpmchecksig.c:614
 #, fuzzy, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: readLead zlyhalo\n"
@@ -2394,72 +2394,77 @@ msgstr "vykonanie zlyhalo\n"
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: readLead zlyhalo\n"
 
-#: lib/rpmchecksig.c:185
+#: lib/rpmchecksig.c:214
 #, 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:189
+#: lib/rpmchecksig.c:218
 #, 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:290
+#: lib/rpmchecksig.c:318
+#, c-format
+msgid "%s: was already signed by key ID %s, skipping\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:348
 #, fuzzy, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: readLead zlyhalo\n"
 
-#: lib/rpmchecksig.c:296
+#: lib/rpmchecksig.c:354
 #, fuzzy, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmReadSignature zlyhalo\n"
 
-#: lib/rpmchecksig.c:389
+#: lib/rpmchecksig.c:447
 #, fuzzy, c-format
 msgid "%s: import read failed.\n"
 msgstr "%s: readLead zlyhalo\n"
 
-#: lib/rpmchecksig.c:394
+#: lib/rpmchecksig.c:452
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:399
+#: lib/rpmchecksig.c:457
 #, fuzzy, c-format
 msgid "%s: base64 encode failed.\n"
 msgstr "%s: readLead zlyhalo\n"
 
-#: lib/rpmchecksig.c:541
+#: lib/rpmchecksig.c:599
 #, fuzzy, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr "%s: readLead zlyhalo\n"
 
-#: lib/rpmchecksig.c:614
+#: lib/rpmchecksig.c:672
 #, 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:862
+#: lib/rpmchecksig.c:920
 msgid "NOT OK"
 msgstr "NIE JE V PORIADKU"
 
-#: lib/rpmchecksig.c:863 lib/rpmchecksig.c:877
+#: lib/rpmchecksig.c:921 lib/rpmchecksig.c:935
 msgid " (MISSING KEYS:"
 msgstr " (CHİBAJÚCE K¥ÚÈE):"
 
-#: lib/rpmchecksig.c:865 lib/rpmchecksig.c:879
+#: lib/rpmchecksig.c:923 lib/rpmchecksig.c:937
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:866 lib/rpmchecksig.c:880
+#: lib/rpmchecksig.c:924 lib/rpmchecksig.c:938
 msgid " (UNTRUSTED KEYS:"
 msgstr " (NEDÔVERUJE SA K¥ÚÈOM: "
 
-#: lib/rpmchecksig.c:868 lib/rpmchecksig.c:882
+#: lib/rpmchecksig.c:926 lib/rpmchecksig.c:940
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:876
+#: lib/rpmchecksig.c:934
 msgid "OK"
 msgstr "V PORIADKU"
 
diff --git a/po/sl.po b/po/sl.po
index e88e198e5..70ec33337 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.277 2002/07/12 19:09:49 jbj Exp $
+# $Id: sl.po,v 1.278 2002/07/12 21:59:59 jbj Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-12 14:51-0400\n"
+"POT-Creation-Date: 2002-07-12 18:01-0400\n"
 "PO-Revision-Date: 2000-10-08 19:05+0200\n"
 "Last-Translator: Grega Fajdiga <gregor.fajdiga@telemach.net>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -1649,7 +1649,7 @@ msgstr "pisanje na %s ni mo¾no"
 msgid "error creating temporary file %s\n"
 msgstr "napaka pri ustvarjanju zaèasne datoteke %s"
 
-#: lib/package.c:216 lib/rpmchecksig.c:180 lib/rpmchecksig.c:608
+#: lib/package.c:216 lib/rpmchecksig.c:209 lib/rpmchecksig.c:666
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: readLead je bil neuspe¹en\n"
@@ -1665,27 +1665,27 @@ 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:248 lib/rpmchecksig.c:198 lib/rpmchecksig.c:624
+#: lib/package.c:248 lib/rpmchecksig.c:227 lib/rpmchecksig.c:682
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: rpmReadSignature je bil neuspe¹en\n"
 
-#: lib/package.c:252 lib/rpmchecksig.c:202 lib/rpmchecksig.c:629
+#: lib/package.c:252 lib/rpmchecksig.c:231 lib/rpmchecksig.c:687
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Podpis ni na voljo\n"
 
-#: lib/package.c:298 lib/rpmchecksig.c:527
+#: lib/package.c:298 lib/rpmchecksig.c:585
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: readLead je bil neuspe¹en\n"
 
-#: lib/package.c:333 lib/package.c:358 lib/package.c:388 lib/rpmchecksig.c:700
+#: lib/package.c:333 lib/package.c:358 lib/package.c:388 lib/rpmchecksig.c:758
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
-#: lib/package.c:400 lib/rpmchecksig.c:122 lib/rpmchecksig.c:556
+#: lib/package.c:400 lib/rpmchecksig.c:122 lib/rpmchecksig.c:614
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: branje Fread je bilo neuspe¹no: %s\n"
@@ -2394,72 +2394,77 @@ msgstr "makeTempFile je bil neuspe¹en\n"
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: pisanje Fwrite je bilo neuspe¹no: %s\n"
 
-#: lib/rpmchecksig.c:185
+#: lib/rpmchecksig.c:214
 #, fuzzy, c-format
 msgid "%s: Can't sign v1 packaging\n"
 msgstr "%s: Podpis RPM v1.0 ni mo¾en\n"
 
-#: lib/rpmchecksig.c:189
+#: lib/rpmchecksig.c:218
 #, 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:290
+#: lib/rpmchecksig.c:318
+#, c-format
+msgid "%s: was already signed by key ID %s, skipping\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:348
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: writeLead je bil neuspe¹en: %s\n"
 
-#: lib/rpmchecksig.c:296
+#: lib/rpmchecksig.c:354
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmWriteSignature je bilo neuspe¹no: %s\n"
 
-#: lib/rpmchecksig.c:389
+#: lib/rpmchecksig.c:447
 #, fuzzy, c-format
 msgid "%s: import read failed.\n"
 msgstr "%s: readLead je bil neuspe¹en\n"
 
-#: lib/rpmchecksig.c:394
+#: lib/rpmchecksig.c:452
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:399
+#: lib/rpmchecksig.c:457
 #, fuzzy, c-format
 msgid "%s: base64 encode failed.\n"
 msgstr "%s: readLead je bil neuspe¹en\n"
 
-#: lib/rpmchecksig.c:541
+#: lib/rpmchecksig.c:599
 #, fuzzy, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr "%s: readLead je bil neuspe¹en\n"
 
-#: lib/rpmchecksig.c:614
+#: lib/rpmchecksig.c:672
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: Podpis ni na voljo (RPM v1.0)\n"
 
-#: lib/rpmchecksig.c:862
+#: lib/rpmchecksig.c:920
 msgid "NOT OK"
 msgstr "NI DOBRO"
 
-#: lib/rpmchecksig.c:863 lib/rpmchecksig.c:877
+#: lib/rpmchecksig.c:921 lib/rpmchecksig.c:935
 msgid " (MISSING KEYS:"
 msgstr " (MANJKAJOÈI KLJUÈI:"
 
-#: lib/rpmchecksig.c:865 lib/rpmchecksig.c:879
+#: lib/rpmchecksig.c:923 lib/rpmchecksig.c:937
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:866 lib/rpmchecksig.c:880
+#: lib/rpmchecksig.c:924 lib/rpmchecksig.c:938
 msgid " (UNTRUSTED KEYS:"
 msgstr " (NEPREVERJENI KLJUÈI:"
 
-#: lib/rpmchecksig.c:868 lib/rpmchecksig.c:882
+#: lib/rpmchecksig.c:926 lib/rpmchecksig.c:940
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:876
+#: lib/rpmchecksig.c:934
 msgid "OK"
 msgstr "V REDU"
 
diff --git a/po/sr.po b/po/sr.po
index 6b01cb73e..8be0cfd70 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-12 14:51-0400\n"
+"POT-Creation-Date: 2002-07-12 18:01-0400\n"
 "Content-Type: text/plain; charset=\n"
 "Date: 1998-05-02 21:41:47-0400\n"
 
@@ -1634,7 +1634,7 @@ 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:216 lib/rpmchecksig.c:180 lib/rpmchecksig.c:608
+#: lib/package.c:216 lib/rpmchecksig.c:209 lib/rpmchecksig.c:666
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: Neuspeo 'readLead'\n"
@@ -1650,27 +1650,27 @@ 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:248 lib/rpmchecksig.c:198 lib/rpmchecksig.c:624
+#: lib/package.c:248 lib/rpmchecksig.c:227 lib/rpmchecksig.c:682
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: Neuspelo 'rpmReadSignature'\n"
 
-#: lib/package.c:252 lib/rpmchecksig.c:202 lib/rpmchecksig.c:629
+#: lib/package.c:252 lib/rpmchecksig.c:231 lib/rpmchecksig.c:687
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Potpis nije na raspolaganju\n"
 
-#: lib/package.c:298 lib/rpmchecksig.c:527
+#: lib/package.c:298 lib/rpmchecksig.c:585
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: Neuspeo 'readLead'\n"
 
-#: lib/package.c:333 lib/package.c:358 lib/package.c:388 lib/rpmchecksig.c:700
+#: lib/package.c:333 lib/package.c:358 lib/package.c:388 lib/rpmchecksig.c:758
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
-#: lib/package.c:400 lib/rpmchecksig.c:122 lib/rpmchecksig.c:556
+#: lib/package.c:400 lib/rpmchecksig.c:122 lib/rpmchecksig.c:614
 #, fuzzy, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Neuspeo 'readLead'\n"
@@ -2387,73 +2387,78 @@ msgstr "%s: Neuspelo otvaranje\n"
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: Neuspeo 'readLead'\n"
 
-#: lib/rpmchecksig.c:185
+#: lib/rpmchecksig.c:214
 #, 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:189
+#: lib/rpmchecksig.c:218
 #, 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:290
+#: lib/rpmchecksig.c:318
+#, c-format
+msgid "%s: was already signed by key ID %s, skipping\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:348
 #, fuzzy, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: Neuspeo 'readLead'\n"
 
-#: lib/rpmchecksig.c:296
+#: lib/rpmchecksig.c:354
 #, fuzzy, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: Neuspelo 'rpmReadSignature'\n"
 
-#: lib/rpmchecksig.c:389
+#: lib/rpmchecksig.c:447
 #, fuzzy, c-format
 msgid "%s: import read failed.\n"
 msgstr "%s: Neuspeo 'readLead'\n"
 
-#: lib/rpmchecksig.c:394
+#: lib/rpmchecksig.c:452
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:399
+#: lib/rpmchecksig.c:457
 #, fuzzy, c-format
 msgid "%s: base64 encode failed.\n"
 msgstr "%s: Neuspeo 'readLead'\n"
 
-#: lib/rpmchecksig.c:541
+#: lib/rpmchecksig.c:599
 #, fuzzy, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr "%s: Neuspeo 'readLead'\n"
 
-#: lib/rpmchecksig.c:614
+#: lib/rpmchecksig.c:672
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: Potpis nije na raspolaganju (RPM v1.0)\n"
 
-#: lib/rpmchecksig.c:862
+#: lib/rpmchecksig.c:920
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:863 lib/rpmchecksig.c:877
+#: lib/rpmchecksig.c:921 lib/rpmchecksig.c:935
 #, fuzzy
 msgid " (MISSING KEYS:"
 msgstr " (NEDOSTAJUÆI KLJUÈEVI)"
 
-#: lib/rpmchecksig.c:865 lib/rpmchecksig.c:879
+#: lib/rpmchecksig.c:923 lib/rpmchecksig.c:937
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:866 lib/rpmchecksig.c:880
+#: lib/rpmchecksig.c:924 lib/rpmchecksig.c:938
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:868 lib/rpmchecksig.c:882
+#: lib/rpmchecksig.c:926 lib/rpmchecksig.c:940
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:876
+#: lib/rpmchecksig.c:934
 msgid "OK"
 msgstr ""
 
diff --git a/po/sv.po b/po/sv.po
index c405243a5..a57c1225d 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.1\n"
-"POT-Creation-Date: 2002-07-12 14:51-0400\n"
+"POT-Creation-Date: 2002-07-12 18:01-0400\n"
 "PO-Revision-Date: 2002-07-11 22:49+0200\n"
 "Last-Translator: Göran Uddeborg <goeran@uddeborg.pp.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -1602,7 +1602,7 @@ msgstr "kan inte skriva till %%%s %s\n"
 msgid "error creating temporary file %s\n"
 msgstr "fel när tämporärfil %s skapades\n"
 
-#: lib/package.c:216 lib/rpmchecksig.c:180 lib/rpmchecksig.c:608
+#: lib/package.c:216 lib/rpmchecksig.c:209 lib/rpmchecksig.c:666
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: readLead misslyckades\n"
@@ -1616,27 +1616,27 @@ 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:248 lib/rpmchecksig.c:198 lib/rpmchecksig.c:624
+#: lib/package.c:248 lib/rpmchecksig.c:227 lib/rpmchecksig.c:682
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: rpmReadSignature misslyckades\n"
 
-#: lib/package.c:252 lib/rpmchecksig.c:202 lib/rpmchecksig.c:629
+#: lib/package.c:252 lib/rpmchecksig.c:231 lib/rpmchecksig.c:687
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Ingen signatur tillgänglig\n"
 
-#: lib/package.c:298 lib/rpmchecksig.c:527
+#: lib/package.c:298 lib/rpmchecksig.c:585
 #, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: headerRead misslyckades\n"
 
-#: lib/package.c:333 lib/package.c:358 lib/package.c:388 lib/rpmchecksig.c:700
+#: lib/package.c:333 lib/package.c:358 lib/package.c:388 lib/rpmchecksig.c:758
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr "endast V3-signaturer kan verifieras, hoppar över V%u-signatur"
 
-#: lib/package.c:400 lib/rpmchecksig.c:122 lib/rpmchecksig.c:556
+#: lib/package.c:400 lib/rpmchecksig.c:122 lib/rpmchecksig.c:614
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Fread misslyckades: %s\n"
@@ -2297,72 +2297,77 @@ msgstr "makeTempFile misslyckades\n"
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: Fwrite misslyckades: %s\n"
 
-#: lib/rpmchecksig.c:185
+#: lib/rpmchecksig.c:214
 #, c-format
 msgid "%s: Can't sign v1 packaging\n"
 msgstr "%s: Kan inte signera v1-paketering\n"
 
-#: lib/rpmchecksig.c:189
+#: lib/rpmchecksig.c:218
 #, c-format
 msgid "%s: Can't re-sign v2 packaging\n"
 msgstr "%s: Kan inte signera om v2 paketering\n"
 
-#: lib/rpmchecksig.c:290
+#: lib/rpmchecksig.c:318
+#, c-format
+msgid "%s: was already signed by key ID %s, skipping\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:348
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: writeLead misslyckades: %s\n"
 
-#: lib/rpmchecksig.c:296
+#: lib/rpmchecksig.c:354
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmWriteSignature misslyckades: %s\n"
 
-#: lib/rpmchecksig.c:389
+#: lib/rpmchecksig.c:447
 #, c-format
 msgid "%s: import read failed.\n"
 msgstr "%s: importläsning misslyckades.\n"
 
-#: lib/rpmchecksig.c:394
+#: lib/rpmchecksig.c:452
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr "%s: inte en publik nyckel med skal.\n"
 
-#: lib/rpmchecksig.c:399
+#: lib/rpmchecksig.c:457
 #, c-format
 msgid "%s: base64 encode failed.\n"
 msgstr "%s: base64-kodning misslyckades.\n"
 
-#: lib/rpmchecksig.c:541
+#: lib/rpmchecksig.c:599
 #, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr "%s: headerGetEntry misslyckades\n"
 
-#: lib/rpmchecksig.c:614
+#: lib/rpmchecksig.c:672
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: Ingen signatur tillgänglig (v1.0 RPM)\n"
 
-#: lib/rpmchecksig.c:862
+#: lib/rpmchecksig.c:920
 msgid "NOT OK"
 msgstr "EJ OK"
 
-#: lib/rpmchecksig.c:863 lib/rpmchecksig.c:877
+#: lib/rpmchecksig.c:921 lib/rpmchecksig.c:935
 msgid " (MISSING KEYS:"
 msgstr " (SAKNADE NYCKLAR:"
 
-#: lib/rpmchecksig.c:865 lib/rpmchecksig.c:879
+#: lib/rpmchecksig.c:923 lib/rpmchecksig.c:937
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:866 lib/rpmchecksig.c:880
+#: lib/rpmchecksig.c:924 lib/rpmchecksig.c:938
 msgid " (UNTRUSTED KEYS:"
 msgstr " (EJ BETRODDA NYCKLAR:"
 
-#: lib/rpmchecksig.c:868 lib/rpmchecksig.c:882
+#: lib/rpmchecksig.c:926 lib/rpmchecksig.c:940
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:876
+#: lib/rpmchecksig.c:934
 msgid "OK"
 msgstr "OK"
 
diff --git a/po/tr.po b/po/tr.po
index 2ba934b1b..e14f3ee27 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-12 14:51-0400\n"
+"POT-Creation-Date: 2002-07-12 18:01-0400\n"
 "PO-Revision-Date: 2001-07-05 08:02+300\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -1635,7 +1635,7 @@ msgstr "%%%s dosyasına yazılamaz %s\n"
 msgid "error creating temporary file %s\n"
 msgstr "%s geçici dosyası oluşturulurken hata\n"
 
-#: lib/package.c:216 lib/rpmchecksig.c:180 lib/rpmchecksig.c:608
+#: lib/package.c:216 lib/rpmchecksig.c:209 lib/rpmchecksig.c:666
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: readLead başarısız\n"
@@ -1651,27 +1651,27 @@ msgstr ""
 "RPM'nin bu sürümünde sadece ilk sürüm rakamı <= 4 olan paketler "
 "destekleniyor\n"
 
-#: lib/package.c:248 lib/rpmchecksig.c:198 lib/rpmchecksig.c:624
+#: lib/package.c:248 lib/rpmchecksig.c:227 lib/rpmchecksig.c:682
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: rpmReadSignature başarısız\n"
 
-#: lib/package.c:252 lib/rpmchecksig.c:202 lib/rpmchecksig.c:629
+#: lib/package.c:252 lib/rpmchecksig.c:231 lib/rpmchecksig.c:687
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: İmza bulundurmuyor\n"
 
-#: lib/package.c:298 lib/rpmchecksig.c:527
+#: lib/package.c:298 lib/rpmchecksig.c:585
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: readLead başarısız\n"
 
-#: lib/package.c:333 lib/package.c:358 lib/package.c:388 lib/rpmchecksig.c:700
+#: lib/package.c:333 lib/package.c:358 lib/package.c:388 lib/rpmchecksig.c:758
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
-#: lib/package.c:400 lib/rpmchecksig.c:122 lib/rpmchecksig.c:556
+#: lib/package.c:400 lib/rpmchecksig.c:122 lib/rpmchecksig.c:614
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Fread başarısız: %s\n"
@@ -2355,72 +2355,77 @@ msgstr "makeTempFile başarısız\n"
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: Fwrite başarısız: %s\n"
 
-#: lib/rpmchecksig.c:185
+#: lib/rpmchecksig.c:214
 #, 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:189
+#: lib/rpmchecksig.c:218
 #, 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:290
+#: lib/rpmchecksig.c:318
+#, c-format
+msgid "%s: was already signed by key ID %s, skipping\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:348
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: writeLead başarısız: %s\n"
 
-#: lib/rpmchecksig.c:296
+#: lib/rpmchecksig.c:354
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmWriteSignature başarısız: %s\n"
 
-#: lib/rpmchecksig.c:389
+#: lib/rpmchecksig.c:447
 #, fuzzy, c-format
 msgid "%s: import read failed.\n"
 msgstr "%s: readLead başarısız\n"
 
-#: lib/rpmchecksig.c:394
+#: lib/rpmchecksig.c:452
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:399
+#: lib/rpmchecksig.c:457
 #, fuzzy, c-format
 msgid "%s: base64 encode failed.\n"
 msgstr "%s: readLead başarısız\n"
 
-#: lib/rpmchecksig.c:541
+#: lib/rpmchecksig.c:599
 #, fuzzy, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr "%s: readLead başarısız\n"
 
-#: lib/rpmchecksig.c:614
+#: lib/rpmchecksig.c:672
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: İmza bulundurmuyor (v1.0 RPM)\n"
 
-#: lib/rpmchecksig.c:862
+#: lib/rpmchecksig.c:920
 msgid "NOT OK"
 msgstr "TAMAM DEĞİL"
 
-#: lib/rpmchecksig.c:863 lib/rpmchecksig.c:877
+#: lib/rpmchecksig.c:921 lib/rpmchecksig.c:935
 msgid " (MISSING KEYS:"
 msgstr " (EKSİK ANAHTARLAR:"
 
-#: lib/rpmchecksig.c:865 lib/rpmchecksig.c:879
+#: lib/rpmchecksig.c:923 lib/rpmchecksig.c:937
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:866 lib/rpmchecksig.c:880
+#: lib/rpmchecksig.c:924 lib/rpmchecksig.c:938
 msgid " (UNTRUSTED KEYS:"
 msgstr " (GÜVENCESİZ ANAHTARLAR:"
 
-#: lib/rpmchecksig.c:868 lib/rpmchecksig.c:882
+#: lib/rpmchecksig.c:926 lib/rpmchecksig.c:940
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:876
+#: lib/rpmchecksig.c:934
 msgid "OK"
 msgstr "Tamam"
 
diff --git a/po/uk.po b/po/uk.po
index c80d4ee57..a9f56752a 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-12 14:51-0400\n"
+"POT-Creation-Date: 2002-07-12 18:01-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1584,7 +1584,7 @@ msgstr ""
 msgid "error creating temporary file %s\n"
 msgstr ""
 
-#: lib/package.c:216 lib/rpmchecksig.c:180 lib/rpmchecksig.c:608
+#: lib/package.c:216 lib/rpmchecksig.c:209 lib/rpmchecksig.c:666
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
@@ -1598,27 +1598,27 @@ msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:248 lib/rpmchecksig.c:198 lib/rpmchecksig.c:624
+#: lib/package.c:248 lib/rpmchecksig.c:227 lib/rpmchecksig.c:682
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/package.c:252 lib/rpmchecksig.c:202 lib/rpmchecksig.c:629
+#: lib/package.c:252 lib/rpmchecksig.c:231 lib/rpmchecksig.c:687
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/package.c:298 lib/rpmchecksig.c:527
+#: lib/package.c:298 lib/rpmchecksig.c:585
 #, c-format
 msgid "%s: headerRead failed\n"
 msgstr ""
 
-#: lib/package.c:333 lib/package.c:358 lib/package.c:388 lib/rpmchecksig.c:700
+#: lib/package.c:333 lib/package.c:358 lib/package.c:388 lib/rpmchecksig.c:758
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
-#: lib/package.c:400 lib/rpmchecksig.c:122 lib/rpmchecksig.c:556
+#: lib/package.c:400 lib/rpmchecksig.c:122 lib/rpmchecksig.c:614
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr ""
@@ -2272,72 +2272,77 @@ msgstr ""
 msgid "%s: Fwrite failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:185
+#: lib/rpmchecksig.c:214
 #, c-format
 msgid "%s: Can't sign v1 packaging\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:189
+#: lib/rpmchecksig.c:218
 #, c-format
 msgid "%s: Can't re-sign v2 packaging\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:290
+#: lib/rpmchecksig.c:318
+#, c-format
+msgid "%s: was already signed by key ID %s, skipping\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:348
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:296
+#: lib/rpmchecksig.c:354
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:389
+#: lib/rpmchecksig.c:447
 #, c-format
 msgid "%s: import read failed.\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:394
+#: lib/rpmchecksig.c:452
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:399
+#: lib/rpmchecksig.c:457
 #, c-format
 msgid "%s: base64 encode failed.\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:541
+#: lib/rpmchecksig.c:599
 #, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:614
+#: lib/rpmchecksig.c:672
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:862
+#: lib/rpmchecksig.c:920
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:863 lib/rpmchecksig.c:877
+#: lib/rpmchecksig.c:921 lib/rpmchecksig.c:935
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:865 lib/rpmchecksig.c:879
+#: lib/rpmchecksig.c:923 lib/rpmchecksig.c:937
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:866 lib/rpmchecksig.c:880
+#: lib/rpmchecksig.c:924 lib/rpmchecksig.c:938
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:868 lib/rpmchecksig.c:882
+#: lib/rpmchecksig.c:926 lib/rpmchecksig.c:940
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:876
+#: lib/rpmchecksig.c:934
 msgid "OK"
 msgstr ""
 
diff --git a/po/wa.po b/po/wa.po
index c80d4ee57..a9f56752a 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-12 14:51-0400\n"
+"POT-Creation-Date: 2002-07-12 18:01-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1584,7 +1584,7 @@ msgstr ""
 msgid "error creating temporary file %s\n"
 msgstr ""
 
-#: lib/package.c:216 lib/rpmchecksig.c:180 lib/rpmchecksig.c:608
+#: lib/package.c:216 lib/rpmchecksig.c:209 lib/rpmchecksig.c:666
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
@@ -1598,27 +1598,27 @@ msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:248 lib/rpmchecksig.c:198 lib/rpmchecksig.c:624
+#: lib/package.c:248 lib/rpmchecksig.c:227 lib/rpmchecksig.c:682
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/package.c:252 lib/rpmchecksig.c:202 lib/rpmchecksig.c:629
+#: lib/package.c:252 lib/rpmchecksig.c:231 lib/rpmchecksig.c:687
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/package.c:298 lib/rpmchecksig.c:527
+#: lib/package.c:298 lib/rpmchecksig.c:585
 #, c-format
 msgid "%s: headerRead failed\n"
 msgstr ""
 
-#: lib/package.c:333 lib/package.c:358 lib/package.c:388 lib/rpmchecksig.c:700
+#: lib/package.c:333 lib/package.c:358 lib/package.c:388 lib/rpmchecksig.c:758
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
-#: lib/package.c:400 lib/rpmchecksig.c:122 lib/rpmchecksig.c:556
+#: lib/package.c:400 lib/rpmchecksig.c:122 lib/rpmchecksig.c:614
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr ""
@@ -2272,72 +2272,77 @@ msgstr ""
 msgid "%s: Fwrite failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:185
+#: lib/rpmchecksig.c:214
 #, c-format
 msgid "%s: Can't sign v1 packaging\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:189
+#: lib/rpmchecksig.c:218
 #, c-format
 msgid "%s: Can't re-sign v2 packaging\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:290
+#: lib/rpmchecksig.c:318
+#, c-format
+msgid "%s: was already signed by key ID %s, skipping\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:348
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:296
+#: lib/rpmchecksig.c:354
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:389
+#: lib/rpmchecksig.c:447
 #, c-format
 msgid "%s: import read failed.\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:394
+#: lib/rpmchecksig.c:452
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:399
+#: lib/rpmchecksig.c:457
 #, c-format
 msgid "%s: base64 encode failed.\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:541
+#: lib/rpmchecksig.c:599
 #, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:614
+#: lib/rpmchecksig.c:672
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:862
+#: lib/rpmchecksig.c:920
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:863 lib/rpmchecksig.c:877
+#: lib/rpmchecksig.c:921 lib/rpmchecksig.c:935
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:865 lib/rpmchecksig.c:879
+#: lib/rpmchecksig.c:923 lib/rpmchecksig.c:937
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:866 lib/rpmchecksig.c:880
+#: lib/rpmchecksig.c:924 lib/rpmchecksig.c:938
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:868 lib/rpmchecksig.c:882
+#: lib/rpmchecksig.c:926 lib/rpmchecksig.c:940
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:876
+#: lib/rpmchecksig.c:934
 msgid "OK"
 msgstr ""
 
diff --git a/po/zh.po b/po/zh.po
index c80d4ee57..a9f56752a 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-12 14:51-0400\n"
+"POT-Creation-Date: 2002-07-12 18:01-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1584,7 +1584,7 @@ msgstr ""
 msgid "error creating temporary file %s\n"
 msgstr ""
 
-#: lib/package.c:216 lib/rpmchecksig.c:180 lib/rpmchecksig.c:608
+#: lib/package.c:216 lib/rpmchecksig.c:209 lib/rpmchecksig.c:666
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
@@ -1598,27 +1598,27 @@ msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:248 lib/rpmchecksig.c:198 lib/rpmchecksig.c:624
+#: lib/package.c:248 lib/rpmchecksig.c:227 lib/rpmchecksig.c:682
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/package.c:252 lib/rpmchecksig.c:202 lib/rpmchecksig.c:629
+#: lib/package.c:252 lib/rpmchecksig.c:231 lib/rpmchecksig.c:687
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/package.c:298 lib/rpmchecksig.c:527
+#: lib/package.c:298 lib/rpmchecksig.c:585
 #, c-format
 msgid "%s: headerRead failed\n"
 msgstr ""
 
-#: lib/package.c:333 lib/package.c:358 lib/package.c:388 lib/rpmchecksig.c:700
+#: lib/package.c:333 lib/package.c:358 lib/package.c:388 lib/rpmchecksig.c:758
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
-#: lib/package.c:400 lib/rpmchecksig.c:122 lib/rpmchecksig.c:556
+#: lib/package.c:400 lib/rpmchecksig.c:122 lib/rpmchecksig.c:614
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr ""
@@ -2272,72 +2272,77 @@ msgstr ""
 msgid "%s: Fwrite failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:185
+#: lib/rpmchecksig.c:214
 #, c-format
 msgid "%s: Can't sign v1 packaging\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:189
+#: lib/rpmchecksig.c:218
 #, c-format
 msgid "%s: Can't re-sign v2 packaging\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:290
+#: lib/rpmchecksig.c:318
+#, c-format
+msgid "%s: was already signed by key ID %s, skipping\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:348
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:296
+#: lib/rpmchecksig.c:354
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:389
+#: lib/rpmchecksig.c:447
 #, c-format
 msgid "%s: import read failed.\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:394
+#: lib/rpmchecksig.c:452
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:399
+#: lib/rpmchecksig.c:457
 #, c-format
 msgid "%s: base64 encode failed.\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:541
+#: lib/rpmchecksig.c:599
 #, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:614
+#: lib/rpmchecksig.c:672
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:862
+#: lib/rpmchecksig.c:920
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:863 lib/rpmchecksig.c:877
+#: lib/rpmchecksig.c:921 lib/rpmchecksig.c:935
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:865 lib/rpmchecksig.c:879
+#: lib/rpmchecksig.c:923 lib/rpmchecksig.c:937
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:866 lib/rpmchecksig.c:880
+#: lib/rpmchecksig.c:924 lib/rpmchecksig.c:938
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:868 lib/rpmchecksig.c:882
+#: lib/rpmchecksig.c:926 lib/rpmchecksig.c:940
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:876
+#: lib/rpmchecksig.c:934
 msgid "OK"
 msgstr ""
 
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index c80d4ee57..a9f56752a 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-07-12 14:51-0400\n"
+"POT-Creation-Date: 2002-07-12 18:01-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1584,7 +1584,7 @@ msgstr ""
 msgid "error creating temporary file %s\n"
 msgstr ""
 
-#: lib/package.c:216 lib/rpmchecksig.c:180 lib/rpmchecksig.c:608
+#: lib/package.c:216 lib/rpmchecksig.c:209 lib/rpmchecksig.c:666
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
@@ -1598,27 +1598,27 @@ msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:248 lib/rpmchecksig.c:198 lib/rpmchecksig.c:624
+#: lib/package.c:248 lib/rpmchecksig.c:227 lib/rpmchecksig.c:682
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/package.c:252 lib/rpmchecksig.c:202 lib/rpmchecksig.c:629
+#: lib/package.c:252 lib/rpmchecksig.c:231 lib/rpmchecksig.c:687
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/package.c:298 lib/rpmchecksig.c:527
+#: lib/package.c:298 lib/rpmchecksig.c:585
 #, c-format
 msgid "%s: headerRead failed\n"
 msgstr ""
 
-#: lib/package.c:333 lib/package.c:358 lib/package.c:388 lib/rpmchecksig.c:700
+#: lib/package.c:333 lib/package.c:358 lib/package.c:388 lib/rpmchecksig.c:758
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
-#: lib/package.c:400 lib/rpmchecksig.c:122 lib/rpmchecksig.c:556
+#: lib/package.c:400 lib/rpmchecksig.c:122 lib/rpmchecksig.c:614
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr ""
@@ -2272,72 +2272,77 @@ msgstr ""
 msgid "%s: Fwrite failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:185
+#: lib/rpmchecksig.c:214
 #, c-format
 msgid "%s: Can't sign v1 packaging\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:189
+#: lib/rpmchecksig.c:218
 #, c-format
 msgid "%s: Can't re-sign v2 packaging\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:290
+#: lib/rpmchecksig.c:318
+#, c-format
+msgid "%s: was already signed by key ID %s, skipping\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:348
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:296
+#: lib/rpmchecksig.c:354
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:389
+#: lib/rpmchecksig.c:447
 #, c-format
 msgid "%s: import read failed.\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:394
+#: lib/rpmchecksig.c:452
 #, c-format
 msgid "%s: not an armored public key.\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:399
+#: lib/rpmchecksig.c:457
 #, c-format
 msgid "%s: base64 encode failed.\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:541
+#: lib/rpmchecksig.c:599
 #, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:614
+#: lib/rpmchecksig.c:672
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:862
+#: lib/rpmchecksig.c:920
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:863 lib/rpmchecksig.c:877
+#: lib/rpmchecksig.c:921 lib/rpmchecksig.c:935
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:865 lib/rpmchecksig.c:879
+#: lib/rpmchecksig.c:923 lib/rpmchecksig.c:937
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:866 lib/rpmchecksig.c:880
+#: lib/rpmchecksig.c:924 lib/rpmchecksig.c:938
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:868 lib/rpmchecksig.c:882
+#: lib/rpmchecksig.c:926 lib/rpmchecksig.c:940
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:876
+#: lib/rpmchecksig.c:934
 msgid "OK"
 msgstr ""
 
diff --git a/rpm.spec.in b/rpm.spec.in
index a9a33c2cc..bac651f71 100644
--- a/rpm.spec.in
+++ b/rpm.spec.in
@@ -17,7 +17,7 @@ Name: rpm
 %define version @VERSION@
 Version: %{version}
 %{expand: %%define rpm_version %{version}}
-Release: 0.46
+Release: 0.47
 Group: System Environment/Base
 Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz
 Copyright: GPL
@@ -514,8 +514,9 @@ fi
 %{__prefix}/include/popt.h
 
 %changelog
-* Fri Jul 12 2002 Jeff Johnson <jbj@redhat.com> 4.1-0.46
+* Fri Jul 12 2002 Jeff Johnson <jbj@redhat.com> 4.1-0.47
 - display signature details using rpm -qi.
+- skip signing packages already signed with same key (#62118).
 
 * Thu Jul 11 2002 Jeff Johnson <jbj@redhat.com> 4.1-0.45
 - placeholders for manifest constants for SuSE patch packages.