- make --addsign and --resign behave exactly the same.

CVS patchset: 5350
CVS date: 2002/03/10 15:16:57

diff --git a/CHANGES b/CHANGES
index ee6c6f8..a0bb904 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -93,6 +93,7 @@
 `      - don't bother with signing check if 16 bits of hash don't match.
        - only V3 signatures for now.
        - wire --nodigest/--nosignature options to checksig/query/verify modes.
+       - make --addsign and --resign behave exactly the same.
 
 4.0.3 -> 4.0.4:
        - solaris: translate i86pc to i386 (#57182).

diff --git a/beecrypt/javaglue.c b/beecrypt/javaglue.c
index aa408be..251abfc 100644 (file)
--- a/beecrypt/javaglue.c
+++ b/beecrypt/javaglue.c
@@ -4,14 +4,15 @@
 
 #define BEECRYPT_DLL_EXPORT
 
-#if defined(__LCLINT__)
-#endif
 #define        JNIEXPORT /*@unused@*/
 #define        JNICALL
 
 #include "beecrypt.h"
 #include "blockmode.h"
 
+#undef JAVAGLUE
+#define        JAVAGLUE        0       /* XXX disable for now */
+
 #if JAVAGLUE
 
 #if HAVE_STDLIB_H

diff --git a/lib/rpmchecksig.c b/lib/rpmchecksig.c
index 2a977bd..16b22f1 100644 (file)
--- a/lib/rpmchecksig.c
+++ b/lib/rpmchecksig.c
@@ -139,7 +139,7 @@ static int rpmReSign(/*@unused@*/ rpmTransactionSet ts,
     FD_t fd = NULL;
     FD_t ofd = NULL;
     struct rpmlead lead, *l = &lead;
-    int sigtype;
+    int_32 sigtag;
     const char *rpm, *trpm;
     const char *sigtarget = NULL;
     char tmprpm[1024+1];
@@ -205,24 +205,33 @@ static int rpmReSign(/*@unused@*/ rpmTransactionSet ts,
            nh = headerFree(nh, NULL);
        }
 
-       /* Toss the current signatures and recompute if not --addsign. */
-       if (qva->qva_mode != RPMSIGN_ADD_SIGNATURE) {
-
-           (void) headerRemoveEntry(sig, RPMSIGTAG_SIZE);
-           (void) rpmAddSignature(sig, sigtarget, RPMSIGTAG_SIZE, qva->passPhrase);
-           (void) headerRemoveEntry(sig, RPMSIGTAG_LEMD5_1);
-           (void) headerRemoveEntry(sig, RPMSIGTAG_LEMD5_2);
-           (void) headerRemoveEntry(sig, RPMSIGTAG_MD5);
-           (void) rpmAddSignature(sig, sigtarget, RPMSIGTAG_MD5, qva->passPhrase);
-           (void) headerRemoveEntry(sig, RPMSIGTAG_SHA1);
-           (void) rpmAddSignature(sig, sigtarget, RPMSIGTAG_SHA1, qva->passPhrase);
+       /* Eliminate broken digest values. */
+       (void) headerRemoveEntry(sig, RPMSIGTAG_LEMD5_1);
+       (void) headerRemoveEntry(sig, RPMSIGTAG_LEMD5_2);
+       (void) headerRemoveEntry(sig, RPMSIGTAG_BADSHA1_1);
+       (void) headerRemoveEntry(sig, RPMSIGTAG_BADSHA1_2);
 
-       }
+       /* Toss and recalculate header+payload size and digests. */
+       (void) headerRemoveEntry(sig, RPMSIGTAG_SIZE);
+       (void) rpmAddSignature(sig, sigtarget, RPMSIGTAG_SIZE, qva->passPhrase);
+       (void) headerRemoveEntry(sig, RPMSIGTAG_MD5);
+       (void) rpmAddSignature(sig, sigtarget, RPMSIGTAG_MD5, qva->passPhrase);
+       (void) headerRemoveEntry(sig, RPMSIGTAG_SHA1);
+       (void) rpmAddSignature(sig, sigtarget, RPMSIGTAG_SHA1, qva->passPhrase);
 
        /* If gpg/pgp is configured, replace the signature. */
-       if ((sigtype = rpmLookupSignatureType(RPMLOOKUPSIG_QUERY)) > 0) {
-           (void) headerRemoveEntry(sig, sigtype);
-           (void) rpmAddSignature(sig, sigtarget, sigtype, qva->passPhrase);
+       if ((sigtag = rpmLookupSignatureType(RPMLOOKUPSIG_QUERY)) > 0) {
+           switch (sigtag) {
+           case RPMSIGTAG_GPG:
+               (void) headerRemoveEntry(sig, RPMSIGTAG_DSA);
+               /*@fallthrough@*/
+           case RPMSIGTAG_PGP5:
+           case RPMSIGTAG_PGP:
+               (void) headerRemoveEntry(sig, RPMSIGTAG_RSA);
+               break;
+           }
+           (void) headerRemoveEntry(sig, sigtag);
+           (void) rpmAddSignature(sig, sigtarget, sigtag, qva->passPhrase);
        }
 
        /* Reallocate the signature into one contiguous region. */

diff --git a/lib/rpmlib.h b/lib/rpmlib.h
index 6f29c8e..caedeeb 100644 (file)
--- a/lib/rpmlib.h
+++ b/lib/rpmlib.h
@@ -216,20 +216,19 @@ typedef enum rpmTag_e {
 /* XXX 2nd underscore prevents tagTable generation */
     RPMTAG_SIG_BASE            = HEADER_SIGBASE,
     RPMTAG_SIGSIZE             = RPMTAG_SIG_BASE+1,
-    RPMTAG_SIGLEMD5_1          = RPMTAG_SIG_BASE+2,    /*!< internal */
+    RPMTAG_SIGLEMD5_1          = RPMTAG_SIG_BASE+2,    /*!< internal - obsolete */
     RPMTAG_SIGPGP              = RPMTAG_SIG_BASE+3,
-    RPMTAG_SIGLEMD5_2          = RPMTAG_SIG_BASE+4,    /*!< internal */
+    RPMTAG_SIGLEMD5_2          = RPMTAG_SIG_BASE+4,    /*!< internal - obsolete */
     RPMTAG_SIGMD5              = RPMTAG_SIG_BASE+5,
     RPMTAG_SIGGPG              = RPMTAG_SIG_BASE+6,
-    RPMTAG_SIGPGP5             = RPMTAG_SIG_BASE+7,    /*!< internal */
+    RPMTAG_SIGPGP5             = RPMTAG_SIG_BASE+7,    /*!< internal - obsolete */
 
-/*@-enummemuse@*/
-    RPMTAG_BADSHA1HEADER       = RPMTAG_SIG_BASE+8,    /*!< internal */
-/*@=enummemuse@*/
-    RPMTAG_SHA1HEADER          = RPMTAG_SIG_BASE+9,
+    RPMTAG_BADSHA1_1           = RPMTAG_SIG_BASE+8,    /*!< internal - obsolete */
+    RPMTAG_BADSHA1_2           = RPMTAG_SIG_BASE+9,    /*!< internal - obsolete */
     RPMTAG_PUBKEYS             = RPMTAG_SIG_BASE+10,
     RPMTAG_DSAHEADER           = RPMTAG_SIG_BASE+11,
     RPMTAG_RSAHEADER           = RPMTAG_SIG_BASE+12,
+    RPMTAG_SHA1HEADER          = RPMTAG_SIG_BASE+13,
 
     RPMTAG_NAME                = 1000,
     RPMTAG_VERSION             = 1001,
@@ -1790,6 +1789,8 @@ enum rpmtagSignature {
     RPMSIGTAG_PGP5     = 1006, /*!< PGP5 signature @deprecated legacy. */
     RPMSIGTAG_PAYLOADSIZE = 1007,
                                /*!< uncompressed payload size in bytes. */
+    RPMSIGTAG_BADSHA1_1        = RPMTAG_BADSHA1_1,     /*!< Broken SHA1, take 1. */
+    RPMSIGTAG_BADSHA1_2        = RPMTAG_BADSHA1_2,     /*!< Broken SHA1, take 2. */
     RPMSIGTAG_SHA1     = RPMTAG_SHA1HEADER,    /*!< sha1 header digest. */
     RPMSIGTAG_DSA      = RPMTAG_DSAHEADER,     /*!< DSA header signature. */
     RPMSIGTAG_RSA      = RPMTAG_RSAHEADER      /*!< RSA header signature. */

diff --git a/po/cs.po b/po/cs.po
index 65c8d19..c303a1d 100644 (file)
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-03-08 17:22-0500\n"
+"POT-Creation-Date: 2002-03-09 14:38-0500\n"
 "PO-Revision-Date: 2001-07-24 10:02+0100\n"
 "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -1630,7 +1630,7 @@ 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:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:548
+#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:557
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: readLead selhalo\n"
@@ -1640,27 +1640,27 @@ msgstr "%s: readLead selhalo\n"
 msgid "%s: bad magic\n"
 msgstr "©patné magické èíslo"
 
-#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:564
+#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:573
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: rpmReadSignature selhalo\n"
 
-#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:569
+#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:578
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Není dostupný ¾ádný podpis\n"
 
-#: lib/package.c:331 lib/rpmchecksig.c:467
+#: lib/package.c:331 lib/rpmchecksig.c:476
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: readLead selhalo\n"
 
-#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:642
+#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:651
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
-#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:496
+#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:505
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Fread selhalo: %s\n"
@@ -2412,47 +2412,47 @@ msgstr "%s: RPM v1.0 nelze podepsat\n"
 msgid "%s: Can't re-sign v2 packaging\n"
 msgstr "%s: Nemohu znovu podepsat RPM v2.0\n"
 
-#: lib/rpmchecksig.c:244
+#: lib/rpmchecksig.c:253
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: writeLead selhalo: %s\n"
 
-#: lib/rpmchecksig.c:250
+#: lib/rpmchecksig.c:259
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmWriteSignature selhalo: %s\n"
 
-#: lib/rpmchecksig.c:481
+#: lib/rpmchecksig.c:490
 #, fuzzy, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr "%s: readLead selhalo\n"
 
-#: lib/rpmchecksig.c:554
+#: lib/rpmchecksig.c:563
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: Není dostupný ¾ádný podpis (RPM v1.0)\n"
 
-#: lib/rpmchecksig.c:801
+#: lib/rpmchecksig.c:810
 msgid "NOT OK"
 msgstr "NENÍ OK"
 
-#: lib/rpmchecksig.c:802 lib/rpmchecksig.c:816
+#: lib/rpmchecksig.c:811 lib/rpmchecksig.c:825
 msgid " (MISSING KEYS:"
 msgstr " (CHYBÍ KLÍÈ:"
 
-#: lib/rpmchecksig.c:804 lib/rpmchecksig.c:818
+#: lib/rpmchecksig.c:813 lib/rpmchecksig.c:827
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819
+#: lib/rpmchecksig.c:814 lib/rpmchecksig.c:828
 msgid " (UNTRUSTED KEYS:"
 msgstr " (NEDÙVÌRYHODNÝ KLÍÈ:"
 
-#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821
+#: lib/rpmchecksig.c:816 lib/rpmchecksig.c:830
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:815
+#: lib/rpmchecksig.c:824
 msgid "OK"
 msgstr "OK"
 

diff --git a/po/da.po b/po/da.po
index ef852ab..00946d9 100644 (file)
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-03-08 17:22-0500\n"
+"POT-Creation-Date: 2002-03-09 14:38-0500\n"
 "PO-Revision-Date: 2001-04-05 23:03GMT\n"
 "Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -1630,7 +1630,7 @@ msgid ""
 msgstr ""
 "kun indpakninger med hovedversion <= 4 understøttes af denne udgave af RPM\n"
 
-#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:548
+#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:557
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: readLead mislykkedes\n"
@@ -1640,27 +1640,27 @@ msgstr "%s: readLead mislykkedes\n"
 msgid "%s: bad magic\n"
 msgstr "Ugyldigt magisk tal"
 
-#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:564
+#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:573
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: rpmReadSignature mislykkedes\n"
 
-#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:569
+#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:578
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Ingen tilgængelig signatur\n"
 
-#: lib/package.c:331 lib/rpmchecksig.c:467
+#: lib/package.c:331 lib/rpmchecksig.c:476
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: readLead mislykkedes\n"
 
-#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:642
+#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:651
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
-#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:496
+#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:505
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Fread mislykkedes: %s\n"
@@ -2430,47 +2430,47 @@ msgstr "%s: Kan ikke underskrive v1.0 RPM\n"
 msgid "%s: Can't re-sign v2 packaging\n"
 msgstr "%s: Kan ikke genunderskrive v2.0 RPM\n"
 
-#: lib/rpmchecksig.c:244
+#: lib/rpmchecksig.c:253
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: writeLead mislykkedes: %s\n"
 
-#: lib/rpmchecksig.c:250
+#: lib/rpmchecksig.c:259
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmWriteSignature mislykkedes: %s\n"
 
-#: lib/rpmchecksig.c:481
+#: lib/rpmchecksig.c:490
 #, fuzzy, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr "%s: readLead mislykkedes\n"
 
-#: lib/rpmchecksig.c:554
+#: lib/rpmchecksig.c:563
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: Ingen tilgængelig signatur (v1.0 RPM)\n"
 
-#: lib/rpmchecksig.c:801
+#: lib/rpmchecksig.c:810
 msgid "NOT OK"
 msgstr "IKKE O.K."
 
-#: lib/rpmchecksig.c:802 lib/rpmchecksig.c:816
+#: lib/rpmchecksig.c:811 lib/rpmchecksig.c:825
 msgid " (MISSING KEYS:"
 msgstr " (MANGLENDE NØGLER:    "
 
-#: lib/rpmchecksig.c:804 lib/rpmchecksig.c:818
+#: lib/rpmchecksig.c:813 lib/rpmchecksig.c:827
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819
+#: lib/rpmchecksig.c:814 lib/rpmchecksig.c:828
 msgid " (UNTRUSTED KEYS:"
 msgstr " (IKKE-BETROEDE NØGLER:"
 
-#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821
+#: lib/rpmchecksig.c:816 lib/rpmchecksig.c:830
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:815
+#: lib/rpmchecksig.c:824
 msgid "OK"
 msgstr "O.K."
 

diff --git a/po/de.po b/po/de.po
index 92c7ebe..b6ec1d2 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -37,7 +37,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-03-08 17:22-0500\n"
+"POT-Creation-Date: 2002-03-09 14:38-0500\n"
 "PO-Revision-Date: 1998-08-03 18:02+02:00\n"
 "Last-Translator: Karl Eichwalder <ke@SuSE.DE>\n"
 "Language-Team: German <de@li.org>\n"
@@ -1772,7 +1772,7 @@ msgid ""
 msgstr ""
 "Nur Pakete mit Hauptnummern <= 3 werden von dieser RPM-Version unterstützt"
 
-#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:548
+#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:557
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: »readLead« fehlgeschlagen\n"
@@ -1782,27 +1782,27 @@ msgstr "%s: 
 msgid "%s: bad magic\n"
 msgstr ""
 
-#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:564
+#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:573
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: »rpmReadSignature« fehlgeschlagen\n"
 
-#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:569
+#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:578
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Keine Signatur verfügbar\n"
 
-#: lib/package.c:331 lib/rpmchecksig.c:467
+#: lib/package.c:331 lib/rpmchecksig.c:476
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: »readLead« fehlgeschlagen\n"
 
-#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:642
+#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:651
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
-#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:496
+#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:505
 #, fuzzy, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: »readLead« fehlgeschlagen\n"
@@ -2607,48 +2607,48 @@ msgstr "%s: Kann v1.0-RPM nicht signieren\n"
 msgid "%s: Can't re-sign v2 packaging\n"
 msgstr "%s: Kann v2.0-RPM nicht erneuert signieren\n"
 
-#: lib/rpmchecksig.c:244
+#: lib/rpmchecksig.c:253
 #, fuzzy, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: »readLead« fehlgeschlagen\n"
 
-#: lib/rpmchecksig.c:250
+#: lib/rpmchecksig.c:259
 #, fuzzy, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: »rpmReadSignature« fehlgeschlagen\n"
 
-#: lib/rpmchecksig.c:481
+#: lib/rpmchecksig.c:490
 #, fuzzy, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr "%s: »readLead« fehlgeschlagen\n"
 
-#: lib/rpmchecksig.c:554
+#: lib/rpmchecksig.c:563
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: Keine Signatur verfügbar (v1.0 RPM)\n"
 
-#: lib/rpmchecksig.c:801
+#: lib/rpmchecksig.c:810
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:802 lib/rpmchecksig.c:816
+#: lib/rpmchecksig.c:811 lib/rpmchecksig.c:825
 #, fuzzy
 msgid " (MISSING KEYS:"
 msgstr " (FEHLENDE SCHLüSSEL)"
 
-#: lib/rpmchecksig.c:804 lib/rpmchecksig.c:818
+#: lib/rpmchecksig.c:813 lib/rpmchecksig.c:827
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819
+#: lib/rpmchecksig.c:814 lib/rpmchecksig.c:828
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821
+#: lib/rpmchecksig.c:816 lib/rpmchecksig.c:830
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:815
+#: lib/rpmchecksig.c:824
 msgid "OK"
 msgstr ""
 

diff --git a/po/fi.po b/po/fi.po
index f16a6c1..2cf6f00 100644 (file)
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-03-08 17:22-0500\n"
+"POT-Creation-Date: 2002-03-09 14:38-0500\n"
 "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
 "Language-Team: Finnish <linux@sot.com>\n"
 "Content-Type: text/plain; charset=\n"
@@ -1647,7 +1647,7 @@ msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr "tämä versio RPM:stä tukee vain suuremmman kuin 3 versionumeron paketteja"
 
-#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:548
+#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:557
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: readLead  epäonnistui\n"
@@ -1657,27 +1657,27 @@ msgstr "%s: readLead  ep
 msgid "%s: bad magic\n"
 msgstr ""
 
-#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:564
+#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:573
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: rpmReadSignature epäonnistui\n"
 
-#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:569
+#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:578
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Ei allekirjoitusta saatavilla\n"
 
-#: lib/package.c:331 lib/rpmchecksig.c:467
+#: lib/package.c:331 lib/rpmchecksig.c:476
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: readLead  epäonnistui\n"
 
-#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:642
+#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:651
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
-#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:496
+#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:505
 #, fuzzy, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: readLead  epäonnistui\n"
@@ -2464,48 +2464,48 @@ msgstr "%s: En voi allekirjoittaa v1.0 RPM:
 msgid "%s: Can't re-sign v2 packaging\n"
 msgstr "%s: En voi uudelleen allekirjoittaa v2.0 RPM:ää\n"
 
-#: lib/rpmchecksig.c:244
+#: lib/rpmchecksig.c:253
 #, fuzzy, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: readLead  epäonnistui\n"
 
-#: lib/rpmchecksig.c:250
+#: lib/rpmchecksig.c:259
 #, fuzzy, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmReadSignature epäonnistui\n"
 
-#: lib/rpmchecksig.c:481
+#: lib/rpmchecksig.c:490
 #, fuzzy, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr "%s: readLead  epäonnistui\n"
 
-#: lib/rpmchecksig.c:554
+#: lib/rpmchecksig.c:563
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: Ei allekirjoitusta saatavilla (v1.0 RPM)\n"
 
-#: lib/rpmchecksig.c:801
+#: lib/rpmchecksig.c:810
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:802 lib/rpmchecksig.c:816
+#: lib/rpmchecksig.c:811 lib/rpmchecksig.c:825
 #, fuzzy
 msgid " (MISSING KEYS:"
 msgstr "(PUUTTUVAT AVAIMET)"
 
-#: lib/rpmchecksig.c:804 lib/rpmchecksig.c:818
+#: lib/rpmchecksig.c:813 lib/rpmchecksig.c:827
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819
+#: lib/rpmchecksig.c:814 lib/rpmchecksig.c:828
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821
+#: lib/rpmchecksig.c:816 lib/rpmchecksig.c:830
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:815
+#: lib/rpmchecksig.c:824
 msgid "OK"
 msgstr ""
 

diff --git a/po/fr.po b/po/fr.po
index fca085a..81ec52c 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-03-08 17:22-0500\n"
+"POT-Creation-Date: 2002-03-09 14:38-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1680,7 +1680,7 @@ msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:548
+#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:557
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
@@ -1690,27 +1690,27 @@ msgstr ""
 msgid "%s: bad magic\n"
 msgstr ""
 
-#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:564
+#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:573
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:569
+#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:578
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/package.c:331 lib/rpmchecksig.c:467
+#: lib/package.c:331 lib/rpmchecksig.c:476
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:642
+#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:651
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
-#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:496
+#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:505
 #, fuzzy, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
@@ -2515,47 +2515,47 @@ msgstr ""
 msgid "%s: Can't re-sign v2 packaging\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:244
+#: lib/rpmchecksig.c:253
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:250
+#: lib/rpmchecksig.c:259
 #, fuzzy, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmchecksig.c:481
+#: lib/rpmchecksig.c:490
 #, fuzzy, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmchecksig.c:554
+#: lib/rpmchecksig.c:563
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:801
+#: lib/rpmchecksig.c:810
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:802 lib/rpmchecksig.c:816
+#: lib/rpmchecksig.c:811 lib/rpmchecksig.c:825
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:804 lib/rpmchecksig.c:818
+#: lib/rpmchecksig.c:813 lib/rpmchecksig.c:827
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819
+#: lib/rpmchecksig.c:814 lib/rpmchecksig.c:828
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821
+#: lib/rpmchecksig.c:816 lib/rpmchecksig.c:830
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:815
+#: lib/rpmchecksig.c:824
 msgid "OK"
 msgstr ""
 

diff --git a/po/gl.po b/po/gl.po
index 07a286d..ed2c835 100644 (file)
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2002-03-08 17:22-0500\n"
+"POT-Creation-Date: 2002-03-09 14:38-0500\n"
 "PO-Revision-Date: 2001-01-13 22:31+0100\n"
 "Last-Translator: Jesús Bravo Álvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -1591,7 +1591,7 @@ msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:548
+#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:557
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
@@ -1601,27 +1601,27 @@ msgstr ""
 msgid "%s: bad magic\n"
 msgstr ""
 
-#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:564
+#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:573
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:569
+#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:578
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/package.c:331 lib/rpmchecksig.c:467
+#: lib/package.c:331 lib/rpmchecksig.c:476
 #, c-format
 msgid "%s: headerRead failed\n"
 msgstr ""
 
-#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:642
+#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:651
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
-#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:496
+#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:505
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr ""
@@ -2349,47 +2349,47 @@ msgstr ""
 msgid "%s: Can't re-sign v2 packaging\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:244
+#: lib/rpmchecksig.c:253
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:250
+#: lib/rpmchecksig.c:259
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:481
+#: lib/rpmchecksig.c:490
 #, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:554
+#: lib/rpmchecksig.c:563
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:801
+#: lib/rpmchecksig.c:810
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:802 lib/rpmchecksig.c:816
+#: lib/rpmchecksig.c:811 lib/rpmchecksig.c:825
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:804 lib/rpmchecksig.c:818
+#: lib/rpmchecksig.c:813 lib/rpmchecksig.c:827
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819
+#: lib/rpmchecksig.c:814 lib/rpmchecksig.c:828
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821
+#: lib/rpmchecksig.c:816 lib/rpmchecksig.c:830
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:815
+#: lib/rpmchecksig.c:824
 msgid "OK"
 msgstr ""
 

diff --git a/po/is.po b/po/is.po
index 8084b16..f7793bf 100644 (file)
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-03-08 17:22-0500\n"
+"POT-Creation-Date: 2002-03-09 14:38-0500\n"
 "PO-Revision-Date: 2001-07-12 13:25+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
@@ -1598,7 +1598,7 @@ msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:548
+#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:557
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
@@ -1608,27 +1608,27 @@ msgstr ""
 msgid "%s: bad magic\n"
 msgstr ""
 
-#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:564
+#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:573
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:569
+#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:578
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/package.c:331 lib/rpmchecksig.c:467
+#: lib/package.c:331 lib/rpmchecksig.c:476
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: Fseek brást: %s\n"
 
-#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:642
+#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:651
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
-#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:496
+#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:505
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr ""
@@ -2365,47 +2365,47 @@ msgstr ""
 msgid "%s: Can't re-sign v2 packaging\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:244
+#: lib/rpmchecksig.c:253
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:250
+#: lib/rpmchecksig.c:259
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:481
+#: lib/rpmchecksig.c:490
 #, fuzzy, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr "%s: Fseek brást: %s\n"
 
-#: lib/rpmchecksig.c:554
+#: lib/rpmchecksig.c:563
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:801
+#: lib/rpmchecksig.c:810
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:802 lib/rpmchecksig.c:816
+#: lib/rpmchecksig.c:811 lib/rpmchecksig.c:825
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:804 lib/rpmchecksig.c:818
+#: lib/rpmchecksig.c:813 lib/rpmchecksig.c:827
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819
+#: lib/rpmchecksig.c:814 lib/rpmchecksig.c:828
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821
+#: lib/rpmchecksig.c:816 lib/rpmchecksig.c:830
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:815
+#: lib/rpmchecksig.c:824
 msgid "OK"
 msgstr ""
 

diff --git a/po/ja.po b/po/ja.po
index 51a7a19..481da6f 100644 (file)
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-03-08 17:22-0500\n"
+"POT-Creation-Date: 2002-03-09 14:38-0500\n"
 "PO-Revision-Date: 1999-12-01 22:49 +JST\n"
 "Last-Translator: Kanda Mitsuru <kanda@nn.iij4u.or.jp>\n"
 "Language-Team: JRPM <jrpm@linux.or.jp>\n"
@@ -1681,7 +1681,7 @@ msgid ""
 msgstr ""
 "¥á¥¸¥ã¡¼ÈÖ¹æ <=3 ¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î¤ß¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤Î RPM ¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Þ¤¹"
 
-#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:548
+#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:557
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: readLead ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n"
@@ -1691,27 +1691,27 @@ msgstr "%s: readLead 
 msgid "%s: bad magic\n"
 msgstr "ÉÔÀµ¤Ê¥Þ¥¸¥Ã¥¯"
 
-#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:564
+#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:573
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: rpmReadSignature ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n"
 
-#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:569
+#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:578
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Í­¸ú¤Ê½ð̾¤Ï¤¢¤ê¤Þ¤»¤ó\n"
 
-#: lib/package.c:331 lib/rpmchecksig.c:467
+#: lib/package.c:331 lib/rpmchecksig.c:476
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: readLead ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n"
 
-#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:642
+#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:651
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
-#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:496
+#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:505
 #, fuzzy, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Fread ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
@@ -2524,48 +2524,48 @@ msgstr "%s: v1.0 
 msgid "%s: Can't re-sign v2 packaging\n"
 msgstr "%s: v2.0 ¤Î RPM ¤Ë¤ÏºÆ½ð̾¤Ç¤­¤Þ¤»¤ó\n"
 
-#: lib/rpmchecksig.c:244
+#: lib/rpmchecksig.c:253
 #, fuzzy, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: writedLead ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s\n"
 
-#: lib/rpmchecksig.c:250
+#: lib/rpmchecksig.c:259
 #, fuzzy, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmWriteSignature ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n"
 
-#: lib/rpmchecksig.c:481
+#: lib/rpmchecksig.c:490
 #, fuzzy, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr "%s: readLead ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n"
 
-#: lib/rpmchecksig.c:554
+#: lib/rpmchecksig.c:563
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: Í­¸ú¤Ê½ð̾¤Ï¤¢¤ê¤Þ¤»¤ó(v1.0 RPM)\n"
 
-#: lib/rpmchecksig.c:801
+#: lib/rpmchecksig.c:810
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:802 lib/rpmchecksig.c:816
+#: lib/rpmchecksig.c:811 lib/rpmchecksig.c:825
 #, fuzzy
 msgid " (MISSING KEYS:"
 msgstr " (¥­¡¼¤Îʶ¼º) "
 
-#: lib/rpmchecksig.c:804 lib/rpmchecksig.c:818
+#: lib/rpmchecksig.c:813 lib/rpmchecksig.c:827
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819
+#: lib/rpmchecksig.c:814 lib/rpmchecksig.c:828
 msgid " (UNTRUSTED KEYS:"
 msgstr " (¿®Íê¤Ç¤­¤Ê¤¤¸°:"
 
-#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821
+#: lib/rpmchecksig.c:816 lib/rpmchecksig.c:830
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:815
+#: lib/rpmchecksig.c:824
 msgid "OK"
 msgstr ""
 

diff --git a/po/ko.po b/po/ko.po
index 3455636..6f85409 100644 (file)
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-03-08 17:22-0500\n"
+"POT-Creation-Date: 2002-03-09 14:38-0500\n"
 "PO-Revision-Date: 2001-09-07 22:03+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
@@ -1622,7 +1622,7 @@ msgid ""
 msgstr ""
 "ÀÌ RPM ¹öÀü¿¡¼­´Â ÁÖ¿ä ¹øÈ£(major number) <= 4 ÀÇ ÆÐŰ¡ ¸¸À» Áö¿øÇÕ´Ï´Ù\n"
 
-#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:548
+#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:557
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: readLead¿¡ ½ÇÆÐÇß½À´Ï´Ù\n"
@@ -1632,27 +1632,27 @@ msgstr "%s: readLead
 msgid "%s: bad magic\n"
 msgstr "À߸øµÈ magic ÀÔ´Ï´Ù"
 
-#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:564
+#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:573
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: rpmReadSignature¿¡ ½ÇÆÐÇß½À´Ï´Ù\n"
 
-#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:569
+#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:578
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: À¯È¿ÇÑ ¼­¸íÀÌ ¾ø½À´Ï´Ù\n"
 
-#: lib/package.c:331 lib/rpmchecksig.c:467
+#: lib/package.c:331 lib/rpmchecksig.c:476
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: readLead¿¡ ½ÇÆÐÇß½À´Ï´Ù\n"
 
-#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:642
+#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:651
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
-#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:496
+#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:505
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Fread¿¡ ½ÇÆÐÇß½À´Ï´Ù: %s\n"
@@ -2418,47 +2418,47 @@ msgstr "%s: v1.0 RPM
 msgid "%s: Can't re-sign v2 packaging\n"
 msgstr "%s: v2.0 RPMÀº Àç-¼­¸íÇÒ ¼ö ¾ø½À´Ï´Ù\n"
 
-#: lib/rpmchecksig.c:244
+#: lib/rpmchecksig.c:253
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: writeLead¿¡ ½ÇÆÐÇß½À´Ï´Ù: %s\n"
 
-#: lib/rpmchecksig.c:250
+#: lib/rpmchecksig.c:259
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmWriteSignature¿¡ ½ÇÆÐÇß½À´Ï´Ù: %s\n"
 
-#: lib/rpmchecksig.c:481
+#: lib/rpmchecksig.c:490
 #, fuzzy, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr "%s: readLead¿¡ ½ÇÆÐÇß½À´Ï´Ù\n"
 
-#: lib/rpmchecksig.c:554
+#: lib/rpmchecksig.c:563
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: À¯È¿ÇÑ ¼­¸íÀÌ ¾ø½À´Ï´Ù (v1.0 RPM)\n"
 
-#: lib/rpmchecksig.c:801
+#: lib/rpmchecksig.c:810
 msgid "NOT OK"
 msgstr "¿Ã¹Ù¸£Áö ¾ÊÀ½"
 
-#: lib/rpmchecksig.c:802 lib/rpmchecksig.c:816
+#: lib/rpmchecksig.c:811 lib/rpmchecksig.c:825
 msgid " (MISSING KEYS:"
 msgstr " (Å°¸¦ ãÀ» ¼ö ¾øÀ½:"
 
-#: lib/rpmchecksig.c:804 lib/rpmchecksig.c:818
+#: lib/rpmchecksig.c:813 lib/rpmchecksig.c:827
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819
+#: lib/rpmchecksig.c:814 lib/rpmchecksig.c:828
 msgid " (UNTRUSTED KEYS:"
 msgstr " (Å°¸¦ ½Å·ÚÇÒ ¼ö ¾øÀ½:"
 
-#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821
+#: lib/rpmchecksig.c:816 lib/rpmchecksig.c:830
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:815
+#: lib/rpmchecksig.c:824
 msgid "OK"
 msgstr "È®ÀÎ"
 

diff --git a/po/no.po b/po/no.po
index ec860f7..db712e4 100644 (file)
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-03-08 17:22-0500\n"
+"POT-Creation-Date: 2002-03-09 14:38-0500\n"
 "PO-Revision-Date: 2001-06-27 12:24+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -1613,7 +1613,7 @@ msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:548
+#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:557
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: readLead feilet\n"
@@ -1623,27 +1623,27 @@ msgstr "%s: readLead feilet\n"
 msgid "%s: bad magic\n"
 msgstr "Ugyldig magi"
 
-#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:564
+#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:573
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: rpmReadSignature feilet\n"
 
-#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:569
+#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:578
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Ingen signatur tilgjengelig\n"
 
-#: lib/package.c:331 lib/rpmchecksig.c:467
+#: lib/package.c:331 lib/rpmchecksig.c:476
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: readLead feilet\n"
 
-#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:642
+#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:651
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
-#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:496
+#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:505
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Fread feilet: %s\n"
@@ -2390,47 +2390,47 @@ msgstr "%s: kan ikke signere v1.0 RPM\n"
 msgid "%s: Can't re-sign v2 packaging\n"
 msgstr "%s: Kan ikke signere v2.0 RPM på nytt\n"
 
-#: lib/rpmchecksig.c:244
+#: lib/rpmchecksig.c:253
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: writeLead feilet: %s\n"
 
-#: lib/rpmchecksig.c:250
+#: lib/rpmchecksig.c:259
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmWriteSignature feilet: %s\n"
 
-#: lib/rpmchecksig.c:481
+#: lib/rpmchecksig.c:490
 #, fuzzy, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr "%s: readLead feilet\n"
 
-#: lib/rpmchecksig.c:554
+#: lib/rpmchecksig.c:563
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: Ingen signatur tilgjengelig (v1.0 RPM)\n"
 
-#: lib/rpmchecksig.c:801
+#: lib/rpmchecksig.c:810
 msgid "NOT OK"
 msgstr "IKKE OK"
 
-#: lib/rpmchecksig.c:802 lib/rpmchecksig.c:816
+#: lib/rpmchecksig.c:811 lib/rpmchecksig.c:825
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:804 lib/rpmchecksig.c:818
+#: lib/rpmchecksig.c:813 lib/rpmchecksig.c:827
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819
+#: lib/rpmchecksig.c:814 lib/rpmchecksig.c:828
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821
+#: lib/rpmchecksig.c:816 lib/rpmchecksig.c:830
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:815
+#: lib/rpmchecksig.c:824
 msgid "OK"
 msgstr "OK"
 

diff --git a/po/pl.po b/po/pl.po
index 605cfe0..d1fd3d6 100644 (file)
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-03-08 17:22-0500\n"
+"POT-Creation-Date: 2002-03-09 14:38-0500\n"
 "PO-Revision-Date: 1999-05-25 17:00+0100\n"
 "Last-Translator: Pawe³ Dziekoñski <pdziekonski@mml.ch.pwr.wroc.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -1664,7 +1664,7 @@ msgid ""
 msgstr ""
 "tylko pakiety z numerem g³ównym <= 3 s± obs³ugiwane przez t± wersjê RPM'a"
 
-#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:548
+#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:557
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: readLead nie powiod³o siê\n"
@@ -1674,27 +1674,27 @@ msgstr "%s: readLead nie powiod
 msgid "%s: bad magic\n"
 msgstr "B³êdny magic"
 
-#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:564
+#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:573
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: rpmReadSignature nie powiod³o siê\n"
 
-#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:569
+#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:578
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Sygnatura nie jest dostêpna\n"
 
-#: lib/package.c:331 lib/rpmchecksig.c:467
+#: lib/package.c:331 lib/rpmchecksig.c:476
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: readLead nie powiod³o siê\n"
 
-#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:642
+#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:651
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
-#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:496
+#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:505
 #, fuzzy, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: readLead nie powiod³o siê\n"
@@ -2481,47 +2481,47 @@ msgstr "%s: Nie mo
 msgid "%s: Can't re-sign v2 packaging\n"
 msgstr "%s: Nie mo¿na ponownie podpisaæ v2.0 RPM\n"
 
-#: lib/rpmchecksig.c:244
+#: lib/rpmchecksig.c:253
 #, fuzzy, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: readLead nie powiod³o siê\n"
 
-#: lib/rpmchecksig.c:250
+#: lib/rpmchecksig.c:259
 #, fuzzy, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmReadSignature nie powiod³o siê\n"
 
-#: lib/rpmchecksig.c:481
+#: lib/rpmchecksig.c:490
 #, fuzzy, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr "%s: readLead nie powiod³o siê\n"
 
-#: lib/rpmchecksig.c:554
+#: lib/rpmchecksig.c:563
 #, 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:801
+#: lib/rpmchecksig.c:810
 msgid "NOT OK"
 msgstr "NIE DOBRZE"
 
-#: lib/rpmchecksig.c:802 lib/rpmchecksig.c:816
+#: lib/rpmchecksig.c:811 lib/rpmchecksig.c:825
 msgid " (MISSING KEYS:"
 msgstr " (BRAK KLUCZY:"
 
-#: lib/rpmchecksig.c:804 lib/rpmchecksig.c:818
+#: lib/rpmchecksig.c:813 lib/rpmchecksig.c:827
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819
+#: lib/rpmchecksig.c:814 lib/rpmchecksig.c:828
 msgid " (UNTRUSTED KEYS:"
 msgstr "(NIEWIARYGODNE KLUCZE:"
 
-#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821
+#: lib/rpmchecksig.c:816 lib/rpmchecksig.c:830
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:815
+#: lib/rpmchecksig.c:824
 msgid "OK"
 msgstr "OK"
 

diff --git a/po/pt.po b/po/pt.po
index 3bae8b8..26ee0f7 100644 (file)
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-03-08 17:22-0500\n"
+"POT-Creation-Date: 2002-03-09 14:38-0500\n"
 "PO-Revision-Date: 2000-06-22 01:13+01:00\n"
 "Last-Translator: José Nuno Coelho Sanarra Pires\n"
 "Language-Team: pt <kde@poli.org>\n"
@@ -1616,7 +1616,7 @@ 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:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:548
+#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:557
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ":%s: o readLead falhou\n"
@@ -1626,27 +1626,27 @@ msgstr ":%s: o readLead falhou\n"
 msgid "%s: bad magic\n"
 msgstr "Código de integridade inválido"
 
-#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:564
+#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:573
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: o rpmReadSignature falhou\n"
 
-#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:569
+#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:578
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Nenhuma assinatura disponível\n"
 
-#: lib/package.c:331 lib/rpmchecksig.c:467
+#: lib/package.c:331 lib/rpmchecksig.c:476
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr ":%s: o readLead falhou\n"
 
-#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:642
+#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:651
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
-#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:496
+#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:505
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: O fread falhou: %s\n"
@@ -2406,47 +2406,47 @@ msgstr "%s: N
 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:244
+#: lib/rpmchecksig.c:253
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: o writeLead falhou: %s\n"
 
-#: lib/rpmchecksig.c:250
+#: lib/rpmchecksig.c:259
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: o rpmWriteSignature falhou: %s\n"
 
-#: lib/rpmchecksig.c:481
+#: lib/rpmchecksig.c:490
 #, fuzzy, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr ":%s: o readLead falhou\n"
 
-#: lib/rpmchecksig.c:554
+#: lib/rpmchecksig.c:563
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: Nenhuma assinatura disponível (RPM v1.0)\n"
 
-#: lib/rpmchecksig.c:801
+#: lib/rpmchecksig.c:810
 msgid "NOT OK"
 msgstr "NÃO-OK"
 
-#: lib/rpmchecksig.c:802 lib/rpmchecksig.c:816
+#: lib/rpmchecksig.c:811 lib/rpmchecksig.c:825
 msgid " (MISSING KEYS:"
 msgstr " (FALTAM AS CHAVES:"
 
-#: lib/rpmchecksig.c:804 lib/rpmchecksig.c:818
+#: lib/rpmchecksig.c:813 lib/rpmchecksig.c:827
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819
+#: lib/rpmchecksig.c:814 lib/rpmchecksig.c:828
 msgid " (UNTRUSTED KEYS:"
 msgstr " (CHAVES SUSPEITAS:"
 
-#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821
+#: lib/rpmchecksig.c:816 lib/rpmchecksig.c:830
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:815
+#: lib/rpmchecksig.c:824
 msgid "OK"
 msgstr "OK"
 

diff --git a/po/pt_BR.po b/po/pt_BR.po
index 948b95e..0caa617 100644 (file)
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-03-08 17:22-0500\n"
+"POT-Creation-Date: 2002-03-09 14:38-0500\n"
 
 #: build.c:36
 #, fuzzy
@@ -1778,7 +1778,7 @@ msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:548
+#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:557
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
@@ -1788,29 +1788,29 @@ msgstr ""
 msgid "%s: bad magic\n"
 msgstr ""
 
-#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:564
+#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:573
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:569
+#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:578
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
 # , c-format
-#: lib/package.c:331 lib/rpmchecksig.c:467
+#: lib/package.c:331 lib/rpmchecksig.c:476
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:642
+#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:651
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
 # , c-format
-#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:496
+#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:505
 #, fuzzy, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "No consegui abrir: %s\n"
@@ -2610,49 +2610,49 @@ msgstr ""
 msgid "%s: Can't re-sign v2 packaging\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:244
+#: lib/rpmchecksig.c:253
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
 # , c-format
-#: lib/rpmchecksig.c:250
+#: lib/rpmchecksig.c:259
 #, fuzzy, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: lib/rpmchecksig.c:481
+#: lib/rpmchecksig.c:490
 #, fuzzy, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/rpmchecksig.c:554
+#: lib/rpmchecksig.c:563
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:801
+#: lib/rpmchecksig.c:810
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:802 lib/rpmchecksig.c:816
+#: lib/rpmchecksig.c:811 lib/rpmchecksig.c:825
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:804 lib/rpmchecksig.c:818
+#: lib/rpmchecksig.c:813 lib/rpmchecksig.c:827
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819
+#: lib/rpmchecksig.c:814 lib/rpmchecksig.c:828
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821
+#: lib/rpmchecksig.c:816 lib/rpmchecksig.c:830
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:815
+#: lib/rpmchecksig.c:824
 msgid "OK"
 msgstr ""
 

diff --git a/po/ro.po b/po/ro.po
index 342ac3e..7d099cc 100644 (file)
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-03-08 17:22-0500\n"
+"POT-Creation-Date: 2002-03-09 14:38-0500\n"
 "PO-Revision-Date: 1999-04-10 12:00+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
@@ -1591,7 +1591,7 @@ msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:548
+#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:557
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
@@ -1601,27 +1601,27 @@ msgstr ""
 msgid "%s: bad magic\n"
 msgstr ""
 
-#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:564
+#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:573
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:569
+#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:578
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/package.c:331 lib/rpmchecksig.c:467
+#: lib/package.c:331 lib/rpmchecksig.c:476
 #, c-format
 msgid "%s: headerRead failed\n"
 msgstr ""
 
-#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:642
+#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:651
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
-#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:496
+#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:505
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr ""
@@ -2349,47 +2349,47 @@ msgstr ""
 msgid "%s: Can't re-sign v2 packaging\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:244
+#: lib/rpmchecksig.c:253
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:250
+#: lib/rpmchecksig.c:259
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:481
+#: lib/rpmchecksig.c:490
 #, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:554
+#: lib/rpmchecksig.c:563
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:801
+#: lib/rpmchecksig.c:810
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:802 lib/rpmchecksig.c:816
+#: lib/rpmchecksig.c:811 lib/rpmchecksig.c:825
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:804 lib/rpmchecksig.c:818
+#: lib/rpmchecksig.c:813 lib/rpmchecksig.c:827
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819
+#: lib/rpmchecksig.c:814 lib/rpmchecksig.c:828
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821
+#: lib/rpmchecksig.c:816 lib/rpmchecksig.c:830
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:815
+#: lib/rpmchecksig.c:824
 msgid "OK"
 msgstr ""
 

diff --git a/po/rpm.pot b/po/rpm.pot
index 41d5b9b..eab836d 100644 (file)
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-03-08 17:22-0500\n"
+"POT-Creation-Date: 2002-03-09 14:38-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1596,7 +1596,7 @@ msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:548
+#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:557
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
@@ -1606,27 +1606,27 @@ msgstr ""
 msgid "%s: bad magic\n"
 msgstr ""
 
-#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:564
+#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:573
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:569
+#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:578
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/package.c:331 lib/rpmchecksig.c:467
+#: lib/package.c:331 lib/rpmchecksig.c:476
 #, c-format
 msgid "%s: headerRead failed\n"
 msgstr ""
 
-#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:642
+#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:651
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
-#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:496
+#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:505
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr ""
@@ -2354,47 +2354,47 @@ msgstr ""
 msgid "%s: Can't re-sign v2 packaging\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:244
+#: lib/rpmchecksig.c:253
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:250
+#: lib/rpmchecksig.c:259
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:481
+#: lib/rpmchecksig.c:490
 #, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:554
+#: lib/rpmchecksig.c:563
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:801
+#: lib/rpmchecksig.c:810
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:802 lib/rpmchecksig.c:816
+#: lib/rpmchecksig.c:811 lib/rpmchecksig.c:825
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:804 lib/rpmchecksig.c:818
+#: lib/rpmchecksig.c:813 lib/rpmchecksig.c:827
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819
+#: lib/rpmchecksig.c:814 lib/rpmchecksig.c:828
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821
+#: lib/rpmchecksig.c:816 lib/rpmchecksig.c:830
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:815
+#: lib/rpmchecksig.c:824
 msgid "OK"
 msgstr ""
 

diff --git a/po/ru.po b/po/ru.po
index a5811f0..e5f952c 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-03-08 17:22-0500\n"
+"POT-Creation-Date: 2002-03-09 14:38-0500\n"
 "PO-Revision-Date: 2001-08-29 13:55-0400\n"
 "Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
 "Language-Team:  Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
@@ -1640,7 +1640,7 @@ msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr "ÜÔÁ ×ÅÒÓÉÑ RPM ÐÏÄÄÅÒÖÉ×ÁÅÔ ÔÏÌØËÏ ÐÁËÅÔÙ ×ÅÒÓÉÉ <= 4\n"
 
-#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:548
+#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:557
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: ÏÛÉÂËÁ readLead\n"
@@ -1650,27 +1650,27 @@ msgstr "%s: 
 msgid "%s: bad magic\n"
 msgstr "îÅ×ÅÒÎÙÊ magic"
 
-#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:564
+#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:573
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: ÏÛÉÂËÁ rpmReadSignature\n"
 
-#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:569
+#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:578
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: ðÏÄÐÉÓØ ÎÅÄÏÓÔÕÐÎÁ\n"
 
-#: lib/package.c:331 lib/rpmchecksig.c:467
+#: lib/package.c:331 lib/rpmchecksig.c:476
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: ÏÛÉÂËÁ readLead\n"
 
-#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:642
+#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:651
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
-#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:496
+#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:505
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: ÏÛÉÂËÁ Fread: %s\n"
@@ -2425,47 +2425,47 @@ msgstr "%s: 
 msgid "%s: Can't re-sign v2 packaging\n"
 msgstr "%s: îÅ ÍÏÇÕ ÐÅÒÅÐÏÄÐÉÓÁÔØ RPM v2.0\n"
 
-#: lib/rpmchecksig.c:244
+#: lib/rpmchecksig.c:253
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: ÏÛÉÂËÁ writeLead: %s\n"
 
-#: lib/rpmchecksig.c:250
+#: lib/rpmchecksig.c:259
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: ÏÛÉÂËÁ rpmWriteSignature: %s\n"
 
-#: lib/rpmchecksig.c:481
+#: lib/rpmchecksig.c:490
 #, fuzzy, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr "%s: ÏÛÉÂËÁ readLead\n"
 
-#: lib/rpmchecksig.c:554
+#: lib/rpmchecksig.c:563
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: ðÏÄÐÉÓÉ ÎÅÔ (RPM v1.0)\n"
 
-#: lib/rpmchecksig.c:801
+#: lib/rpmchecksig.c:810
 msgid "NOT OK"
 msgstr "îå Oë"
 
-#: lib/rpmchecksig.c:802 lib/rpmchecksig.c:816
+#: lib/rpmchecksig.c:811 lib/rpmchecksig.c:825
 msgid " (MISSING KEYS:"
 msgstr " (ïôóõôóô÷õàô ëìàþé:"
 
-#: lib/rpmchecksig.c:804 lib/rpmchecksig.c:818
+#: lib/rpmchecksig.c:813 lib/rpmchecksig.c:827
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819
+#: lib/rpmchecksig.c:814 lib/rpmchecksig.c:828
 msgid " (UNTRUSTED KEYS:"
 msgstr " (îåô äï÷åòéñ ë ëìàþáí:"
 
-#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821
+#: lib/rpmchecksig.c:816 lib/rpmchecksig.c:830
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:815
+#: lib/rpmchecksig.c:824
 msgid "OK"
 msgstr "Oë"
 

diff --git a/po/sk.po b/po/sk.po
index e643ec4..af1aa74 100644 (file)
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-03-08 17:22-0500\n"
+"POT-Creation-Date: 2002-03-09 14:38-0500\n"
 "PO-Revision-Date: 1999-04-08 21:37+02:00\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -1661,7 +1661,7 @@ 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:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:548
+#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:557
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: readLead zlyhalo\n"
@@ -1671,27 +1671,27 @@ msgstr "%s: readLead zlyhalo\n"
 msgid "%s: bad magic\n"
 msgstr "Chybné magické èíslo"
 
-#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:564
+#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:573
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: rpmReadSignature zlyhalo\n"
 
-#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:569
+#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:578
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Podpis nie je k dispozícii\n"
 
-#: lib/package.c:331 lib/rpmchecksig.c:467
+#: lib/package.c:331 lib/rpmchecksig.c:476
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: readLead zlyhalo\n"
 
-#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:642
+#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:651
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
-#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:496
+#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:505
 #, fuzzy, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: readLead zlyhalo\n"
@@ -2478,47 +2478,47 @@ msgstr "%s: Nie je mo
 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:244
+#: lib/rpmchecksig.c:253
 #, fuzzy, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: readLead zlyhalo\n"
 
-#: lib/rpmchecksig.c:250
+#: lib/rpmchecksig.c:259
 #, fuzzy, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmReadSignature zlyhalo\n"
 
-#: lib/rpmchecksig.c:481
+#: lib/rpmchecksig.c:490
 #, fuzzy, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr "%s: readLead zlyhalo\n"
 
-#: lib/rpmchecksig.c:554
+#: lib/rpmchecksig.c:563
 #, 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:801
+#: lib/rpmchecksig.c:810
 msgid "NOT OK"
 msgstr "NIE JE V PORIADKU"
 
-#: lib/rpmchecksig.c:802 lib/rpmchecksig.c:816
+#: lib/rpmchecksig.c:811 lib/rpmchecksig.c:825
 msgid " (MISSING KEYS:"
 msgstr " (CHÝBAJÚCE K¥ÚÈE):"
 
-#: lib/rpmchecksig.c:804 lib/rpmchecksig.c:818
+#: lib/rpmchecksig.c:813 lib/rpmchecksig.c:827
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819
+#: lib/rpmchecksig.c:814 lib/rpmchecksig.c:828
 msgid " (UNTRUSTED KEYS:"
 msgstr " (NEDÔVERUJE SA K¥ÚÈOM: "
 
-#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821
+#: lib/rpmchecksig.c:816 lib/rpmchecksig.c:830
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:815
+#: lib/rpmchecksig.c:824
 msgid "OK"
 msgstr "V PORIADKU"
 

diff --git a/po/sl.po b/po/sl.po
index dc8851b..e308d51 100644 (file)
--- 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.229 2002/03/08 22:25:04 jbj Exp $
+# $Id: sl.po,v 1.230 2002/03/10 15:18:39 jbj Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-03-08 17:22-0500\n"
+"POT-Creation-Date: 2002-03-09 14:38-0500\n"
 "PO-Revision-Date: 2000-10-08 19:05+0200\n"
 "Last-Translator: Grega Fajdiga <gregor.fajdiga@telemach.net>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -1662,7 +1662,7 @@ 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:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:548
+#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:557
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: readLead je bil neuspe¹en\n"
@@ -1672,27 +1672,27 @@ msgstr "%s: readLead je bil neuspe
 msgid "%s: bad magic\n"
 msgstr "Napaèno magièno ¹tevilo"
 
-#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:564
+#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:573
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: rpmReadSignature je bil neuspe¹en\n"
 
-#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:569
+#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:578
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Podpis ni na voljo\n"
 
-#: lib/package.c:331 lib/rpmchecksig.c:467
+#: lib/package.c:331 lib/rpmchecksig.c:476
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: readLead je bil neuspe¹en\n"
 
-#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:642
+#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:651
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
-#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:496
+#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:505
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: branje Fread je bilo neuspe¹no: %s\n"
@@ -2476,47 +2476,47 @@ msgstr "%s: Podpis RPM v1.0 ni mo
 msgid "%s: Can't re-sign v2 packaging\n"
 msgstr "%s: Sprememba podpisa RPM v2.0 ni mo¾na\n"
 
-#: lib/rpmchecksig.c:244
+#: lib/rpmchecksig.c:253
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: writeLead je bil neuspe¹en: %s\n"
 
-#: lib/rpmchecksig.c:250
+#: lib/rpmchecksig.c:259
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmWriteSignature je bilo neuspe¹no: %s\n"
 
-#: lib/rpmchecksig.c:481
+#: lib/rpmchecksig.c:490
 #, fuzzy, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr "%s: readLead je bil neuspe¹en\n"
 
-#: lib/rpmchecksig.c:554
+#: lib/rpmchecksig.c:563
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: Podpis ni na voljo (RPM v1.0)\n"
 
-#: lib/rpmchecksig.c:801
+#: lib/rpmchecksig.c:810
 msgid "NOT OK"
 msgstr "NI DOBRO"
 
-#: lib/rpmchecksig.c:802 lib/rpmchecksig.c:816
+#: lib/rpmchecksig.c:811 lib/rpmchecksig.c:825
 msgid " (MISSING KEYS:"
 msgstr " (MANJKAJOÈI KLJUÈI:"
 
-#: lib/rpmchecksig.c:804 lib/rpmchecksig.c:818
+#: lib/rpmchecksig.c:813 lib/rpmchecksig.c:827
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819
+#: lib/rpmchecksig.c:814 lib/rpmchecksig.c:828
 msgid " (UNTRUSTED KEYS:"
 msgstr " (NEPREVERJENI KLJUÈI:"
 
-#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821
+#: lib/rpmchecksig.c:816 lib/rpmchecksig.c:830
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:815
+#: lib/rpmchecksig.c:824
 msgid "OK"
 msgstr "V REDU"
 

diff --git a/po/sr.po b/po/sr.po
index 47b444e..6e9f81a 100644 (file)
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-03-08 17:22-0500\n"
+"POT-Creation-Date: 2002-03-09 14:38-0500\n"
 "Content-Type: text/plain; charset=\n"
 "Date: 1998-05-02 21:41:47-0400\n"
 
@@ -1645,7 +1645,7 @@ 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:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:548
+#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:557
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: Neuspeo 'readLead'\n"
@@ -1655,27 +1655,27 @@ msgstr "%s: Neuspeo 'readLead'\n"
 msgid "%s: bad magic\n"
 msgstr ""
 
-#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:564
+#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:573
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: Neuspelo 'rpmReadSignature'\n"
 
-#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:569
+#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:578
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Potpis nije na raspolaganju\n"
 
-#: lib/package.c:331 lib/rpmchecksig.c:467
+#: lib/package.c:331 lib/rpmchecksig.c:476
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: Neuspeo 'readLead'\n"
 
-#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:642
+#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:651
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
-#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:496
+#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:505
 #, fuzzy, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Neuspeo 'readLead'\n"
@@ -2463,48 +2463,48 @@ msgstr "%s: Ne mogu da potpi
 msgid "%s: Can't re-sign v2 packaging\n"
 msgstr "%s: Ne mogu da ponovo potpi¹em v2.0 RPM\n"
 
-#: lib/rpmchecksig.c:244
+#: lib/rpmchecksig.c:253
 #, fuzzy, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: Neuspeo 'readLead'\n"
 
-#: lib/rpmchecksig.c:250
+#: lib/rpmchecksig.c:259
 #, fuzzy, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: Neuspelo 'rpmReadSignature'\n"
 
-#: lib/rpmchecksig.c:481
+#: lib/rpmchecksig.c:490
 #, fuzzy, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr "%s: Neuspeo 'readLead'\n"
 
-#: lib/rpmchecksig.c:554
+#: lib/rpmchecksig.c:563
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: Potpis nije na raspolaganju (RPM v1.0)\n"
 
-#: lib/rpmchecksig.c:801
+#: lib/rpmchecksig.c:810
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:802 lib/rpmchecksig.c:816
+#: lib/rpmchecksig.c:811 lib/rpmchecksig.c:825
 #, fuzzy
 msgid " (MISSING KEYS:"
 msgstr " (NEDOSTAJUÆI KLJUÈEVI)"
 
-#: lib/rpmchecksig.c:804 lib/rpmchecksig.c:818
+#: lib/rpmchecksig.c:813 lib/rpmchecksig.c:827
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819
+#: lib/rpmchecksig.c:814 lib/rpmchecksig.c:828
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821
+#: lib/rpmchecksig.c:816 lib/rpmchecksig.c:830
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:815
+#: lib/rpmchecksig.c:824
 msgid "OK"
 msgstr ""
 

diff --git a/po/sv.po b/po/sv.po
index 5f37a39..03f9021 100644 (file)
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-03-08 17:22-0500\n"
+"POT-Creation-Date: 2002-03-09 14:38-0500\n"
 "PO-Revision-Date: 2001-09-12 14:18+0200\n"
 "Last-Translator: Göran Uddeborg <goeran@uddeborg.pp.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -1624,7 +1624,7 @@ 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:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:548
+#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:557
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: readLead misslyckades\n"
@@ -1634,27 +1634,27 @@ msgstr "%s: readLead misslyckades\n"
 msgid "%s: bad magic\n"
 msgstr "Felaktigt magiskt tal"
 
-#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:564
+#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:573
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: rpmReadSignature misslyckades\n"
 
-#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:569
+#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:578
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Ingen signatur tillgänglig\n"
 
-#: lib/package.c:331 lib/rpmchecksig.c:467
+#: lib/package.c:331 lib/rpmchecksig.c:476
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: readLead misslyckades\n"
 
-#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:642
+#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:651
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
-#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:496
+#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:505
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Fread misslyckades: %s\n"
@@ -2409,47 +2409,47 @@ msgstr "%s: Kan inte signera v1.0 RPM\n"
 msgid "%s: Can't re-sign v2 packaging\n"
 msgstr "%s: Kan inte signera om v2.0 RPM\n"
 
-#: lib/rpmchecksig.c:244
+#: lib/rpmchecksig.c:253
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: writeLead misslyckades: %s\n"
 
-#: lib/rpmchecksig.c:250
+#: lib/rpmchecksig.c:259
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmWriteSignature misslyckades: %s\n"
 
-#: lib/rpmchecksig.c:481
+#: lib/rpmchecksig.c:490
 #, fuzzy, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr "%s: readLead misslyckades\n"
 
-#: lib/rpmchecksig.c:554
+#: lib/rpmchecksig.c:563
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: Ingen signatur tillgänglig (v1.0 RPM)\n"
 
-#: lib/rpmchecksig.c:801
+#: lib/rpmchecksig.c:810
 msgid "NOT OK"
 msgstr "EJ OK"
 
-#: lib/rpmchecksig.c:802 lib/rpmchecksig.c:816
+#: lib/rpmchecksig.c:811 lib/rpmchecksig.c:825
 msgid " (MISSING KEYS:"
 msgstr " (SAKNADE NYCKLAR:"
 
-#: lib/rpmchecksig.c:804 lib/rpmchecksig.c:818
+#: lib/rpmchecksig.c:813 lib/rpmchecksig.c:827
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819
+#: lib/rpmchecksig.c:814 lib/rpmchecksig.c:828
 msgid " (UNTRUSTED KEYS:"
 msgstr " (EJ BETRODDA NYCKLAR:"
 
-#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821
+#: lib/rpmchecksig.c:816 lib/rpmchecksig.c:830
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:815
+#: lib/rpmchecksig.c:824
 msgid "OK"
 msgstr "OK"
 

diff --git a/po/tr.po b/po/tr.po
index 1b65f54..edebec3 100644 (file)
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-03-08 17:22-0500\n"
+"POT-Creation-Date: 2002-03-09 14:38-0500\n"
 "PO-Revision-Date: 2001-07-05 08:02+300\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -1646,7 +1646,7 @@ msgstr ""
 "RPM'nin bu sürümünde sadece ilk sürüm rakamý <= 4 olan paketler "
 "destekleniyor\n"
 
-#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:548
+#: lib/package.c:246 lib/rpmchecksig.c:164 lib/rpmchecksig.c:557
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: readLead baþarýsýz\n"
@@ -1656,27 +1656,27 @@ msgstr "%s: readLead ba
 msgid "%s: bad magic\n"
 msgstr "Magic hatalý"
 
-#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:564
+#: lib/package.c:277 lib/rpmchecksig.c:182 lib/rpmchecksig.c:573
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: rpmReadSignature baþarýsýz\n"
 
-#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:569
+#: lib/package.c:281 lib/rpmchecksig.c:186 lib/rpmchecksig.c:578
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Ýmza bulundurmuyor\n"
 
-#: lib/package.c:331 lib/rpmchecksig.c:467
+#: lib/package.c:331 lib/rpmchecksig.c:476
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: readLead baþarýsýz\n"
 
-#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:642
+#: lib/package.c:366 lib/package.c:393 lib/package.c:425 lib/rpmchecksig.c:651
 #, c-format
 msgid "only V3 signatures can be verified, skipping V%u signature"
 msgstr ""
 
-#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:496
+#: lib/package.c:437 lib/rpmchecksig.c:113 lib/rpmchecksig.c:505
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Fread baþarýsýz: %s\n"
@@ -2432,47 +2432,47 @@ msgstr "%s: v1.0 RPM (eski s
 msgid "%s: Can't re-sign v2 packaging\n"
 msgstr "%s: v2.0 RPM (eski sürüm) yeniden imzalanamaz\n"
 
-#: lib/rpmchecksig.c:244
+#: lib/rpmchecksig.c:253
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: writeLead baþarýsýz: %s\n"
 
-#: lib/rpmchecksig.c:250
+#: lib/rpmchecksig.c:259
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmWriteSignature baþarýsýz: %s\n"
 
-#: lib/rpmchecksig.c:481
+#: lib/rpmchecksig.c:490
 #, fuzzy, c-format
 msgid "%s: headerGetEntry failed\n"
 msgstr "%s: readLead baþarýsýz\n"
 
-#: lib/rpmchecksig.c:554
+#: lib/rpmchecksig.c:563
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: Ýmza bulundurmuyor (v1.0 RPM)\n"
 
-#: lib/rpmchecksig.c:801
+#: lib/rpmchecksig.c:810
 msgid "NOT OK"
 msgstr "TAMAM DEÐÝL"
 
-#: lib/rpmchecksig.c:802 lib/rpmchecksig.c:816
+#: lib/rpmchecksig.c:811 lib/rpmchecksig.c:825
 msgid " (MISSING KEYS:"
 msgstr " (EKSÝK ANAHTARLAR:"
 
-#: lib/rpmchecksig.c:804 lib/rpmchecksig.c:818
+#: lib/rpmchecksig.c:813 lib/rpmchecksig.c:827
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:805 lib/rpmchecksig.c:819
+#: lib/rpmchecksig.c:814 lib/rpmchecksig.c:828
 msgid " (UNTRUSTED KEYS:"
 msgstr " (GÜVENCESÝZ ANAHTARLAR:"
 
-#: lib/rpmchecksig.c:807 lib/rpmchecksig.c:821
+#: lib/rpmchecksig.c:816 lib/rpmchecksig.c:830
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:815
+#: lib/rpmchecksig.c:824
 msgid "OK"
 msgstr "Tamam"
 

diff --git a/rpm.spec b/rpm.spec
index 05f1539..9e5bc34 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -1,6 +1,6 @@
-%define        with_python_subpackage  1%{nil}
+%define        with_python_subpackage  0%{nil}
 %define        with_python_version     2.2%{nil}
-%define with_perl_subpackage   1
+%define with_perl_subpackage   0
 %define        with_bzip2              1%{nil}
 %define        with_apidocs            0%{nil}
 %define with_internal_db       1%{nil}
@@ -20,7 +20,7 @@ Name: rpm
 %define version 4.1
 Version: %{version}
 %{expand: %%define rpm_version %{version}}
-Release: 0.01
+Release: 0.02
 Group: System Environment/Base
 Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz
 Copyright: GPL
@@ -524,6 +524,9 @@ fi
 %{__prefix}/include/popt.h
 
 %changelog
+* Sun Mar 10 2002 Jeff Johnson <jbj@redhat.com>
+- make --addsign and --resign behave exactly the same.
+
 * Mon Sep 24 2001 Jeff Johnson <jbj@redhat.com>
 - Start rpm-4.1.
 - loosely wire beecrypt library into rpm.

diff --git a/rpm.spec.in b/rpm.spec.in
index c6ac674..be72064 100644 (file)
--- a/rpm.spec.in
+++ b/rpm.spec.in
@@ -1,6 +1,6 @@
-%define        with_python_subpackage  @WITH_PYTHON_SUBPACKAGE@%{nil}
+%define        with_python_subpackage  0%{nil}
 %define        with_python_version     @WITH_PYTHON_VERSION@%{nil}
-%define with_perl_subpackage   1
+%define with_perl_subpackage   0
 %define        with_bzip2              @WITH_BZIP2@%{nil}
 %define        with_apidocs            @WITH_APIDOCS@%{nil}
 %define with_internal_db       @WITH_INTERNAL_DB@%{nil}
@@ -20,7 +20,7 @@ Name: rpm
 %define version @VERSION@
 Version: %{version}
 %{expand: %%define rpm_version %{version}}
-Release: 0.01
+Release: 0.02
 Group: System Environment/Base
 Source: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/rpm-%{rpm_version}.tar.gz
 Copyright: GPL
@@ -524,6 +524,9 @@ fi
 %{__prefix}/include/popt.h
 
 %changelog
+* Sun Mar 10 2002 Jeff Johnson <jbj@redhat.com>
+- make --addsign and --resign behave exactly the same.
+
 * Mon Sep 24 2001 Jeff Johnson <jbj@redhat.com>
 - Start rpm-4.1.
 - loosely wire beecrypt library into rpm.