summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES1
-rw-r--r--lib/poptALL.c2
-rw-r--r--lib/rpmchecksig.c255
-rw-r--r--lib/rpmcli.h15
-rw-r--r--po/cs.po42
-rw-r--r--po/da.po42
-rw-r--r--po/de.po42
-rw-r--r--po/en_RN.po38
-rw-r--r--po/es.po38
-rw-r--r--po/eu_ES.po38
-rw-r--r--po/fi.po42
-rw-r--r--po/fr.po42
-rw-r--r--po/gl.po38
-rw-r--r--po/hu.po38
-rw-r--r--po/id.po38
-rw-r--r--po/is.po42
-rw-r--r--po/it.po38
-rw-r--r--po/ja.po42
-rw-r--r--po/ko.po42
-rw-r--r--po/no.po42
-rw-r--r--po/pl.po42
-rw-r--r--po/pt.po42
-rw-r--r--po/pt_BR.po43
-rw-r--r--po/ro.po38
-rw-r--r--po/rpm.pot38
-rw-r--r--po/ru.po42
-rw-r--r--po/sk.po42
-rw-r--r--po/sl.po44
-rw-r--r--po/sr.po42
-rw-r--r--po/sv.po45
-rw-r--r--po/tr.po42
-rw-r--r--po/uk.po38
-rw-r--r--po/wa.po38
-rw-r--r--po/zh.po38
-rw-r--r--po/zh_CN.GB2312.po38
-rw-r--r--python/rpmts-py.c71
-rw-r--r--rpm.spec.in5
37 files changed, 891 insertions, 714 deletions
diff --git a/CHANGES b/CHANGES
index cadc7bb79..a64bd8586 100644
--- a/CHANGES
+++ b/CHANGES
@@ -225,6 +225,7 @@
- python: permit direct ts.dbMatch() python iterations.
- python: the death of rpm.checksig(), use ts.hdrFromFdno() instead.
- add bitmask for precise control of signature/digest verification.
+ - python: bindings to import pubkeys and display openpgp packets.
4.0.3 -> 4.0.4:
- solaris: translate i86pc to i386 (#57182).
diff --git a/lib/poptALL.c b/lib/poptALL.c
index 0fe274935..31122607c 100644
--- a/lib/poptALL.c
+++ b/lib/poptALL.c
@@ -233,7 +233,7 @@ struct poptOption rpmcliAllPoptTable[] = {
N_("use ROOT as top level directory"),
N_("ROOT") },
- { "querytags", '\0', 0, 0, 'Q',
+ { "querytags", '\0', 0, 0, POPT_QUERYTAGS,
N_("display known query tags"), NULL },
{ "showrc", '\0', 0, NULL, POPT_SHOWRC,
N_("display final rpmrc and macro configuration"), NULL },
diff --git a/lib/rpmchecksig.c b/lib/rpmchecksig.c
index 18e7c91a0..4bea28fcc 100644
--- a/lib/rpmchecksig.c
+++ b/lib/rpmchecksig.c
@@ -135,7 +135,7 @@ exit:
* @retval signid signer fingerprint
* @return 0 on success
*/
-static int getSignid(Header sig, int sigtag, byte * signid)
+static int getSignid(Header sig, int sigtag, unsigned char * signid)
/*@globals fileSystem @*/
/*@modifies *signid, fileSystem @*/
{
@@ -284,7 +284,7 @@ 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];
+ unsigned char oldsignid[8], newsignid[8];
/* Grab the old signature fingerprint (if any) */
memset(oldsignid, 0, sizeof(oldsignid));
@@ -393,24 +393,8 @@ exit:
return res;
}
-/** \ingroup rpmcli
- * Import public key(s).
- * @todo Implicit --update policy for gpg-pubkey headers.
- * @param ts transaction set
- * @param qva mode flags and parameters
- * @param argv array of pubkey file names (NULL terminated)
- * @return 0 on success
- */
-static int rpmImportPubkey(const rpmts ts,
- /*@unused@*/ QVA_t qva,
- /*@null@*/ const char ** argv)
- /*@globals RPMVERSION, rpmGlobalMacroContext,
- fileSystem, internalState @*/
- /*@modifies ts, rpmGlobalMacroContext,
- fileSystem, internalState @*/
+int rpmcliImportPubkey(const rpmts ts, const unsigned char * pkt, ssize_t pktlen)
{
- const char * fn;
- int res = 0;
const char * afmt = "%{pubkeys:armor}";
const char * group = "Public Keys";
const char * license = "pubkey";
@@ -419,144 +403,177 @@ static int rpmImportPubkey(const rpmts ts,
int_32 zero = 0;
pgpDig dig = NULL;
pgpDigParams pubp = NULL;
- int rc, xx;
-
- if (argv == NULL) return res;
+ const char * d = NULL;
+ const char * enc = NULL;
+ const char * n = NULL;
+ const char * u = NULL;
+ const char * v = NULL;
+ const char * r = NULL;
+ const char * evr = NULL;
+ Header h = NULL;
+ int rc = 1; /* assume failure */
+ char * t;
+ int xx;
+ if (pkt == NULL || pktlen <= 0)
+ return -1;
if (rpmtsOpenDB(ts, (O_RDWR|O_CREAT)))
return -1;
- /*@-branchstate@*/
-/*@-boundsread@*/
- while ((fn = *argv++) != NULL)
-/*@=boundsread@*/
- {
- const char * d = NULL;
- const char * enc = NULL;
- const char * n = NULL;
- const char * u = NULL;
- const char * v = NULL;
- const char * r = NULL;
- const char * evr = NULL;
- const byte * pkt = NULL;
- char * t;
- ssize_t pktlen = 0;
- Header h = NULL;
-
- /* Read pgp packet. */
- if ((rc = pgpReadPkts(fn, &pkt, &pktlen)) <= 0) {
- rpmError(RPMERR_IMPORT, _("%s: import read failed.\n"), fn);
- res++;
- goto bottom;
- }
- if (rc != PGPARMOR_PUBKEY) {
- rpmError(RPMERR_IMPORT, _("%s: not an armored public key.\n"), fn);
- res++;
- goto bottom;
- }
- if ((enc = b64encode(pkt, pktlen)) == NULL) {
- rpmError(RPMERR_IMPORT, _("%s: base64 encode failed.\n"), fn);
- res++;
- goto bottom;
- }
+ if ((enc = b64encode(pkt, pktlen)) == NULL)
+ goto exit;
- dig = pgpNewDig();
+ dig = pgpNewDig();
- /* Build header elements. */
- (void) pgpPrtPkts(pkt, pktlen, dig, 0);
- pubp = &dig->pubkey;
+ /* Build header elements. */
+ (void) pgpPrtPkts(pkt, pktlen, dig, 0);
+ pubp = &dig->pubkey;
/*@-boundswrite@*/
- v = t = xmalloc(16+1);
- t = stpcpy(t, pgpHexStr(pubp->signid, sizeof(pubp->signid)));
+ v = t = xmalloc(16+1);
+ t = stpcpy(t, pgpHexStr(pubp->signid, sizeof(pubp->signid)));
- r = t = xmalloc(8+1);
- t = stpcpy(t, pgpHexStr(pubp->time, sizeof(pubp->time)));
+ r = t = xmalloc(8+1);
+ t = stpcpy(t, pgpHexStr(pubp->time, sizeof(pubp->time)));
- n = t = xmalloc(sizeof("gpg()")+8);
- t = stpcpy( stpcpy( stpcpy(t, "gpg("), v+8), ")");
+ n = t = xmalloc(sizeof("gpg()")+8);
+ t = stpcpy( stpcpy( stpcpy(t, "gpg("), v+8), ")");
- /*@-nullpass@*/ /* FIX: pubp->userid may be NULL */
- u = t = xmalloc(sizeof("gpg()")+strlen(pubp->userid));
- t = stpcpy( stpcpy( stpcpy(t, "gpg("), pubp->userid), ")");
- /*@=nullpass@*/
+ /*@-nullpass@*/ /* FIX: pubp->userid may be NULL */
+ u = t = xmalloc(sizeof("gpg()")+strlen(pubp->userid));
+ t = stpcpy( stpcpy( stpcpy(t, "gpg("), pubp->userid), ")");
+ /*@=nullpass@*/
- evr = t = xmalloc(sizeof("4X:-")+strlen(v)+strlen(r));
- t = stpcpy(t, (pubp->version == 4 ? "4:" : "3:"));
- t = stpcpy( stpcpy( stpcpy(t, v), "-"), r);
+ evr = t = xmalloc(sizeof("4X:-")+strlen(v)+strlen(r));
+ t = stpcpy(t, (pubp->version == 4 ? "4:" : "3:"));
+ t = stpcpy( stpcpy( stpcpy(t, v), "-"), r);
/*@=boundswrite@*/
- /* Check for pre-existing header. */
+ /* Check for pre-existing header. */
- /* Build pubkey header. */
- h = headerNew();
+ /* Build pubkey header. */
+ h = headerNew();
- xx = headerAddOrAppendEntry(h, RPMTAG_PUBKEYS,
+ xx = headerAddOrAppendEntry(h, RPMTAG_PUBKEYS,
RPM_STRING_ARRAY_TYPE, &enc, 1);
- d = headerSprintf(h, afmt, rpmTagTable, rpmHeaderFormats, NULL);
- if (d == NULL) {
- res++;
- goto bottom;
- }
+ d = headerSprintf(h, afmt, rpmTagTable, rpmHeaderFormats, NULL);
+ if (d == NULL)
+ goto exit;
- xx = headerAddEntry(h, RPMTAG_NAME, RPM_STRING_TYPE, "gpg-pubkey", 1);
- xx = headerAddEntry(h, RPMTAG_VERSION, RPM_STRING_TYPE, v+8, 1);
- xx = headerAddEntry(h, RPMTAG_RELEASE, RPM_STRING_TYPE, r, 1);
- xx = headerAddEntry(h, RPMTAG_DESCRIPTION, RPM_STRING_TYPE, d, 1);
- xx = headerAddEntry(h, RPMTAG_GROUP, RPM_STRING_TYPE, group, 1);
- xx = headerAddEntry(h, RPMTAG_LICENSE, RPM_STRING_TYPE, license, 1);
- xx = headerAddEntry(h, RPMTAG_SUMMARY, RPM_STRING_TYPE, u, 1);
+ xx = headerAddEntry(h, RPMTAG_NAME, RPM_STRING_TYPE, "gpg-pubkey", 1);
+ xx = headerAddEntry(h, RPMTAG_VERSION, RPM_STRING_TYPE, v+8, 1);
+ xx = headerAddEntry(h, RPMTAG_RELEASE, RPM_STRING_TYPE, r, 1);
+ xx = headerAddEntry(h, RPMTAG_DESCRIPTION, RPM_STRING_TYPE, d, 1);
+ xx = headerAddEntry(h, RPMTAG_GROUP, RPM_STRING_TYPE, group, 1);
+ xx = headerAddEntry(h, RPMTAG_LICENSE, RPM_STRING_TYPE, license, 1);
+ xx = headerAddEntry(h, RPMTAG_SUMMARY, RPM_STRING_TYPE, u, 1);
- xx = headerAddEntry(h, RPMTAG_SIZE, RPM_INT32_TYPE, &zero, 1);
+ xx = headerAddEntry(h, RPMTAG_SIZE, RPM_INT32_TYPE, &zero, 1);
- xx = headerAddOrAppendEntry(h, RPMTAG_PROVIDENAME,
+ xx = headerAddOrAppendEntry(h, RPMTAG_PROVIDENAME,
RPM_STRING_ARRAY_TYPE, &u, 1);
- xx = headerAddOrAppendEntry(h, RPMTAG_PROVIDEVERSION,
+ xx = headerAddOrAppendEntry(h, RPMTAG_PROVIDEVERSION,
RPM_STRING_ARRAY_TYPE, &evr, 1);
- xx = headerAddOrAppendEntry(h, RPMTAG_PROVIDEFLAGS,
+ xx = headerAddOrAppendEntry(h, RPMTAG_PROVIDEFLAGS,
RPM_INT32_TYPE, &pflags, 1);
- xx = headerAddOrAppendEntry(h, RPMTAG_PROVIDENAME,
+ xx = headerAddOrAppendEntry(h, RPMTAG_PROVIDENAME,
RPM_STRING_ARRAY_TYPE, &n, 1);
- xx = headerAddOrAppendEntry(h, RPMTAG_PROVIDEVERSION,
+ xx = headerAddOrAppendEntry(h, RPMTAG_PROVIDEVERSION,
RPM_STRING_ARRAY_TYPE, &evr, 1);
- xx = headerAddOrAppendEntry(h, RPMTAG_PROVIDEFLAGS,
+ xx = headerAddOrAppendEntry(h, RPMTAG_PROVIDEFLAGS,
RPM_INT32_TYPE, &pflags, 1);
- xx = headerAddEntry(h, RPMTAG_RPMVERSION, RPM_STRING_TYPE, RPMVERSION, 1);
+ xx = headerAddEntry(h, RPMTAG_RPMVERSION, RPM_STRING_TYPE, RPMVERSION, 1);
+ /* XXX W2DO: tag value inheirited from parent? */
+ xx = headerAddEntry(h, RPMTAG_BUILDHOST, RPM_STRING_TYPE, buildhost, 1);
+ { int_32 tid = rpmtsGetTid(ts);
+ xx = headerAddEntry(h, RPMTAG_INSTALLTIME, RPM_INT32_TYPE, &tid, 1);
/* XXX W2DO: tag value inheirited from parent? */
- xx = headerAddEntry(h, RPMTAG_BUILDHOST, RPM_STRING_TYPE, buildhost, 1);
- { int_32 tid = rpmtsGetTid(ts);
- xx = headerAddEntry(h, RPMTAG_INSTALLTIME, RPM_INT32_TYPE, &tid, 1);
- /* XXX W2DO: tag value inheirited from parent? */
- xx = headerAddEntry(h, RPMTAG_BUILDTIME, RPM_INT32_TYPE, &tid, 1);
- }
+ xx = headerAddEntry(h, RPMTAG_BUILDTIME, RPM_INT32_TYPE, &tid, 1);
+ }
#ifdef NOTYET
- /* XXX W2DO: tag value inheirited from parent? */
- xx = headerAddEntry(h, RPMTAG_SOURCERPM, RPM_STRING_TYPE, fn, 1);
+ /* XXX W2DO: tag value inheirited from parent? */
+ xx = headerAddEntry(h, RPMTAG_SOURCERPM, RPM_STRING_TYPE, fn, 1);
#endif
- /* Add header to database. */
- xx = rpmdbAdd(rpmtsGetRdb(ts), rpmtsGetTid(ts), h, NULL, NULL);
+ /* Add header to database. */
+ rc = rpmdbAdd(rpmtsGetRdb(ts), rpmtsGetTid(ts), h, NULL, NULL);
+ if (xx != 0)
+ goto exit;
+
+exit:
+ /* Clean up. */
+ h = headerFree(h);
+ dig = pgpFreeDig(dig);
+ n = _free(n);
+ u = _free(u);
+ v = _free(v);
+ r = _free(r);
+ evr = _free(evr);
+ enc = _free(enc);
+ d = _free(d);
+
+ return rc;
+}
+
+/** \ingroup rpmcli
+ * Import public key(s).
+ * @todo Implicit --update policy for gpg-pubkey headers.
+ * @param ts transaction set
+ * @param qva mode flags and parameters
+ * @param argv array of pubkey file names (NULL terminated)
+ * @return 0 on success
+ */
+static int rpmcliImportPubkeys(const rpmts ts,
+ /*@unused@*/ QVA_t qva,
+ /*@null@*/ const char ** argv)
+ /*@globals RPMVERSION, rpmGlobalMacroContext,
+ fileSystem, internalState @*/
+ /*@modifies ts, rpmGlobalMacroContext,
+ fileSystem, internalState @*/
+{
+ const char * fn;
+ const unsigned char * pkt = NULL;
+ ssize_t pktlen = 0;
+ int res = 0;
+ int rc;
+
+ if (argv == NULL) return res;
+
+ /*@-branchstate@*/
+/*@-boundsread@*/
+ while ((fn = *argv++) != NULL) {
+/*@=boundsread@*/
-bottom:
- /* Clean up. */
- h = headerFree(h);
- dig = pgpFreeDig(dig);
pkt = _free(pkt);
- n = _free(n);
- u = _free(u);
- v = _free(v);
- r = _free(r);
- evr = _free(evr);
- enc = _free(enc);
- d = _free(d);
+
+ /* Read pgp packet. */
+ if ((rc = pgpReadPkts(fn, &pkt, &pktlen)) <= 0) {
+ rpmError(RPMERR_IMPORT, _("%s: import read failed.\n"), fn);
+ res++;
+ continue;
+ }
+ if (rc != PGPARMOR_PUBKEY) {
+ rpmError(RPMERR_IMPORT, _("%s: not an armored public key.\n"), fn);
+ res++;
+ continue;
+ }
+
+ /* Import pubkey packet(s). */
+ if ((rc = rpmcliImportPubkey(ts, pkt, pktlen)) != 0) {
+ rpmError(RPMERR_IMPORT, _("%s: import failed.\n"), fn);
+ res++;
+ continue;
+ }
+
}
/*@=branchstate@*/
+ pkt = _free(pkt);
return res;
}
@@ -572,7 +589,7 @@ static int readFile(FD_t fd, const char * fn, pgpDig dig)
/*@globals fileSystem, internalState @*/
/*@modifies fd, *dig, fileSystem, internalState @*/
{
- byte buf[4*BUFSIZ];
+ unsigned char buf[4*BUFSIZ];
ssize_t count;
int rc = 1;
int i;
@@ -973,7 +990,7 @@ int rpmcliSign(rpmts ts, QVA_t qva, const char ** argv)
case RPMSIGN_CHK_SIGNATURE:
break;
case RPMSIGN_IMPORT_PUBKEY:
- return rpmImportPubkey(ts, qva, argv);
+ return rpmcliImportPubkeys(ts, qva, argv);
/*@notreached@*/ break;
case RPMSIGN_NEW_SIGNATURE:
case RPMSIGN_ADD_SIGNATURE:
diff --git a/lib/rpmcli.h b/lib/rpmcli.h
index 875df09ca..6afc5bf8e 100644
--- a/lib/rpmcli.h
+++ b/lib/rpmcli.h
@@ -696,6 +696,21 @@ extern struct poptOption rpmDatabasePoptTable[];
/*@{*/
/** \ingroup rpmcli
+ * Import public key packet(s).
+ * @todo Implicit --update policy for gpg-pubkey headers.
+ * @param ts transaction set
+ * @param pkt pgp pubkey packet(s)
+ * @param pktlen pgp pubkey length
+ * @return 0 on success
+ */
+int rpmcliImportPubkey(const rpmts ts,
+ const unsigned char * pkt, ssize_t pktlen)
+ /*@globals RPMVERSION, rpmGlobalMacroContext,
+ fileSystem, internalState @*/
+ /*@modifies ts, rpmGlobalMacroContext,
+ fileSystem, internalState @*/;
+
+/** \ingroup rpmcli
* Bit(s) to control rpmReSign() operation.
*/
/*@-typeuse@*/
diff --git a/po/cs.po b/po/cs.po
index 2cf8beff9..f7770f208 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-08-05 21:40-0400\n"
+"POT-Creation-Date: 2002-08-06 15:06-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"
@@ -1556,7 +1556,7 @@ msgid "error creating temporary file %s\n"
msgstr "chyba pøi vytváøení doèasného souboru %s\n"
#: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709
-#: lib/package.c:739 lib/rpmchecksig.c:767
+#: lib/package.c:739 lib/rpmchecksig.c:784
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
@@ -1570,22 +1570,22 @@ 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:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
+#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:705
#, fuzzy, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: readLead selhalo\n"
-#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
+#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:710
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/package.c:651 lib/rpmchecksig.c:586
+#: lib/package.c:651 lib/rpmchecksig.c:603
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: readLead selhalo\n"
-#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
+#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:632
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: Fread selhalo: %s\n"
@@ -2342,7 +2342,7 @@ msgstr "makeTempFile selhalo\n"
msgid "%s: Fwrite failed: %s\n"
msgstr "%s: Fwrite selhalo: %s\n"
-#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
+#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:689
#, fuzzy, c-format
msgid "%s: not an rpm package\n"
msgstr "parametr není RPM balíèek\n"
@@ -2372,53 +2372,53 @@ msgstr "%s: Fwrite selhalo: %s\n"
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: Fwrite selhalo: %s\n"
-#: lib/rpmchecksig.c:448
+#: lib/rpmchecksig.c:556
#, fuzzy, c-format
msgid "%s: import read failed.\n"
msgstr "%s: readLead selhalo\n"
-#: lib/rpmchecksig.c:453
+#: lib/rpmchecksig.c:561
#, c-format
msgid "%s: not an armored public key.\n"
msgstr ""
-#: lib/rpmchecksig.c:458
+#: lib/rpmchecksig.c:568
#, fuzzy, c-format
-msgid "%s: base64 encode failed.\n"
+msgid "%s: import failed.\n"
msgstr "%s: readLead selhalo\n"
-#: lib/rpmchecksig.c:600
+#: lib/rpmchecksig.c:617
#, fuzzy, c-format
msgid "%s: headerGetEntry failed\n"
msgstr "%s: readLead selhalo\n"
-#: lib/rpmchecksig.c:678
+#: lib/rpmchecksig.c:695
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr ""
-#: lib/rpmchecksig.c:933
+#: lib/rpmchecksig.c:950
#, fuzzy
msgid "NOT OK"
msgstr "NE "
-#: lib/rpmchecksig.c:934 lib/rpmchecksig.c:948
+#: lib/rpmchecksig.c:951 lib/rpmchecksig.c:965
msgid " (MISSING KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:936 lib/rpmchecksig.c:950
+#: lib/rpmchecksig.c:953 lib/rpmchecksig.c:967
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:937 lib/rpmchecksig.c:951
+#: lib/rpmchecksig.c:954 lib/rpmchecksig.c:968
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:939 lib/rpmchecksig.c:953
+#: lib/rpmchecksig.c:956 lib/rpmchecksig.c:970
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:947
+#: lib/rpmchecksig.c:964
msgid "OK"
msgstr ""
@@ -3640,6 +3640,10 @@ msgstr "%s: otevøení selhalo: %s\n"
msgid "%s: read manifest failed: %s\n"
msgstr "%s: Fread selhalo: %s\n"
+#, fuzzy
+#~ msgid "%s: base64 encode failed.\n"
+#~ msgstr "%s: readLead selhalo\n"
+
#~ msgid "%s: readLead failed\n"
#~ msgstr "%s: readLead selhalo\n"
diff --git a/po/da.po b/po/da.po
index f850a2be8..7491cd004 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-08-05 21:40-0400\n"
+"POT-Creation-Date: 2002-08-06 15:06-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"
@@ -1554,7 +1554,7 @@ msgid "error creating temporary file %s\n"
msgstr "fejl ved oprettelse af midlertidig fil %s\n"
#: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709
-#: lib/package.c:739 lib/rpmchecksig.c:767
+#: lib/package.c:739 lib/rpmchecksig.c:784
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
@@ -1569,22 +1569,22 @@ msgid ""
msgstr ""
"kun indpakninger med hovedversion <= 4 understøttes af denne udgave af RPM\n"
-#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
+#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:705
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: rpmReadSignature mislykkedes\n"
-#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
+#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:710
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Ingen tilgængelig signatur\n"
-#: lib/package.c:651 lib/rpmchecksig.c:586
+#: lib/package.c:651 lib/rpmchecksig.c:603
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: readLead mislykkedes\n"
-#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
+#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:632
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: Fread mislykkedes: %s\n"
@@ -2357,7 +2357,7 @@ msgstr "makeTempFile mislykkedes\n"
msgid "%s: Fwrite failed: %s\n"
msgstr "%s: Fwrite mislykkedes: %s\n"
-#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
+#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:689
#, fuzzy, c-format
msgid "%s: not an rpm package\n"
msgstr "parameter er ikke en RPM-pakke\n"
@@ -2387,52 +2387,52 @@ msgstr "%s: writeLead mislykkedes: %s\n"
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: rpmWriteSignature mislykkedes: %s\n"
-#: lib/rpmchecksig.c:448
+#: lib/rpmchecksig.c:556
#, fuzzy, c-format
msgid "%s: import read failed.\n"
msgstr "%s: readLead mislykkedes\n"
-#: lib/rpmchecksig.c:453
+#: lib/rpmchecksig.c:561
#, c-format
msgid "%s: not an armored public key.\n"
msgstr ""
-#: lib/rpmchecksig.c:458
+#: lib/rpmchecksig.c:568
#, fuzzy, c-format
-msgid "%s: base64 encode failed.\n"
+msgid "%s: import failed.\n"
msgstr "%s: readLead mislykkedes\n"
-#: lib/rpmchecksig.c:600
+#: lib/rpmchecksig.c:617
#, fuzzy, c-format
msgid "%s: headerGetEntry failed\n"
msgstr "%s: readLead mislykkedes\n"
-#: lib/rpmchecksig.c:678
+#: lib/rpmchecksig.c:695
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr "%s: Ingen tilgængelig signatur (v1.0 RPM)\n"
-#: lib/rpmchecksig.c:933
+#: lib/rpmchecksig.c:950
msgid "NOT OK"
msgstr "IKKE O.K."
-#: lib/rpmchecksig.c:934 lib/rpmchecksig.c:948
+#: lib/rpmchecksig.c:951 lib/rpmchecksig.c:965
msgid " (MISSING KEYS:"
msgstr " (MANGLENDE NØGLER: "
-#: lib/rpmchecksig.c:936 lib/rpmchecksig.c:950
+#: lib/rpmchecksig.c:953 lib/rpmchecksig.c:967
msgid ") "
msgstr ") "
-#: lib/rpmchecksig.c:937 lib/rpmchecksig.c:951
+#: lib/rpmchecksig.c:954 lib/rpmchecksig.c:968
msgid " (UNTRUSTED KEYS:"
msgstr " (IKKE-BETROEDE NØGLER:"
-#: lib/rpmchecksig.c:939 lib/rpmchecksig.c:953
+#: lib/rpmchecksig.c:956 lib/rpmchecksig.c:970
msgid ")"
msgstr ")"
-#: lib/rpmchecksig.c:947
+#: lib/rpmchecksig.c:964
msgid "OK"
msgstr "O.K."
@@ -3649,6 +3649,10 @@ msgstr "%s: åbning mislykkedes: %s\n"
msgid "%s: read manifest failed: %s\n"
msgstr "%s: læs manifest mislykkedes: %s\n"
+#, fuzzy
+#~ msgid "%s: base64 encode failed.\n"
+#~ msgstr "%s: readLead mislykkedes\n"
+
#~ msgid "%s: readLead failed\n"
#~ msgstr "%s: readLead mislykkedes\n"
diff --git a/po/de.po b/po/de.po
index 91d93fdad..20574e244 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-08-05 21:40-0400\n"
+"POT-Creation-Date: 2002-08-06 15:06-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"
@@ -1689,7 +1689,7 @@ msgid "error creating temporary file %s\n"
msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
#: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709
-#: lib/package.c:739 lib/rpmchecksig.c:767
+#: lib/package.c:739 lib/rpmchecksig.c:784
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
@@ -1707,22 +1707,22 @@ msgid ""
msgstr ""
"Nur Pakete mit Hauptnummern <= 3 werden von dieser RPM-Version unterstützt"
-#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
+#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:705
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: »rpmReadSignature« fehlgeschlagen\n"
-#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
+#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:710
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Keine Signatur verfügbar\n"
-#: lib/package.c:651 lib/rpmchecksig.c:586
+#: lib/package.c:651 lib/rpmchecksig.c:603
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: »readLead« fehlgeschlagen\n"
-#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
+#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:632
#, fuzzy, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: »readLead« fehlgeschlagen\n"
@@ -2524,7 +2524,7 @@ msgstr "%s: Öffnen fehlgeschlagen\n"
msgid "%s: Fwrite failed: %s\n"
msgstr "%s: »readLead« fehlgeschlagen\n"
-#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
+#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:689
#, fuzzy, c-format
msgid "%s: not an rpm package\n"
msgstr "Fehler: %s scheint zu keinem RPM-Paket zu gehören\n"
@@ -2554,53 +2554,53 @@ msgstr "%s: »readLead« fehlgeschlagen\n"
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: »rpmReadSignature« fehlgeschlagen\n"
-#: lib/rpmchecksig.c:448
+#: lib/rpmchecksig.c:556
#, fuzzy, c-format
msgid "%s: import read failed.\n"
msgstr "%s: »readLead« fehlgeschlagen\n"
-#: lib/rpmchecksig.c:453
+#: lib/rpmchecksig.c:561
#, c-format
msgid "%s: not an armored public key.\n"
msgstr ""
-#: lib/rpmchecksig.c:458
+#: lib/rpmchecksig.c:568
#, fuzzy, c-format
-msgid "%s: base64 encode failed.\n"
+msgid "%s: import failed.\n"
msgstr "%s: »readLead« fehlgeschlagen\n"
-#: lib/rpmchecksig.c:600
+#: lib/rpmchecksig.c:617
#, fuzzy, c-format
msgid "%s: headerGetEntry failed\n"
msgstr "%s: »readLead« fehlgeschlagen\n"
-#: lib/rpmchecksig.c:678
+#: lib/rpmchecksig.c:695
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr "%s: Keine Signatur verfügbar (v1.0 RPM)\n"
-#: lib/rpmchecksig.c:933
+#: lib/rpmchecksig.c:950
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:934 lib/rpmchecksig.c:948
+#: lib/rpmchecksig.c:951 lib/rpmchecksig.c:965
#, fuzzy
msgid " (MISSING KEYS:"
msgstr " (FEHLENDE SCHLüSSEL)"
-#: lib/rpmchecksig.c:936 lib/rpmchecksig.c:950
+#: lib/rpmchecksig.c:953 lib/rpmchecksig.c:967
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:937 lib/rpmchecksig.c:951
+#: lib/rpmchecksig.c:954 lib/rpmchecksig.c:968
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:939 lib/rpmchecksig.c:953
+#: lib/rpmchecksig.c:956 lib/rpmchecksig.c:970
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:947
+#: lib/rpmchecksig.c:964
msgid "OK"
msgstr ""
@@ -3845,6 +3845,10 @@ msgstr "%s: Öffnen fehlgeschlagen\n"
msgid "%s: read manifest failed: %s\n"
msgstr "%s: »readLead« fehlgeschlagen\n"
+#, fuzzy
+#~ msgid "%s: base64 encode failed.\n"
+#~ msgstr "%s: »readLead« fehlgeschlagen\n"
+
#~ msgid "%s: readLead failed\n"
#~ msgstr "%s: »readLead« fehlgeschlagen\n"
diff --git a/po/en_RN.po b/po/en_RN.po
index a60abfc77..2fb0518ee 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-08-05 21:40-0400\n"
+"POT-Creation-Date: 2002-08-06 15:06-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"
@@ -1516,7 +1516,7 @@ msgid "error creating temporary file %s\n"
msgstr ""
#: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709
-#: lib/package.c:739 lib/rpmchecksig.c:767
+#: lib/package.c:739 lib/rpmchecksig.c:784
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
@@ -1530,22 +1530,22 @@ msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
+#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:705
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
+#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:710
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/package.c:651 lib/rpmchecksig.c:586
+#: lib/package.c:651 lib/rpmchecksig.c:603
#, c-format
msgid "%s: headerRead failed\n"
msgstr ""
-#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
+#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:632
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr ""
@@ -2271,7 +2271,7 @@ msgstr ""
msgid "%s: Fwrite failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
+#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:689
#, c-format
msgid "%s: not an rpm package\n"
msgstr ""
@@ -2301,52 +2301,52 @@ msgstr ""
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:448
+#: lib/rpmchecksig.c:556
#, c-format
msgid "%s: import read failed.\n"
msgstr ""
-#: lib/rpmchecksig.c:453
+#: lib/rpmchecksig.c:561
#, c-format
msgid "%s: not an armored public key.\n"
msgstr ""
-#: lib/rpmchecksig.c:458
+#: lib/rpmchecksig.c:568
#, c-format
-msgid "%s: base64 encode failed.\n"
+msgid "%s: import failed.\n"
msgstr ""
-#: lib/rpmchecksig.c:600
+#: lib/rpmchecksig.c:617
#, c-format
msgid "%s: headerGetEntry failed\n"
msgstr ""
-#: lib/rpmchecksig.c:678
+#: lib/rpmchecksig.c:695
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr ""
-#: lib/rpmchecksig.c:933
+#: lib/rpmchecksig.c:950
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:934 lib/rpmchecksig.c:948
+#: lib/rpmchecksig.c:951 lib/rpmchecksig.c:965
msgid " (MISSING KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:936 lib/rpmchecksig.c:950
+#: lib/rpmchecksig.c:953 lib/rpmchecksig.c:967
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:937 lib/rpmchecksig.c:951
+#: lib/rpmchecksig.c:954 lib/rpmchecksig.c:968
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:939 lib/rpmchecksig.c:953
+#: lib/rpmchecksig.c:956 lib/rpmchecksig.c:970
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:947
+#: lib/rpmchecksig.c:964
msgid "OK"
msgstr ""
diff --git a/po/es.po b/po/es.po
index a60abfc77..2fb0518ee 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-08-05 21:40-0400\n"
+"POT-Creation-Date: 2002-08-06 15:06-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"
@@ -1516,7 +1516,7 @@ msgid "error creating temporary file %s\n"
msgstr ""
#: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709
-#: lib/package.c:739 lib/rpmchecksig.c:767
+#: lib/package.c:739 lib/rpmchecksig.c:784
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
@@ -1530,22 +1530,22 @@ msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
+#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:705
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
+#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:710
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/package.c:651 lib/rpmchecksig.c:586
+#: lib/package.c:651 lib/rpmchecksig.c:603
#, c-format
msgid "%s: headerRead failed\n"
msgstr ""
-#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
+#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:632
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr ""
@@ -2271,7 +2271,7 @@ msgstr ""
msgid "%s: Fwrite failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
+#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:689
#, c-format
msgid "%s: not an rpm package\n"
msgstr ""
@@ -2301,52 +2301,52 @@ msgstr ""
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:448
+#: lib/rpmchecksig.c:556
#, c-format
msgid "%s: import read failed.\n"
msgstr ""
-#: lib/rpmchecksig.c:453
+#: lib/rpmchecksig.c:561
#, c-format
msgid "%s: not an armored public key.\n"
msgstr ""
-#: lib/rpmchecksig.c:458
+#: lib/rpmchecksig.c:568
#, c-format
-msgid "%s: base64 encode failed.\n"
+msgid "%s: import failed.\n"
msgstr ""
-#: lib/rpmchecksig.c:600
+#: lib/rpmchecksig.c:617
#, c-format
msgid "%s: headerGetEntry failed\n"
msgstr ""
-#: lib/rpmchecksig.c:678
+#: lib/rpmchecksig.c:695
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr ""
-#: lib/rpmchecksig.c:933
+#: lib/rpmchecksig.c:950
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:934 lib/rpmchecksig.c:948
+#: lib/rpmchecksig.c:951 lib/rpmchecksig.c:965
msgid " (MISSING KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:936 lib/rpmchecksig.c:950
+#: lib/rpmchecksig.c:953 lib/rpmchecksig.c:967
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:937 lib/rpmchecksig.c:951
+#: lib/rpmchecksig.c:954 lib/rpmchecksig.c:968
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:939 lib/rpmchecksig.c:953
+#: lib/rpmchecksig.c:956 lib/rpmchecksig.c:970
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:947
+#: lib/rpmchecksig.c:964
msgid "OK"
msgstr ""
diff --git a/po/eu_ES.po b/po/eu_ES.po
index a60abfc77..2fb0518ee 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-08-05 21:40-0400\n"
+"POT-Creation-Date: 2002-08-06 15:06-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"
@@ -1516,7 +1516,7 @@ msgid "error creating temporary file %s\n"
msgstr ""
#: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709
-#: lib/package.c:739 lib/rpmchecksig.c:767
+#: lib/package.c:739 lib/rpmchecksig.c:784
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
@@ -1530,22 +1530,22 @@ msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
+#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:705
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
+#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:710
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/package.c:651 lib/rpmchecksig.c:586
+#: lib/package.c:651 lib/rpmchecksig.c:603
#, c-format
msgid "%s: headerRead failed\n"
msgstr ""
-#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
+#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:632
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr ""
@@ -2271,7 +2271,7 @@ msgstr ""
msgid "%s: Fwrite failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
+#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:689
#, c-format
msgid "%s: not an rpm package\n"
msgstr ""
@@ -2301,52 +2301,52 @@ msgstr ""
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:448
+#: lib/rpmchecksig.c:556
#, c-format
msgid "%s: import read failed.\n"
msgstr ""
-#: lib/rpmchecksig.c:453
+#: lib/rpmchecksig.c:561
#, c-format
msgid "%s: not an armored public key.\n"
msgstr ""
-#: lib/rpmchecksig.c:458
+#: lib/rpmchecksig.c:568
#, c-format
-msgid "%s: base64 encode failed.\n"
+msgid "%s: import failed.\n"
msgstr ""
-#: lib/rpmchecksig.c:600
+#: lib/rpmchecksig.c:617
#, c-format
msgid "%s: headerGetEntry failed\n"
msgstr ""
-#: lib/rpmchecksig.c:678
+#: lib/rpmchecksig.c:695
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr ""
-#: lib/rpmchecksig.c:933
+#: lib/rpmchecksig.c:950
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:934 lib/rpmchecksig.c:948
+#: lib/rpmchecksig.c:951 lib/rpmchecksig.c:965
msgid " (MISSING KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:936 lib/rpmchecksig.c:950
+#: lib/rpmchecksig.c:953 lib/rpmchecksig.c:967
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:937 lib/rpmchecksig.c:951
+#: lib/rpmchecksig.c:954 lib/rpmchecksig.c:968
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:939 lib/rpmchecksig.c:953
+#: lib/rpmchecksig.c:956 lib/rpmchecksig.c:970
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:947
+#: lib/rpmchecksig.c:964
msgid "OK"
msgstr ""
diff --git a/po/fi.po b/po/fi.po
index ffa1eebd7..2c1b125df 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-08-05 21:40-0400\n"
+"POT-Creation-Date: 2002-08-06 15:06-0400\n"
"Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
"Language-Team: Finnish <linux@sot.com>\n"
"Content-Type: text/plain; charset=\n"
@@ -1574,7 +1574,7 @@ msgid "error creating temporary file %s\n"
msgstr "virhe luotaessa hakemistoa %s: %s"
#: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709
-#: lib/package.c:739 lib/rpmchecksig.c:767
+#: lib/package.c:739 lib/rpmchecksig.c:784
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
@@ -1592,22 +1592,22 @@ msgid ""
msgstr ""
"tämä versio RPM:stä tukee vain suuremmman kuin 3 versionumeron paketteja"
-#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
+#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:705
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: rpmReadSignature epäonnistui\n"
-#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
+#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:710
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Ei allekirjoitusta saatavilla\n"
-#: lib/package.c:651 lib/rpmchecksig.c:586
+#: lib/package.c:651 lib/rpmchecksig.c:603
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: readLead epäonnistui\n"
-#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
+#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:632
#, fuzzy, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: readLead epäonnistui\n"
@@ -2398,7 +2398,7 @@ msgstr "%s: avaus ei onnistunut\n"
msgid "%s: Fwrite failed: %s\n"
msgstr "%s: readLead epäonnistui\n"
-#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
+#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:689
#, fuzzy, c-format
msgid "%s: not an rpm package\n"
msgstr "virhe: %s ei vaikuta RPM paketilta\n"
@@ -2428,53 +2428,53 @@ msgstr "%s: readLead epäonnistui\n"
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: rpmReadSignature epäonnistui\n"
-#: lib/rpmchecksig.c:448
+#: lib/rpmchecksig.c:556
#, fuzzy, c-format
msgid "%s: import read failed.\n"
msgstr "%s: readLead epäonnistui\n"
-#: lib/rpmchecksig.c:453
+#: lib/rpmchecksig.c:561
#, c-format
msgid "%s: not an armored public key.\n"
msgstr ""
-#: lib/rpmchecksig.c:458
+#: lib/rpmchecksig.c:568
#, fuzzy, c-format
-msgid "%s: base64 encode failed.\n"
+msgid "%s: import failed.\n"
msgstr "%s: readLead epäonnistui\n"
-#: lib/rpmchecksig.c:600
+#: lib/rpmchecksig.c:617
#, fuzzy, c-format
msgid "%s: headerGetEntry failed\n"
msgstr "%s: readLead epäonnistui\n"
-#: lib/rpmchecksig.c:678
+#: lib/rpmchecksig.c:695
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr "%s: Ei allekirjoitusta saatavilla (v1.0 RPM)\n"
-#: lib/rpmchecksig.c:933
+#: lib/rpmchecksig.c:950
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:934 lib/rpmchecksig.c:948
+#: lib/rpmchecksig.c:951 lib/rpmchecksig.c:965
#, fuzzy
msgid " (MISSING KEYS:"
msgstr "(PUUTTUVAT AVAIMET)"
-#: lib/rpmchecksig.c:936 lib/rpmchecksig.c:950
+#: lib/rpmchecksig.c:953 lib/rpmchecksig.c:967
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:937 lib/rpmchecksig.c:951
+#: lib/rpmchecksig.c:954 lib/rpmchecksig.c:968
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:939 lib/rpmchecksig.c:953
+#: lib/rpmchecksig.c:956 lib/rpmchecksig.c:970
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:947
+#: lib/rpmchecksig.c:964
msgid "OK"
msgstr ""
@@ -3699,6 +3699,10 @@ msgstr "%s: avaus ei onnistunut\n"
msgid "%s: read manifest failed: %s\n"
msgstr "%s: readLead epäonnistui\n"
+#, fuzzy
+#~ msgid "%s: base64 encode failed.\n"
+#~ msgstr "%s: readLead epäonnistui\n"
+
#~ msgid "%s: readLead failed\n"
#~ msgstr "%s: readLead epäonnistui\n"
diff --git a/po/fr.po b/po/fr.po
index 9d2432a17..8d5dca8d2 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-08-05 21:40-0400\n"
+"POT-Creation-Date: 2002-08-06 15:06-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"
@@ -1601,7 +1601,7 @@ msgid "error creating temporary file %s\n"
msgstr "impossible d'ouvrir: %s\n"
#: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709
-#: lib/package.c:739 lib/rpmchecksig.c:767
+#: lib/package.c:739 lib/rpmchecksig.c:784
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
@@ -1615,22 +1615,22 @@ msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
+#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:705
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
+#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:710
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/package.c:651 lib/rpmchecksig.c:586
+#: lib/package.c:651 lib/rpmchecksig.c:603
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
+#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:632
#, fuzzy, c-format
msgid "%s: Fread failed: %s\n"
msgstr "impossible d'ouvrir: %s\n"
@@ -2440,7 +2440,7 @@ msgstr "La construction a chou.\n"
msgid "%s: Fwrite failed: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
+#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:689
#, fuzzy, c-format
msgid "%s: not an rpm package\n"
msgstr "aucun package n'a t spcifi pour l'installation"
@@ -2470,52 +2470,52 @@ msgstr ""
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/rpmchecksig.c:448
+#: lib/rpmchecksig.c:556
#, fuzzy, c-format
msgid "%s: import read failed.\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/rpmchecksig.c:453
+#: lib/rpmchecksig.c:561
#, c-format
msgid "%s: not an armored public key.\n"
msgstr ""
-#: lib/rpmchecksig.c:458
+#: lib/rpmchecksig.c:568
#, fuzzy, c-format
-msgid "%s: base64 encode failed.\n"
+msgid "%s: import failed.\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/rpmchecksig.c:600
+#: lib/rpmchecksig.c:617
#, fuzzy, c-format
msgid "%s: headerGetEntry failed\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/rpmchecksig.c:678
+#: lib/rpmchecksig.c:695
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr ""
-#: lib/rpmchecksig.c:933
+#: lib/rpmchecksig.c:950
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:934 lib/rpmchecksig.c:948
+#: lib/rpmchecksig.c:951 lib/rpmchecksig.c:965
msgid " (MISSING KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:936 lib/rpmchecksig.c:950
+#: lib/rpmchecksig.c:953 lib/rpmchecksig.c:967
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:937 lib/rpmchecksig.c:951
+#: lib/rpmchecksig.c:954 lib/rpmchecksig.c:968
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:939 lib/rpmchecksig.c:953
+#: lib/rpmchecksig.c:956 lib/rpmchecksig.c:970
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:947
+#: lib/rpmchecksig.c:964
msgid "OK"
msgstr ""
@@ -3726,6 +3726,10 @@ msgid "%s: read manifest failed: %s\n"
msgstr "impossible d'ouvrir: %s\n"
#, fuzzy
+#~ msgid "%s: base64 encode failed.\n"
+#~ msgstr "impossible d'ouvrir: %s\n"
+
+#, fuzzy
#~ msgid "rollback %d packages to %s"
#~ msgstr "aucun package n'a t spcifi pour la dsinstallation"
diff --git a/po/gl.po b/po/gl.po
index 95d520c0f..cbbd74dde 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-08-05 21:40-0400\n"
+"POT-Creation-Date: 2002-08-06 15:06-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"
@@ -1511,7 +1511,7 @@ msgid "error creating temporary file %s\n"
msgstr ""
#: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709
-#: lib/package.c:739 lib/rpmchecksig.c:767
+#: lib/package.c:739 lib/rpmchecksig.c:784
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
@@ -1525,22 +1525,22 @@ msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
+#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:705
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
+#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:710
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/package.c:651 lib/rpmchecksig.c:586
+#: lib/package.c:651 lib/rpmchecksig.c:603
#, c-format
msgid "%s: headerRead failed\n"
msgstr ""
-#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
+#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:632
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr ""
@@ -2266,7 +2266,7 @@ msgstr ""
msgid "%s: Fwrite failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
+#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:689
#, c-format
msgid "%s: not an rpm package\n"
msgstr ""
@@ -2296,52 +2296,52 @@ msgstr ""
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:448
+#: lib/rpmchecksig.c:556
#, c-format
msgid "%s: import read failed.\n"
msgstr ""
-#: lib/rpmchecksig.c:453
+#: lib/rpmchecksig.c:561
#, c-format
msgid "%s: not an armored public key.\n"
msgstr ""
-#: lib/rpmchecksig.c:458
+#: lib/rpmchecksig.c:568
#, c-format
-msgid "%s: base64 encode failed.\n"
+msgid "%s: import failed.\n"
msgstr ""
-#: lib/rpmchecksig.c:600
+#: lib/rpmchecksig.c:617
#, c-format
msgid "%s: headerGetEntry failed\n"
msgstr ""
-#: lib/rpmchecksig.c:678
+#: lib/rpmchecksig.c:695
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr ""
-#: lib/rpmchecksig.c:933
+#: lib/rpmchecksig.c:950
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:934 lib/rpmchecksig.c:948
+#: lib/rpmchecksig.c:951 lib/rpmchecksig.c:965
msgid " (MISSING KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:936 lib/rpmchecksig.c:950
+#: lib/rpmchecksig.c:953 lib/rpmchecksig.c:967
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:937 lib/rpmchecksig.c:951
+#: lib/rpmchecksig.c:954 lib/rpmchecksig.c:968
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:939 lib/rpmchecksig.c:953
+#: lib/rpmchecksig.c:956 lib/rpmchecksig.c:970
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:947
+#: lib/rpmchecksig.c:964
msgid "OK"
msgstr ""
diff --git a/po/hu.po b/po/hu.po
index a60abfc77..2fb0518ee 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-08-05 21:40-0400\n"
+"POT-Creation-Date: 2002-08-06 15:06-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"
@@ -1516,7 +1516,7 @@ msgid "error creating temporary file %s\n"
msgstr ""
#: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709
-#: lib/package.c:739 lib/rpmchecksig.c:767
+#: lib/package.c:739 lib/rpmchecksig.c:784
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
@@ -1530,22 +1530,22 @@ msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
+#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:705
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
+#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:710
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/package.c:651 lib/rpmchecksig.c:586
+#: lib/package.c:651 lib/rpmchecksig.c:603
#, c-format
msgid "%s: headerRead failed\n"
msgstr ""
-#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
+#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:632
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr ""
@@ -2271,7 +2271,7 @@ msgstr ""
msgid "%s: Fwrite failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
+#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:689
#, c-format
msgid "%s: not an rpm package\n"
msgstr ""
@@ -2301,52 +2301,52 @@ msgstr ""
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:448
+#: lib/rpmchecksig.c:556
#, c-format
msgid "%s: import read failed.\n"
msgstr ""
-#: lib/rpmchecksig.c:453
+#: lib/rpmchecksig.c:561
#, c-format
msgid "%s: not an armored public key.\n"
msgstr ""
-#: lib/rpmchecksig.c:458
+#: lib/rpmchecksig.c:568
#, c-format
-msgid "%s: base64 encode failed.\n"
+msgid "%s: import failed.\n"
msgstr ""
-#: lib/rpmchecksig.c:600
+#: lib/rpmchecksig.c:617
#, c-format
msgid "%s: headerGetEntry failed\n"
msgstr ""
-#: lib/rpmchecksig.c:678
+#: lib/rpmchecksig.c:695
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr ""
-#: lib/rpmchecksig.c:933
+#: lib/rpmchecksig.c:950
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:934 lib/rpmchecksig.c:948
+#: lib/rpmchecksig.c:951 lib/rpmchecksig.c:965
msgid " (MISSING KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:936 lib/rpmchecksig.c:950
+#: lib/rpmchecksig.c:953 lib/rpmchecksig.c:967
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:937 lib/rpmchecksig.c:951
+#: lib/rpmchecksig.c:954 lib/rpmchecksig.c:968
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:939 lib/rpmchecksig.c:953
+#: lib/rpmchecksig.c:956 lib/rpmchecksig.c:970
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:947
+#: lib/rpmchecksig.c:964
msgid "OK"
msgstr ""
diff --git a/po/id.po b/po/id.po
index a60abfc77..2fb0518ee 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-08-05 21:40-0400\n"
+"POT-Creation-Date: 2002-08-06 15:06-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"
@@ -1516,7 +1516,7 @@ msgid "error creating temporary file %s\n"
msgstr ""
#: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709
-#: lib/package.c:739 lib/rpmchecksig.c:767
+#: lib/package.c:739 lib/rpmchecksig.c:784
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
@@ -1530,22 +1530,22 @@ msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
+#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:705
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
+#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:710
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/package.c:651 lib/rpmchecksig.c:586
+#: lib/package.c:651 lib/rpmchecksig.c:603
#, c-format
msgid "%s: headerRead failed\n"
msgstr ""
-#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
+#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:632
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr ""
@@ -2271,7 +2271,7 @@ msgstr ""
msgid "%s: Fwrite failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
+#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:689
#, c-format
msgid "%s: not an rpm package\n"
msgstr ""
@@ -2301,52 +2301,52 @@ msgstr ""
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:448
+#: lib/rpmchecksig.c:556
#, c-format
msgid "%s: import read failed.\n"
msgstr ""
-#: lib/rpmchecksig.c:453
+#: lib/rpmchecksig.c:561
#, c-format
msgid "%s: not an armored public key.\n"
msgstr ""
-#: lib/rpmchecksig.c:458
+#: lib/rpmchecksig.c:568
#, c-format
-msgid "%s: base64 encode failed.\n"
+msgid "%s: import failed.\n"
msgstr ""
-#: lib/rpmchecksig.c:600
+#: lib/rpmchecksig.c:617
#, c-format
msgid "%s: headerGetEntry failed\n"
msgstr ""
-#: lib/rpmchecksig.c:678
+#: lib/rpmchecksig.c:695
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr ""
-#: lib/rpmchecksig.c:933
+#: lib/rpmchecksig.c:950
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:934 lib/rpmchecksig.c:948
+#: lib/rpmchecksig.c:951 lib/rpmchecksig.c:965
msgid " (MISSING KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:936 lib/rpmchecksig.c:950
+#: lib/rpmchecksig.c:953 lib/rpmchecksig.c:967
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:937 lib/rpmchecksig.c:951
+#: lib/rpmchecksig.c:954 lib/rpmchecksig.c:968
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:939 lib/rpmchecksig.c:953
+#: lib/rpmchecksig.c:956 lib/rpmchecksig.c:970
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:947
+#: lib/rpmchecksig.c:964
msgid "OK"
msgstr ""
diff --git a/po/is.po b/po/is.po
index 9caee9912..a317a8a21 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-08-05 21:40-0400\n"
+"POT-Creation-Date: 2002-08-06 15:06-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"
@@ -1524,7 +1524,7 @@ msgid "error creating temporary file %s\n"
msgstr ""
#: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709
-#: lib/package.c:739 lib/rpmchecksig.c:767
+#: lib/package.c:739 lib/rpmchecksig.c:784
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
@@ -1538,22 +1538,22 @@ msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
+#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:705
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
+#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:710
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/package.c:651 lib/rpmchecksig.c:586
+#: lib/package.c:651 lib/rpmchecksig.c:603
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: Fseek brást: %s\n"
-#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
+#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:632
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr ""
@@ -2292,7 +2292,7 @@ msgstr ""
msgid "%s: Fwrite failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
+#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:689
#, fuzzy, c-format
msgid "%s: not an rpm package\n"
msgstr "get ekki opnağ pakka gagnagrunn í\n"
@@ -2322,52 +2322,52 @@ msgstr ""
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:448
+#: lib/rpmchecksig.c:556
#, fuzzy, c-format
msgid "%s: import read failed.\n"
msgstr "%s: Fseek brást: %s\n"
-#: lib/rpmchecksig.c:453
+#: lib/rpmchecksig.c:561
#, c-format
msgid "%s: not an armored public key.\n"
msgstr ""
-#: lib/rpmchecksig.c:458
+#: lib/rpmchecksig.c:568
#, fuzzy, c-format
-msgid "%s: base64 encode failed.\n"
+msgid "%s: import failed.\n"
msgstr "%s: Fseek brást: %s\n"
-#: lib/rpmchecksig.c:600
+#: lib/rpmchecksig.c:617
#, fuzzy, c-format
msgid "%s: headerGetEntry failed\n"
msgstr "%s: gat ekki lesiğ manifest: %s\n"
-#: lib/rpmchecksig.c:678
+#: lib/rpmchecksig.c:695
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr ""
-#: lib/rpmchecksig.c:933
+#: lib/rpmchecksig.c:950
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:934 lib/rpmchecksig.c:948
+#: lib/rpmchecksig.c:951 lib/rpmchecksig.c:965
msgid " (MISSING KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:936 lib/rpmchecksig.c:950
+#: lib/rpmchecksig.c:953 lib/rpmchecksig.c:967
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:937 lib/rpmchecksig.c:951
+#: lib/rpmchecksig.c:954 lib/rpmchecksig.c:968
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:939 lib/rpmchecksig.c:953
+#: lib/rpmchecksig.c:956 lib/rpmchecksig.c:970
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:947
+#: lib/rpmchecksig.c:964
msgid "OK"
msgstr ""
@@ -3563,6 +3563,10 @@ msgid "%s: read manifest failed: %s\n"
msgstr "%s rmdir %s brást: %s\n"
#, fuzzy
+#~ msgid "%s: base64 encode failed.\n"
+#~ msgstr "%s: Fseek brást: %s\n"
+
+#, fuzzy
#~ msgid "h#%7u: %s"
#~ msgstr "%s: %s\n"
diff --git a/po/it.po b/po/it.po
index a60abfc77..2fb0518ee 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-08-05 21:40-0400\n"
+"POT-Creation-Date: 2002-08-06 15:06-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"
@@ -1516,7 +1516,7 @@ msgid "error creating temporary file %s\n"
msgstr ""
#: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709
-#: lib/package.c:739 lib/rpmchecksig.c:767
+#: lib/package.c:739 lib/rpmchecksig.c:784
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
@@ -1530,22 +1530,22 @@ msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
+#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:705
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
+#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:710
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/package.c:651 lib/rpmchecksig.c:586
+#: lib/package.c:651 lib/rpmchecksig.c:603
#, c-format
msgid "%s: headerRead failed\n"
msgstr ""
-#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
+#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:632
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr ""
@@ -2271,7 +2271,7 @@ msgstr ""
msgid "%s: Fwrite failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
+#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:689
#, c-format
msgid "%s: not an rpm package\n"
msgstr ""
@@ -2301,52 +2301,52 @@ msgstr ""
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:448
+#: lib/rpmchecksig.c:556
#, c-format
msgid "%s: import read failed.\n"
msgstr ""
-#: lib/rpmchecksig.c:453
+#: lib/rpmchecksig.c:561
#, c-format
msgid "%s: not an armored public key.\n"
msgstr ""
-#: lib/rpmchecksig.c:458
+#: lib/rpmchecksig.c:568
#, c-format
-msgid "%s: base64 encode failed.\n"
+msgid "%s: import failed.\n"
msgstr ""
-#: lib/rpmchecksig.c:600
+#: lib/rpmchecksig.c:617
#, c-format
msgid "%s: headerGetEntry failed\n"
msgstr ""
-#: lib/rpmchecksig.c:678
+#: lib/rpmchecksig.c:695
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr ""
-#: lib/rpmchecksig.c:933
+#: lib/rpmchecksig.c:950
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:934 lib/rpmchecksig.c:948
+#: lib/rpmchecksig.c:951 lib/rpmchecksig.c:965
msgid " (MISSING KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:936 lib/rpmchecksig.c:950
+#: lib/rpmchecksig.c:953 lib/rpmchecksig.c:967
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:937 lib/rpmchecksig.c:951
+#: lib/rpmchecksig.c:954 lib/rpmchecksig.c:968
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:939 lib/rpmchecksig.c:953
+#: lib/rpmchecksig.c:956 lib/rpmchecksig.c:970
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:947
+#: lib/rpmchecksig.c:964
msgid "OK"
msgstr ""
diff --git a/po/ja.po b/po/ja.po
index 5ed9a9c1b..a09695ea5 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-08-05 21:40-0400\n"
+"POT-Creation-Date: 2002-08-06 15:06-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"
@@ -1599,7 +1599,7 @@ msgid "error creating temporary file %s\n"
msgstr "°ì»ş¥Õ¥¡¥¤¥ë %s ¤ÎºîÀ®¥¨¥é¡¼"
#: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709
-#: lib/package.c:739 lib/rpmchecksig.c:767
+#: lib/package.c:739 lib/rpmchecksig.c:784
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
@@ -1617,22 +1617,22 @@ msgid ""
msgstr ""
"¥á¥¸¥ã¡¼ÈÖ¹æ <=3 ¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î¤ß¤³¤Î¥Ğ¡¼¥¸¥ç¥ó¤Î RPM ¤Ï¥µ¥İ¡¼¥È¤µ¤ì¤Æ¤¤¤Ş¤¹"
-#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
+#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:705
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: rpmReadSignature ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿\n"
-#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
+#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:710
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Í­¸ú¤Ê½ğ̾¤Ï¤¢¤ê¤Ş¤»¤ó\n"
-#: lib/package.c:651 lib/rpmchecksig.c:586
+#: lib/package.c:651 lib/rpmchecksig.c:603
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: readLead ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿\n"
-#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
+#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:632
#, fuzzy, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: Fread ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿: %s\n"
@@ -2437,7 +2437,7 @@ msgstr "makeTempFile ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿\n"
msgid "%s: Fwrite failed: %s\n"
msgstr "%s: Fwrite ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿: %s\n"
-#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
+#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:689
#, fuzzy, c-format
msgid "%s: not an rpm package\n"
msgstr "°ú¿ô¤Ï RPM ¥Ñ¥Ã¥±¡¼¥¸¤Ç¤Ï¤¢¤ê¤Ş¤»¤ó\n"
@@ -2467,53 +2467,53 @@ msgstr "%s: writedLead ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿: %s\n"
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: rpmWriteSignature ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿\n"
-#: lib/rpmchecksig.c:448
+#: lib/rpmchecksig.c:556
#, fuzzy, c-format
msgid "%s: import read failed.\n"
msgstr "%s: readLead ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿\n"
-#: lib/rpmchecksig.c:453
+#: lib/rpmchecksig.c:561
#, c-format
msgid "%s: not an armored public key.\n"
msgstr ""
-#: lib/rpmchecksig.c:458
+#: lib/rpmchecksig.c:568
#, fuzzy, c-format
-msgid "%s: base64 encode failed.\n"
+msgid "%s: import failed.\n"
msgstr "%s: readLead ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿\n"
-#: lib/rpmchecksig.c:600
+#: lib/rpmchecksig.c:617
#, fuzzy, c-format
msgid "%s: headerGetEntry failed\n"
msgstr "%s: readLead ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿\n"
-#: lib/rpmchecksig.c:678
+#: lib/rpmchecksig.c:695
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr "%s: Í­¸ú¤Ê½ğ̾¤Ï¤¢¤ê¤Ş¤»¤ó(v1.0 RPM)\n"
-#: lib/rpmchecksig.c:933
+#: lib/rpmchecksig.c:950
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:934 lib/rpmchecksig.c:948
+#: lib/rpmchecksig.c:951 lib/rpmchecksig.c:965
#, fuzzy
msgid " (MISSING KEYS:"
msgstr " (¥­¡¼¤Îʶ¼º) "
-#: lib/rpmchecksig.c:936 lib/rpmchecksig.c:950
+#: lib/rpmchecksig.c:953 lib/rpmchecksig.c:967
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:937 lib/rpmchecksig.c:951
+#: lib/rpmchecksig.c:954 lib/rpmchecksig.c:968
msgid " (UNTRUSTED KEYS:"
msgstr " (¿®Íê¤Ç¤­¤Ê¤¤¸°:"
-#: lib/rpmchecksig.c:939 lib/rpmchecksig.c:953
+#: lib/rpmchecksig.c:956 lib/rpmchecksig.c:970
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:947
+#: lib/rpmchecksig.c:964
msgid "OK"
msgstr ""
@@ -3751,6 +3751,10 @@ msgstr "%s: fdOpen ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿: %s\n"
msgid "%s: read manifest failed: %s\n"
msgstr "%s: Fread ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿: %s\n"
+#, fuzzy
+#~ msgid "%s: base64 encode failed.\n"
+#~ msgstr "%s: readLead ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿\n"
+
#~ msgid "%s: readLead failed\n"
#~ msgstr "%s: readLead ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿\n"
diff --git a/po/ko.po b/po/ko.po
index 9e19cefc5..abd970f7f 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-08-05 21:40-0400\n"
+"POT-Creation-Date: 2002-08-06 15:06-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"
@@ -1540,7 +1540,7 @@ msgid "error creating temporary file %s\n"
msgstr "Àӽà ÆÄÀÏ %s(À»)¸¦ »ı¼ºÇÏ´Â µµÁß ¿À·ù°¡ ¹ß»ıÇß½À´Ï´Ù\n"
#: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709
-#: lib/package.c:739 lib/rpmchecksig.c:767
+#: lib/package.c:739 lib/rpmchecksig.c:784
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
@@ -1554,22 +1554,22 @@ msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr "ÀÌ RPM ¹öÀüÀº ÁÖ ¹øÈ£(major number)°¡ <= 4 ÀÎ ÆĞŰ¡ ¸¸À» Áö¿øÇÕ´Ï´Ù\n"
-#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
+#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:705
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: rpmReadSignatureÀÌ ½ÇÆĞÇß½À´Ï´Ù\n"
-#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
+#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:710
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: À¯È¿ÇÑ ¼­¸íÀÌ ¾ø½À´Ï´Ù\n"
-#: lib/package.c:651 lib/rpmchecksig.c:586
+#: lib/package.c:651 lib/rpmchecksig.c:603
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: readLeadÀÌ ½ÇÆĞÇß½À´Ï´Ù\n"
-#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
+#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:632
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: FreadÀÌ ½ÇÆĞÇß½À´Ï´Ù: %s\n"
@@ -2332,7 +2332,7 @@ msgstr "makeTempFileÀÌ ½ÇÆĞÇß½À´Ï´Ù\n"
msgid "%s: Fwrite failed: %s\n"
msgstr "%s: FwriteÀÌ ½ÇÆĞÇß½À´Ï´Ù: %s\n"
-#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
+#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:689
#, fuzzy, c-format
msgid "%s: not an rpm package\n"
msgstr "Àμö °ªÀ¸·Î RPM ÆĞÅ°Áö°¡ ÁöÁ¤µÇ¾î¾ß ÇÕ´Ï´Ù\n"
@@ -2362,52 +2362,52 @@ msgstr "%s: writeLeadÀÌ ½ÇÆĞÇß½À´Ï´Ù: %s\n"
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: rpmWriteSignatureÀÌ ½ÇÆĞÇß½À´Ï´Ù: %s\n"
-#: lib/rpmchecksig.c:448
+#: lib/rpmchecksig.c:556
#, fuzzy, c-format
msgid "%s: import read failed.\n"
msgstr "%s: readLeadÀÌ ½ÇÆĞÇß½À´Ï´Ù\n"
-#: lib/rpmchecksig.c:453
+#: lib/rpmchecksig.c:561
#, c-format
msgid "%s: not an armored public key.\n"
msgstr ""
-#: lib/rpmchecksig.c:458
+#: lib/rpmchecksig.c:568
#, fuzzy, c-format
-msgid "%s: base64 encode failed.\n"
+msgid "%s: import failed.\n"
msgstr "%s: readLeadÀÌ ½ÇÆĞÇß½À´Ï´Ù\n"
-#: lib/rpmchecksig.c:600
+#: lib/rpmchecksig.c:617
#, fuzzy, c-format
msgid "%s: headerGetEntry failed\n"
msgstr "%s: readLeadÀÌ ½ÇÆĞÇß½À´Ï´Ù\n"
-#: lib/rpmchecksig.c:678
+#: lib/rpmchecksig.c:695
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr "%s: À¯È¿ÇÑ ¼­¸íÀÌ ¾ø½À´Ï´Ù (v1.0 RPM)\n"
-#: lib/rpmchecksig.c:933
+#: lib/rpmchecksig.c:950
msgid "NOT OK"
msgstr "¿Ã¹Ù¸£Áö ¾ÊÀ½"
-#: lib/rpmchecksig.c:934 lib/rpmchecksig.c:948
+#: lib/rpmchecksig.c:951 lib/rpmchecksig.c:965
msgid " (MISSING KEYS:"
msgstr " (Å°¸¦ ãÀ» ¼ö ¾øÀ½:"
-#: lib/rpmchecksig.c:936 lib/rpmchecksig.c:950
+#: lib/rpmchecksig.c:953 lib/rpmchecksig.c:967
msgid ") "
msgstr ") "
-#: lib/rpmchecksig.c:937 lib/rpmchecksig.c:951
+#: lib/rpmchecksig.c:954 lib/rpmchecksig.c:968
msgid " (UNTRUSTED KEYS:"
msgstr " (Å°¸¦ ½Å·ÚÇÒ ¼ö ¾øÀ½:"
-#: lib/rpmchecksig.c:939 lib/rpmchecksig.c:953
+#: lib/rpmchecksig.c:956 lib/rpmchecksig.c:970
msgid ")"
msgstr ")"
-#: lib/rpmchecksig.c:947
+#: lib/rpmchecksig.c:964
msgid "OK"
msgstr "È®ÀÎ"
@@ -3627,6 +3627,10 @@ msgstr "%s: ¿©´Âµ¥ ½ÇÆĞÇß½À´Ï´Ù: %s\n"
msgid "%s: read manifest failed: %s\n"
msgstr "%s: Àдµ¥ ½ÇÆĞÇß½À´Ï´Ù: %s\n"
+#, fuzzy
+#~ msgid "%s: base64 encode failed.\n"
+#~ msgstr "%s: readLeadÀÌ ½ÇÆĞÇß½À´Ï´Ù\n"
+
#~ msgid "%s: readLead failed\n"
#~ msgstr "%s: readLeadÀÌ ½ÇÆĞÇß½À´Ï´Ù\n"
diff --git a/po/no.po b/po/no.po
index 7d6ecde58..724cb5984 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-08-05 21:40-0400\n"
+"POT-Creation-Date: 2002-08-06 15:06-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"
@@ -1539,7 +1539,7 @@ msgid "error creating temporary file %s\n"
msgstr "feil under oppretting av midlertidig fil %s\n"
#: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709
-#: lib/package.c:739 lib/rpmchecksig.c:767
+#: lib/package.c:739 lib/rpmchecksig.c:784
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
@@ -1553,22 +1553,22 @@ msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
+#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:705
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: rpmReadSignature feilet\n"
-#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
+#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:710
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Ingen signatur tilgjengelig\n"
-#: lib/package.c:651 lib/rpmchecksig.c:586
+#: lib/package.c:651 lib/rpmchecksig.c:603
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: readLead feilet\n"
-#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
+#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:632
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: Fread feilet: %s\n"
@@ -2319,7 +2319,7 @@ msgstr "makeTempFile feilet\n"
msgid "%s: Fwrite failed: %s\n"
msgstr "%s: Fwrite feilet: %s\n"
-#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
+#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:689
#, fuzzy, c-format
msgid "%s: not an rpm package\n"
msgstr "argumentet er ikke en RPM-pakke\n"
@@ -2349,52 +2349,52 @@ msgstr "%s: writeLead feilet: %s\n"
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: rpmWriteSignature feilet: %s\n"
-#: lib/rpmchecksig.c:448
+#: lib/rpmchecksig.c:556
#, fuzzy, c-format
msgid "%s: import read failed.\n"
msgstr "%s: readLead feilet\n"
-#: lib/rpmchecksig.c:453
+#: lib/rpmchecksig.c:561
#, c-format
msgid "%s: not an armored public key.\n"
msgstr ""
-#: lib/rpmchecksig.c:458
+#: lib/rpmchecksig.c:568
#, fuzzy, c-format
-msgid "%s: base64 encode failed.\n"
+msgid "%s: import failed.\n"
msgstr "%s: readLead feilet\n"
-#: lib/rpmchecksig.c:600
+#: lib/rpmchecksig.c:617
#, fuzzy, c-format
msgid "%s: headerGetEntry failed\n"
msgstr "%s: readLead feilet\n"
-#: lib/rpmchecksig.c:678
+#: lib/rpmchecksig.c:695
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr "%s: Ingen signatur tilgjengelig (v1.0 RPM)\n"
-#: lib/rpmchecksig.c:933
+#: lib/rpmchecksig.c:950
msgid "NOT OK"
msgstr "IKKE OK"
-#: lib/rpmchecksig.c:934 lib/rpmchecksig.c:948
+#: lib/rpmchecksig.c:951 lib/rpmchecksig.c:965
msgid " (MISSING KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:936 lib/rpmchecksig.c:950
+#: lib/rpmchecksig.c:953 lib/rpmchecksig.c:967
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:937 lib/rpmchecksig.c:951
+#: lib/rpmchecksig.c:954 lib/rpmchecksig.c:968
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:939 lib/rpmchecksig.c:953
+#: lib/rpmchecksig.c:956 lib/rpmchecksig.c:970
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:947
+#: lib/rpmchecksig.c:964
msgid "OK"
msgstr "OK"
@@ -3594,6 +3594,10 @@ msgstr "%s: åpne feilet: %s\n"
msgid "%s: read manifest failed: %s\n"
msgstr "%s: lesing av manifest feilet: %s\n"
+#, fuzzy
+#~ msgid "%s: base64 encode failed.\n"
+#~ msgstr "%s: readLead feilet\n"
+
#~ msgid "%s: readLead failed\n"
#~ msgstr "%s: readLead feilet\n"
diff --git a/po/pl.po b/po/pl.po
index acd3a7c90..65308c079 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-08-05 21:40-0400\n"
+"POT-Creation-Date: 2002-08-06 15:06-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"
@@ -1581,7 +1581,7 @@ msgid "error creating temporary file %s\n"
msgstr "b³±d w tworzeniu pliku tymczasowego %s"
#: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709
-#: lib/package.c:739 lib/rpmchecksig.c:767
+#: lib/package.c:739 lib/rpmchecksig.c:784
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
@@ -1599,22 +1599,22 @@ msgid ""
msgstr ""
"tylko pakiety z numerem g³ównym <= 3 s± obs³ugiwane przez t± wersjê RPM'a"
-#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
+#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:705
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: rpmReadSignature nie powiod³o siê\n"
-#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
+#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:710
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Sygnatura nie jest dostêpna\n"
-#: lib/package.c:651 lib/rpmchecksig.c:586
+#: lib/package.c:651 lib/rpmchecksig.c:603
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: readLead nie powiod³o siê\n"
-#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
+#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:632
#, fuzzy, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: readLead nie powiod³o siê\n"
@@ -2400,7 +2400,7 @@ msgstr "wykonanie nie powiod³o siê\n"
msgid "%s: Fwrite failed: %s\n"
msgstr "%s: readLead nie powiod³o siê\n"
-#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
+#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:689
#, fuzzy, c-format
msgid "%s: not an rpm package\n"
msgstr "argument nie jest pakietem RPM\n"
@@ -2430,52 +2430,52 @@ msgstr "%s: readLead nie powiod³o siê\n"
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: rpmReadSignature nie powiod³o siê\n"
-#: lib/rpmchecksig.c:448
+#: lib/rpmchecksig.c:556
#, fuzzy, c-format
msgid "%s: import read failed.\n"
msgstr "%s: readLead nie powiod³o siê\n"
-#: lib/rpmchecksig.c:453
+#: lib/rpmchecksig.c:561
#, c-format
msgid "%s: not an armored public key.\n"
msgstr ""
-#: lib/rpmchecksig.c:458
+#: lib/rpmchecksig.c:568
#, fuzzy, c-format
-msgid "%s: base64 encode failed.\n"
+msgid "%s: import failed.\n"
msgstr "%s: readLead nie powiod³o siê\n"
-#: lib/rpmchecksig.c:600
+#: lib/rpmchecksig.c:617
#, fuzzy, c-format
msgid "%s: headerGetEntry failed\n"
msgstr "%s: readLead nie powiod³o siê\n"
-#: lib/rpmchecksig.c:678
+#: lib/rpmchecksig.c:695
#, 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:933
+#: lib/rpmchecksig.c:950
msgid "NOT OK"
msgstr "NIE DOBRZE"
-#: lib/rpmchecksig.c:934 lib/rpmchecksig.c:948
+#: lib/rpmchecksig.c:951 lib/rpmchecksig.c:965
msgid " (MISSING KEYS:"
msgstr " (BRAK KLUCZY:"
-#: lib/rpmchecksig.c:936 lib/rpmchecksig.c:950
+#: lib/rpmchecksig.c:953 lib/rpmchecksig.c:967
msgid ") "
msgstr ") "
-#: lib/rpmchecksig.c:937 lib/rpmchecksig.c:951
+#: lib/rpmchecksig.c:954 lib/rpmchecksig.c:968
msgid " (UNTRUSTED KEYS:"
msgstr "(NIEWIARYGODNE KLUCZE:"
-#: lib/rpmchecksig.c:939 lib/rpmchecksig.c:953
+#: lib/rpmchecksig.c:956 lib/rpmchecksig.c:970
msgid ")"
msgstr ")"
-#: lib/rpmchecksig.c:947
+#: lib/rpmchecksig.c:964
msgid "OK"
msgstr "OK"
@@ -3695,6 +3695,10 @@ msgstr "%s: Open nie powiod³o siê\n"
msgid "%s: read manifest failed: %s\n"
msgstr "%s: readLead nie powiod³o siê\n"
+#, fuzzy
+#~ msgid "%s: base64 encode failed.\n"
+#~ msgstr "%s: readLead nie powiod³o siê\n"
+
#~ msgid "%s: readLead failed\n"
#~ msgstr "%s: readLead nie powiod³o siê\n"
diff --git a/po/pt.po b/po/pt.po
index 7cf23409f..84d72991a 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm\n"
-"POT-Creation-Date: 2002-08-05 21:40-0400\n"
+"POT-Creation-Date: 2002-08-06 15:06-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"
@@ -1557,7 +1557,7 @@ msgid "error creating temporary file %s\n"
msgstr "erro ao criar o ficheiro temporário %s\n"
#: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709
-#: lib/package.c:739 lib/rpmchecksig.c:767
+#: lib/package.c:739 lib/rpmchecksig.c:784
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
@@ -1571,22 +1571,22 @@ 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:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
+#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:705
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: o rpmReadSignature falhou\n"
-#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
+#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:710
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Nenhuma assinatura disponível\n"
-#: lib/package.c:651 lib/rpmchecksig.c:586
+#: lib/package.c:651 lib/rpmchecksig.c:603
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr ":%s: o readLead falhou\n"
-#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
+#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:632
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: O fread falhou: %s\n"
@@ -2343,7 +2343,7 @@ msgstr "o makeTempFile falhou\n"
msgid "%s: Fwrite failed: %s\n"
msgstr "%s: O fwrite falhou: %s\n"
-#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
+#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:689
#, fuzzy, c-format
msgid "%s: not an rpm package\n"
msgstr "o argumento não é um pacote RPM\n"
@@ -2373,52 +2373,52 @@ msgstr "%s: o writeLead falhou: %s\n"
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: o rpmWriteSignature falhou: %s\n"
-#: lib/rpmchecksig.c:448
+#: lib/rpmchecksig.c:556
#, fuzzy, c-format
msgid "%s: import read failed.\n"
msgstr ":%s: o readLead falhou\n"
-#: lib/rpmchecksig.c:453
+#: lib/rpmchecksig.c:561
#, c-format
msgid "%s: not an armored public key.\n"
msgstr ""
-#: lib/rpmchecksig.c:458
+#: lib/rpmchecksig.c:568
#, fuzzy, c-format
-msgid "%s: base64 encode failed.\n"
+msgid "%s: import failed.\n"
msgstr ":%s: o readLead falhou\n"
-#: lib/rpmchecksig.c:600
+#: lib/rpmchecksig.c:617
#, fuzzy, c-format
msgid "%s: headerGetEntry failed\n"
msgstr ":%s: o readLead falhou\n"
-#: lib/rpmchecksig.c:678
+#: lib/rpmchecksig.c:695
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr "%s: Nenhuma assinatura disponível (RPM v1.0)\n"
-#: lib/rpmchecksig.c:933
+#: lib/rpmchecksig.c:950
msgid "NOT OK"
msgstr "NÃO-OK"
-#: lib/rpmchecksig.c:934 lib/rpmchecksig.c:948
+#: lib/rpmchecksig.c:951 lib/rpmchecksig.c:965
msgid " (MISSING KEYS:"
msgstr " (FALTAM AS CHAVES:"
-#: lib/rpmchecksig.c:936 lib/rpmchecksig.c:950
+#: lib/rpmchecksig.c:953 lib/rpmchecksig.c:967
msgid ") "
msgstr ") "
-#: lib/rpmchecksig.c:937 lib/rpmchecksig.c:951
+#: lib/rpmchecksig.c:954 lib/rpmchecksig.c:968
msgid " (UNTRUSTED KEYS:"
msgstr " (CHAVES SUSPEITAS:"
-#: lib/rpmchecksig.c:939 lib/rpmchecksig.c:953
+#: lib/rpmchecksig.c:956 lib/rpmchecksig.c:970
msgid ")"
msgstr ")"
-#: lib/rpmchecksig.c:947
+#: lib/rpmchecksig.c:964
msgid "OK"
msgstr "OK"
@@ -3631,6 +3631,10 @@ msgstr "%s: o acesso falhou: %s\n"
msgid "%s: read manifest failed: %s\n"
msgstr "%s: a leitura do manifesto falhou: %s\n"
+#, fuzzy
+#~ msgid "%s: base64 encode failed.\n"
+#~ msgstr ":%s: o readLead falhou\n"
+
#~ msgid "%s: readLead failed\n"
#~ msgstr ":%s: o readLead falhou\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 06b5bf7bb..51e582e12 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-08-05 21:40-0400\n"
+"POT-Creation-Date: 2002-08-06 15:06-0400\n"
#: build.c:40
#, fuzzy
@@ -1702,7 +1702,7 @@ msgid "error creating temporary file %s\n"
msgstr "No consegui abrir: %s\n"
#: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709
-#: lib/package.c:739 lib/rpmchecksig.c:767
+#: lib/package.c:739 lib/rpmchecksig.c:784
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
@@ -1716,24 +1716,24 @@ msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
+#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:705
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
+#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:710
#, c-format
msgid "%s: No signature available\n"
msgstr ""
# , c-format
-#: lib/package.c:651 lib/rpmchecksig.c:586
+#: lib/package.c:651 lib/rpmchecksig.c:603
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "No consegui abrir: %s\n"
# , c-format
-#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
+#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:632
#, fuzzy, c-format
msgid "%s: Fread failed: %s\n"
msgstr "No consegui abrir: %s\n"
@@ -2534,7 +2534,7 @@ msgstr "Construo falhou.\n"
msgid "%s: Fwrite failed: %s\n"
msgstr "No consegui abrir: %s\n"
-#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
+#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:689
#, fuzzy, c-format
msgid "%s: not an rpm package\n"
msgstr "no foram passados pacotes para assinatura"
@@ -2566,54 +2566,54 @@ msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "No consegui abrir: %s\n"
# , c-format
-#: lib/rpmchecksig.c:448
+#: lib/rpmchecksig.c:556
#, fuzzy, c-format
msgid "%s: import read failed.\n"
msgstr "No consegui abrir: %s\n"
-#: lib/rpmchecksig.c:453
+#: lib/rpmchecksig.c:561
#, c-format
msgid "%s: not an armored public key.\n"
msgstr ""
# , c-format
-#: lib/rpmchecksig.c:458
+#: lib/rpmchecksig.c:568
#, fuzzy, c-format
-msgid "%s: base64 encode failed.\n"
+msgid "%s: import failed.\n"
msgstr "No consegui abrir: %s\n"
# , c-format
-#: lib/rpmchecksig.c:600
+#: lib/rpmchecksig.c:617
#, fuzzy, c-format
msgid "%s: headerGetEntry failed\n"
msgstr "No consegui abrir: %s\n"
-#: lib/rpmchecksig.c:678
+#: lib/rpmchecksig.c:695
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr ""
-#: lib/rpmchecksig.c:933
+#: lib/rpmchecksig.c:950
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:934 lib/rpmchecksig.c:948
+#: lib/rpmchecksig.c:951 lib/rpmchecksig.c:965
msgid " (MISSING KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:936 lib/rpmchecksig.c:950
+#: lib/rpmchecksig.c:953 lib/rpmchecksig.c:967
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:937 lib/rpmchecksig.c:951
+#: lib/rpmchecksig.c:954 lib/rpmchecksig.c:968
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:939 lib/rpmchecksig.c:953
+#: lib/rpmchecksig.c:956 lib/rpmchecksig.c:970
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:947
+#: lib/rpmchecksig.c:964
msgid "OK"
msgstr ""
@@ -3907,6 +3907,11 @@ msgstr "No consegui abrir: %s\n"
msgid "%s: read manifest failed: %s\n"
msgstr "No consegui abrir: %s\n"
+# , c-format
+#, fuzzy
+#~ msgid "%s: base64 encode failed.\n"
+#~ msgstr "No consegui abrir: %s\n"
+
#, fuzzy
#~ msgid "rollback %d packages to %s"
#~ msgstr "no foi passado pacote para desinstalao"
diff --git a/po/ro.po b/po/ro.po
index 5a6a66a84..9399d25ce 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-08-05 21:40-0400\n"
+"POT-Creation-Date: 2002-08-06 15:06-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"
@@ -1511,7 +1511,7 @@ msgid "error creating temporary file %s\n"
msgstr ""
#: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709
-#: lib/package.c:739 lib/rpmchecksig.c:767
+#: lib/package.c:739 lib/rpmchecksig.c:784
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
@@ -1525,22 +1525,22 @@ msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
+#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:705
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
+#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:710
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/package.c:651 lib/rpmchecksig.c:586
+#: lib/package.c:651 lib/rpmchecksig.c:603
#, c-format
msgid "%s: headerRead failed\n"
msgstr ""
-#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
+#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:632
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr ""
@@ -2266,7 +2266,7 @@ msgstr ""
msgid "%s: Fwrite failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
+#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:689
#, c-format
msgid "%s: not an rpm package\n"
msgstr ""
@@ -2296,52 +2296,52 @@ msgstr ""
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:448
+#: lib/rpmchecksig.c:556
#, c-format
msgid "%s: import read failed.\n"
msgstr ""
-#: lib/rpmchecksig.c:453
+#: lib/rpmchecksig.c:561
#, c-format
msgid "%s: not an armored public key.\n"
msgstr ""
-#: lib/rpmchecksig.c:458
+#: lib/rpmchecksig.c:568
#, c-format
-msgid "%s: base64 encode failed.\n"
+msgid "%s: import failed.\n"
msgstr ""
-#: lib/rpmchecksig.c:600
+#: lib/rpmchecksig.c:617
#, c-format
msgid "%s: headerGetEntry failed\n"
msgstr ""
-#: lib/rpmchecksig.c:678
+#: lib/rpmchecksig.c:695
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr ""
-#: lib/rpmchecksig.c:933
+#: lib/rpmchecksig.c:950
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:934 lib/rpmchecksig.c:948
+#: lib/rpmchecksig.c:951 lib/rpmchecksig.c:965
msgid " (MISSING KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:936 lib/rpmchecksig.c:950
+#: lib/rpmchecksig.c:953 lib/rpmchecksig.c:967
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:937 lib/rpmchecksig.c:951
+#: lib/rpmchecksig.c:954 lib/rpmchecksig.c:968
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:939 lib/rpmchecksig.c:953
+#: lib/rpmchecksig.c:956 lib/rpmchecksig.c:970
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:947
+#: lib/rpmchecksig.c:964
msgid "OK"
msgstr ""
diff --git a/po/rpm.pot b/po/rpm.pot
index dadb91a5d..66dea885f 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-08-05 21:40-0400\n"
+"POT-Creation-Date: 2002-08-06 15:06-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"
@@ -1517,7 +1517,7 @@ msgid "error creating temporary file %s\n"
msgstr ""
#: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709
-#: lib/package.c:739 lib/rpmchecksig.c:767
+#: lib/package.c:739 lib/rpmchecksig.c:784
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
@@ -1531,22 +1531,22 @@ msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
+#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:705
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
+#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:710
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/package.c:651 lib/rpmchecksig.c:586
+#: lib/package.c:651 lib/rpmchecksig.c:603
#, c-format
msgid "%s: headerRead failed\n"
msgstr ""
-#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
+#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:632
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr ""
@@ -2272,7 +2272,7 @@ msgstr ""
msgid "%s: Fwrite failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
+#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:689
#, c-format
msgid "%s: not an rpm package\n"
msgstr ""
@@ -2302,52 +2302,52 @@ msgstr ""
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:448
+#: lib/rpmchecksig.c:556
#, c-format
msgid "%s: import read failed.\n"
msgstr ""
-#: lib/rpmchecksig.c:453
+#: lib/rpmchecksig.c:561
#, c-format
msgid "%s: not an armored public key.\n"
msgstr ""
-#: lib/rpmchecksig.c:458
+#: lib/rpmchecksig.c:568
#, c-format
-msgid "%s: base64 encode failed.\n"
+msgid "%s: import failed.\n"
msgstr ""
-#: lib/rpmchecksig.c:600
+#: lib/rpmchecksig.c:617
#, c-format
msgid "%s: headerGetEntry failed\n"
msgstr ""
-#: lib/rpmchecksig.c:678
+#: lib/rpmchecksig.c:695
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr ""
-#: lib/rpmchecksig.c:933
+#: lib/rpmchecksig.c:950
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:934 lib/rpmchecksig.c:948
+#: lib/rpmchecksig.c:951 lib/rpmchecksig.c:965
msgid " (MISSING KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:936 lib/rpmchecksig.c:950
+#: lib/rpmchecksig.c:953 lib/rpmchecksig.c:967
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:937 lib/rpmchecksig.c:951
+#: lib/rpmchecksig.c:954 lib/rpmchecksig.c:968
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:939 lib/rpmchecksig.c:953
+#: lib/rpmchecksig.c:956 lib/rpmchecksig.c:970
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:947
+#: lib/rpmchecksig.c:964
msgid "OK"
msgstr ""
diff --git a/po/ru.po b/po/ru.po
index ce31196a9..f72fea2fd 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-08-05 21:40-0400\n"
+"POT-Creation-Date: 2002-08-06 15:06-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"
@@ -1562,7 +1562,7 @@ msgid "error creating temporary file %s\n"
msgstr "ÏÛÉÂËÁ ÓÏÚÄÁÎÉÑ ×ÒÅÍÅÎÎÏÇÏ ÆÁÊÌÁ %s\n"
#: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709
-#: lib/package.c:739 lib/rpmchecksig.c:767
+#: lib/package.c:739 lib/rpmchecksig.c:784
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
@@ -1576,22 +1576,22 @@ msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr "ÜÔÁ ×ÅÒÓÉÑ RPM ĞÏÄÄÅÒÖÉ×ÁÅÔ ÔÏÌØËÏ ĞÁËÅÔÙ ×ÅÒÓÉÉ <= 4\n"
-#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
+#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:705
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: ÏÛÉÂËÁ rpmReadSignature\n"
-#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
+#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:710
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: ğÏÄĞÉÓØ ÎÅÄÏÓÔÕĞÎÁ\n"
-#: lib/package.c:651 lib/rpmchecksig.c:586
+#: lib/package.c:651 lib/rpmchecksig.c:603
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: ÏÛÉÂËÁ readLead\n"
-#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
+#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:632
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: ÏÛÉÂËÁ Fread: %s\n"
@@ -2345,7 +2345,7 @@ msgstr "ÏÛÉÂËÁ makeTempFile\n"
msgid "%s: Fwrite failed: %s\n"
msgstr "%s: ÏÛÉÂËÁ Fwrite: %s\n"
-#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
+#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:689
#, fuzzy, c-format
msgid "%s: not an rpm package\n"
msgstr "ÚÁÄÁÎÎÙÊ ÁÒÇÕÍÅÎÔ ÎÅ Ñ×ÌÑÅÔÓÑ ĞÁËÅÔÏÍ RPM\n"
@@ -2375,52 +2375,52 @@ msgstr "%s: ÏÛÉÂËÁ writeLead: %s\n"
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: ÏÛÉÂËÁ rpmWriteSignature: %s\n"
-#: lib/rpmchecksig.c:448
+#: lib/rpmchecksig.c:556
#, fuzzy, c-format
msgid "%s: import read failed.\n"
msgstr "%s: ÏÛÉÂËÁ readLead\n"
-#: lib/rpmchecksig.c:453
+#: lib/rpmchecksig.c:561
#, c-format
msgid "%s: not an armored public key.\n"
msgstr ""
-#: lib/rpmchecksig.c:458
+#: lib/rpmchecksig.c:568
#, fuzzy, c-format
-msgid "%s: base64 encode failed.\n"
+msgid "%s: import failed.\n"
msgstr "%s: ÏÛÉÂËÁ readLead\n"
-#: lib/rpmchecksig.c:600
+#: lib/rpmchecksig.c:617
#, fuzzy, c-format
msgid "%s: headerGetEntry failed\n"
msgstr "%s: ÏÛÉÂËÁ readLead\n"
-#: lib/rpmchecksig.c:678
+#: lib/rpmchecksig.c:695
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr "%s: ğÏÄĞÉÓÉ ÎÅÔ (RPM v1.0)\n"
-#: lib/rpmchecksig.c:933
+#: lib/rpmchecksig.c:950
msgid "NOT OK"
msgstr "îå ïë"
-#: lib/rpmchecksig.c:934 lib/rpmchecksig.c:948
+#: lib/rpmchecksig.c:951 lib/rpmchecksig.c:965
msgid " (MISSING KEYS:"
msgstr " (ïôóõôóô÷õàô ëìàşé:"
-#: lib/rpmchecksig.c:936 lib/rpmchecksig.c:950
+#: lib/rpmchecksig.c:953 lib/rpmchecksig.c:967
msgid ") "
msgstr ") "
-#: lib/rpmchecksig.c:937 lib/rpmchecksig.c:951
+#: lib/rpmchecksig.c:954 lib/rpmchecksig.c:968
msgid " (UNTRUSTED KEYS:"
msgstr " (îåô äï÷åòéñ ë ëìàşáí:"
-#: lib/rpmchecksig.c:939 lib/rpmchecksig.c:953
+#: lib/rpmchecksig.c:956 lib/rpmchecksig.c:970
msgid ")"
msgstr ")"
-#: lib/rpmchecksig.c:947
+#: lib/rpmchecksig.c:964
msgid "OK"
msgstr "ïë"
@@ -3631,6 +3631,10 @@ msgstr "%s: ÏÛÉÂËÁ ÏÔËÒÙÔÉÑ: %s\n"
msgid "%s: read manifest failed: %s\n"
msgstr "%s: ÏÛÉÂËÁ ŞÔÅÎÉÑ ÓĞÉÓËÁ ÆÁÊÌÏ×: %s\n"
+#, fuzzy
+#~ msgid "%s: base64 encode failed.\n"
+#~ msgstr "%s: ÏÛÉÂËÁ readLead\n"
+
#~ msgid "%s: readLead failed\n"
#~ msgstr "%s: ÏÛÉÂËÁ readLead\n"
diff --git a/po/sk.po b/po/sk.po
index 59c2220b7..2f5364db7 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-08-05 21:40-0400\n"
+"POT-Creation-Date: 2002-08-06 15:06-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"
@@ -1579,7 +1579,7 @@ msgid "error creating temporary file %s\n"
msgstr "chyba pri vytváraní doèasného súboru %s"
#: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709
-#: lib/package.c:739 lib/rpmchecksig.c:767
+#: lib/package.c:739 lib/rpmchecksig.c:784
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
@@ -1595,22 +1595,22 @@ 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:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
+#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:705
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: rpmReadSignature zlyhalo\n"
-#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
+#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:710
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Podpis nie je k dispozícii\n"
-#: lib/package.c:651 lib/rpmchecksig.c:586
+#: lib/package.c:651 lib/rpmchecksig.c:603
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: readLead zlyhalo\n"
-#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
+#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:632
#, fuzzy, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: readLead zlyhalo\n"
@@ -2398,7 +2398,7 @@ msgstr "vykonanie zlyhalo\n"
msgid "%s: Fwrite failed: %s\n"
msgstr "%s: readLead zlyhalo\n"
-#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
+#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:689
#, fuzzy, c-format
msgid "%s: not an rpm package\n"
msgstr "argument nie je RPM balík\n"
@@ -2428,52 +2428,52 @@ msgstr "%s: readLead zlyhalo\n"
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: rpmReadSignature zlyhalo\n"
-#: lib/rpmchecksig.c:448
+#: lib/rpmchecksig.c:556
#, fuzzy, c-format
msgid "%s: import read failed.\n"
msgstr "%s: readLead zlyhalo\n"
-#: lib/rpmchecksig.c:453
+#: lib/rpmchecksig.c:561
#, c-format
msgid "%s: not an armored public key.\n"
msgstr ""
-#: lib/rpmchecksig.c:458
+#: lib/rpmchecksig.c:568
#, fuzzy, c-format
-msgid "%s: base64 encode failed.\n"
+msgid "%s: import failed.\n"
msgstr "%s: readLead zlyhalo\n"
-#: lib/rpmchecksig.c:600
+#: lib/rpmchecksig.c:617
#, fuzzy, c-format
msgid "%s: headerGetEntry failed\n"
msgstr "%s: readLead zlyhalo\n"
-#: lib/rpmchecksig.c:678
+#: lib/rpmchecksig.c:695
#, 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:933
+#: lib/rpmchecksig.c:950
msgid "NOT OK"
msgstr "NIE JE V PORIADKU"
-#: lib/rpmchecksig.c:934 lib/rpmchecksig.c:948
+#: lib/rpmchecksig.c:951 lib/rpmchecksig.c:965
msgid " (MISSING KEYS:"
msgstr " (CHİBAJÚCE K¥ÚÈE):"
-#: lib/rpmchecksig.c:936 lib/rpmchecksig.c:950
+#: lib/rpmchecksig.c:953 lib/rpmchecksig.c:967
msgid ") "
msgstr ") "
-#: lib/rpmchecksig.c:937 lib/rpmchecksig.c:951
+#: lib/rpmchecksig.c:954 lib/rpmchecksig.c:968
msgid " (UNTRUSTED KEYS:"
msgstr " (NEDÔVERUJE SA K¥ÚÈOM: "
-#: lib/rpmchecksig.c:939 lib/rpmchecksig.c:953
+#: lib/rpmchecksig.c:956 lib/rpmchecksig.c:970
msgid ")"
msgstr ")"
-#: lib/rpmchecksig.c:947
+#: lib/rpmchecksig.c:964
msgid "OK"
msgstr "V PORIADKU"
@@ -3691,6 +3691,10 @@ msgstr "%s: otvorenie zlyhalo\n"
msgid "%s: read manifest failed: %s\n"
msgstr "%s: readLead zlyhalo\n"
+#, fuzzy
+#~ msgid "%s: base64 encode failed.\n"
+#~ msgstr "%s: readLead zlyhalo\n"
+
#~ msgid "%s: readLead failed\n"
#~ msgstr "%s: readLead zlyhalo\n"
diff --git a/po/sl.po b/po/sl.po
index e9bdf87d9..c9bbd74bc 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.305 2002/08/06 01:42:23 jbj Exp $
+# $Id: sl.po,v 1.306 2002/08/06 19:08:55 jbj Exp $
#
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-08-05 21:40-0400\n"
+"POT-Creation-Date: 2002-08-06 15:06-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"
@@ -1582,7 +1582,7 @@ msgid "error creating temporary file %s\n"
msgstr "napaka pri ustvarjanju zaèasne datoteke %s"
#: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709
-#: lib/package.c:739 lib/rpmchecksig.c:767
+#: lib/package.c:739 lib/rpmchecksig.c:784
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
@@ -1598,22 +1598,22 @@ 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:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
+#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:705
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: rpmReadSignature je bil neuspe¹en\n"
-#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
+#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:710
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Podpis ni na voljo\n"
-#: lib/package.c:651 lib/rpmchecksig.c:586
+#: lib/package.c:651 lib/rpmchecksig.c:603
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: readLead je bil neuspe¹en\n"
-#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
+#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:632
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: branje Fread je bilo neuspe¹no: %s\n"
@@ -2398,7 +2398,7 @@ 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:208 lib/rpmchecksig.c:672
+#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:689
#, fuzzy, c-format
msgid "%s: not an rpm package\n"
msgstr "navedeni argument ni paket RPM\n"
@@ -2428,52 +2428,52 @@ msgstr "%s: writeLead je bil neuspe¹en: %s\n"
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: rpmWriteSignature je bilo neuspe¹no: %s\n"
-#: lib/rpmchecksig.c:448
+#: lib/rpmchecksig.c:556
#, fuzzy, c-format
msgid "%s: import read failed.\n"
msgstr "%s: readLead je bil neuspe¹en\n"
-#: lib/rpmchecksig.c:453
+#: lib/rpmchecksig.c:561
#, c-format
msgid "%s: not an armored public key.\n"
msgstr ""
-#: lib/rpmchecksig.c:458
+#: lib/rpmchecksig.c:568
#, fuzzy, c-format
-msgid "%s: base64 encode failed.\n"
+msgid "%s: import failed.\n"
msgstr "%s: readLead je bil neuspe¹en\n"
-#: lib/rpmchecksig.c:600
+#: lib/rpmchecksig.c:617
#, fuzzy, c-format
msgid "%s: headerGetEntry failed\n"
msgstr "%s: readLead je bil neuspe¹en\n"
-#: lib/rpmchecksig.c:678
+#: lib/rpmchecksig.c:695
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr "%s: Podpis ni na voljo (RPM v1.0)\n"
-#: lib/rpmchecksig.c:933
+#: lib/rpmchecksig.c:950
msgid "NOT OK"
msgstr "NI DOBRO"
-#: lib/rpmchecksig.c:934 lib/rpmchecksig.c:948
+#: lib/rpmchecksig.c:951 lib/rpmchecksig.c:965
msgid " (MISSING KEYS:"
msgstr " (MANJKAJOÈI KLJUÈI:"
-#: lib/rpmchecksig.c:936 lib/rpmchecksig.c:950
+#: lib/rpmchecksig.c:953 lib/rpmchecksig.c:967
msgid ") "
msgstr ") "
-#: lib/rpmchecksig.c:937 lib/rpmchecksig.c:951
+#: lib/rpmchecksig.c:954 lib/rpmchecksig.c:968
msgid " (UNTRUSTED KEYS:"
msgstr " (NEPREVERJENI KLJUÈI:"
-#: lib/rpmchecksig.c:939 lib/rpmchecksig.c:953
+#: lib/rpmchecksig.c:956 lib/rpmchecksig.c:970
msgid ")"
msgstr ")"
-#: lib/rpmchecksig.c:947
+#: lib/rpmchecksig.c:964
msgid "OK"
msgstr "V REDU"
@@ -3698,6 +3698,10 @@ msgstr "%s: odpiranje je bilo neuspe¹no: %s\n"
msgid "%s: read manifest failed: %s\n"
msgstr "%s: branje Fread je bilo neuspe¹no: %s\n"
+#, fuzzy
+#~ msgid "%s: base64 encode failed.\n"
+#~ msgstr "%s: readLead je bil neuspe¹en\n"
+
#~ msgid "%s: readLead failed\n"
#~ msgstr "%s: readLead je bil neuspe¹en\n"
diff --git a/po/sr.po b/po/sr.po
index a321ec715..6eabf9f1d 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-08-05 21:40-0400\n"
+"POT-Creation-Date: 2002-08-06 15:06-0400\n"
"Content-Type: text/plain; charset=\n"
"Date: 1998-05-02 21:41:47-0400\n"
@@ -1567,7 +1567,7 @@ msgid "error creating temporary file %s\n"
msgstr "gre¹ka kod kreiranja direktorijuma %s: %s"
#: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709
-#: lib/package.c:739 lib/rpmchecksig.c:767
+#: lib/package.c:739 lib/rpmchecksig.c:784
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
@@ -1583,22 +1583,22 @@ 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:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
+#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:705
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: Neuspelo 'rpmReadSignature'\n"
-#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
+#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:710
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Potpis nije na raspolaganju\n"
-#: lib/package.c:651 lib/rpmchecksig.c:586
+#: lib/package.c:651 lib/rpmchecksig.c:603
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: Neuspeo 'readLead'\n"
-#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
+#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:632
#, fuzzy, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: Neuspeo 'readLead'\n"
@@ -2389,7 +2389,7 @@ msgstr "%s: Neuspelo otvaranje\n"
msgid "%s: Fwrite failed: %s\n"
msgstr "%s: Neuspeo 'readLead'\n"
-#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
+#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:689
#, fuzzy, c-format
msgid "%s: not an rpm package\n"
msgstr "gre¹ka: èini se da %s nije RPM paket\n"
@@ -2419,53 +2419,53 @@ msgstr "%s: Neuspeo 'readLead'\n"
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: Neuspelo 'rpmReadSignature'\n"
-#: lib/rpmchecksig.c:448
+#: lib/rpmchecksig.c:556
#, fuzzy, c-format
msgid "%s: import read failed.\n"
msgstr "%s: Neuspeo 'readLead'\n"
-#: lib/rpmchecksig.c:453
+#: lib/rpmchecksig.c:561
#, c-format
msgid "%s: not an armored public key.\n"
msgstr ""
-#: lib/rpmchecksig.c:458
+#: lib/rpmchecksig.c:568
#, fuzzy, c-format
-msgid "%s: base64 encode failed.\n"
+msgid "%s: import failed.\n"
msgstr "%s: Neuspeo 'readLead'\n"
-#: lib/rpmchecksig.c:600
+#: lib/rpmchecksig.c:617
#, fuzzy, c-format
msgid "%s: headerGetEntry failed\n"
msgstr "%s: Neuspeo 'readLead'\n"
-#: lib/rpmchecksig.c:678
+#: lib/rpmchecksig.c:695
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr "%s: Potpis nije na raspolaganju (RPM v1.0)\n"
-#: lib/rpmchecksig.c:933
+#: lib/rpmchecksig.c:950
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:934 lib/rpmchecksig.c:948
+#: lib/rpmchecksig.c:951 lib/rpmchecksig.c:965
#, fuzzy
msgid " (MISSING KEYS:"
msgstr " (NEDOSTAJUÆI KLJUÈEVI)"
-#: lib/rpmchecksig.c:936 lib/rpmchecksig.c:950
+#: lib/rpmchecksig.c:953 lib/rpmchecksig.c:967
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:937 lib/rpmchecksig.c:951
+#: lib/rpmchecksig.c:954 lib/rpmchecksig.c:968
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:939 lib/rpmchecksig.c:953
+#: lib/rpmchecksig.c:956 lib/rpmchecksig.c:970
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:947
+#: lib/rpmchecksig.c:964
msgid "OK"
msgstr ""
@@ -3690,6 +3690,10 @@ msgstr "%s: Neuspelo otvaranje\n"
msgid "%s: read manifest failed: %s\n"
msgstr "%s: Neuspeo 'readLead'\n"
+#, fuzzy
+#~ msgid "%s: base64 encode failed.\n"
+#~ msgstr "%s: Neuspeo 'readLead'\n"
+
#~ msgid "%s: readLead failed\n"
#~ msgstr "%s: Neuspeo 'readLead'\n"
diff --git a/po/sv.po b/po/sv.po
index c8f20183e..e24355ada 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-08-05 21:40-0400\n"
+"POT-Creation-Date: 2002-08-06 15:06-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"
@@ -1537,7 +1537,7 @@ msgid "error creating temporary file %s\n"
msgstr "fel när tämporärfil %s skapades\n"
#: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709
-#: lib/package.c:739 lib/rpmchecksig.c:767
+#: lib/package.c:739 lib/rpmchecksig.c:784
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr "endast V3-signaturer kan verifieras, hoppar över V%u-signatur"
@@ -1551,22 +1551,22 @@ 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:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
+#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:705
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: rpmReadSignature misslyckades\n"
-#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
+#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:710
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Ingen signatur tillgänglig\n"
-#: lib/package.c:651 lib/rpmchecksig.c:586
+#: lib/package.c:651 lib/rpmchecksig.c:603
#, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: headerRead misslyckades\n"
-#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
+#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:632
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: Fread misslyckades: %s\n"
@@ -2306,7 +2306,7 @@ msgstr "makeTempFile misslyckades\n"
msgid "%s: Fwrite failed: %s\n"
msgstr "%s: Fwrite misslyckades: %s\n"
-#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
+#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:689
#, fuzzy, c-format
msgid "%s: not an rpm package\n"
msgstr "%s: inte en publik nyckel med skal.\n"
@@ -2336,52 +2336,52 @@ msgstr "%s: writeLead misslyckades: %s\n"
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: rpmWriteSignature misslyckades: %s\n"
-#: lib/rpmchecksig.c:448
+#: lib/rpmchecksig.c:556
#, c-format
msgid "%s: import read failed.\n"
msgstr "%s: importläsning misslyckades.\n"
-#: lib/rpmchecksig.c:453
+#: lib/rpmchecksig.c:561
#, c-format
msgid "%s: not an armored public key.\n"
msgstr "%s: inte en publik nyckel med skal.\n"
-#: lib/rpmchecksig.c:458
-#, c-format
-msgid "%s: base64 encode failed.\n"
-msgstr "%s: base64-kodning misslyckades.\n"
+#: lib/rpmchecksig.c:568
+#, fuzzy, c-format
+msgid "%s: import failed.\n"
+msgstr "%s: importläsning misslyckades.\n"
-#: lib/rpmchecksig.c:600
+#: lib/rpmchecksig.c:617
#, c-format
msgid "%s: headerGetEntry failed\n"
msgstr "%s: headerGetEntry misslyckades\n"
-#: lib/rpmchecksig.c:678
+#: lib/rpmchecksig.c:695
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr "%s: Ingen signatur tillgänglig (v1.0 RPM)\n"
-#: lib/rpmchecksig.c:933
+#: lib/rpmchecksig.c:950
msgid "NOT OK"
msgstr "EJ OK"
-#: lib/rpmchecksig.c:934 lib/rpmchecksig.c:948
+#: lib/rpmchecksig.c:951 lib/rpmchecksig.c:965
msgid " (MISSING KEYS:"
msgstr " (SAKNADE NYCKLAR:"
-#: lib/rpmchecksig.c:936 lib/rpmchecksig.c:950
+#: lib/rpmchecksig.c:953 lib/rpmchecksig.c:967
msgid ") "
msgstr ") "
-#: lib/rpmchecksig.c:937 lib/rpmchecksig.c:951
+#: lib/rpmchecksig.c:954 lib/rpmchecksig.c:968
msgid " (UNTRUSTED KEYS:"
msgstr " (EJ BETRODDA NYCKLAR:"
-#: lib/rpmchecksig.c:939 lib/rpmchecksig.c:953
+#: lib/rpmchecksig.c:956 lib/rpmchecksig.c:970
msgid ")"
msgstr ")"
-#: lib/rpmchecksig.c:947
+#: lib/rpmchecksig.c:964
msgid "OK"
msgstr "OK"
@@ -3579,6 +3579,9 @@ msgstr "%s: cacheoperation misslyckades: ec %d.\n"
msgid "%s: read manifest failed: %s\n"
msgstr "%s: läsning av paketlista misslyckades: %s\n"
+#~ msgid "%s: base64 encode failed.\n"
+#~ msgstr "%s: base64-kodning misslyckades.\n"
+
#~ msgid "%s: readLead failed\n"
#~ msgstr "%s: readLead misslyckades\n"
diff --git a/po/tr.po b/po/tr.po
index 03cf5a69f..2800e44fc 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-08-05 21:40-0400\n"
+"POT-Creation-Date: 2002-08-06 15:06-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"
@@ -1570,7 +1570,7 @@ msgid "error creating temporary file %s\n"
msgstr "%s geçici dosyası oluşturulurken hata\n"
#: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709
-#: lib/package.c:739 lib/rpmchecksig.c:767
+#: lib/package.c:739 lib/rpmchecksig.c:784
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
@@ -1586,22 +1586,22 @@ msgstr ""
"RPM'nin bu sürümünde sadece ilk sürüm rakamı <= 4 olan paketler "
"destekleniyor\n"
-#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
+#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:705
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: rpmReadSignature başarısız\n"
-#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
+#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:710
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: İmza bulundurmuyor\n"
-#: lib/package.c:651 lib/rpmchecksig.c:586
+#: lib/package.c:651 lib/rpmchecksig.c:603
#, fuzzy, c-format
msgid "%s: headerRead failed\n"
msgstr "%s: readLead başarısız\n"
-#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
+#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:632
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: Fread başarısız: %s\n"
@@ -2360,7 +2360,7 @@ 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:208 lib/rpmchecksig.c:672
+#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:689
#, fuzzy, c-format
msgid "%s: not an rpm package\n"
msgstr "argüman bir RPM paketi değil\n"
@@ -2390,52 +2390,52 @@ msgstr "%s: writeLead başarısız: %s\n"
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: rpmWriteSignature başarısız: %s\n"
-#: lib/rpmchecksig.c:448
+#: lib/rpmchecksig.c:556
#, fuzzy, c-format
msgid "%s: import read failed.\n"
msgstr "%s: readLead başarısız\n"
-#: lib/rpmchecksig.c:453
+#: lib/rpmchecksig.c:561
#, c-format
msgid "%s: not an armored public key.\n"
msgstr ""
-#: lib/rpmchecksig.c:458
+#: lib/rpmchecksig.c:568
#, fuzzy, c-format
-msgid "%s: base64 encode failed.\n"
+msgid "%s: import failed.\n"
msgstr "%s: readLead başarısız\n"
-#: lib/rpmchecksig.c:600
+#: lib/rpmchecksig.c:617
#, fuzzy, c-format
msgid "%s: headerGetEntry failed\n"
msgstr "%s: readLead başarısız\n"
-#: lib/rpmchecksig.c:678
+#: lib/rpmchecksig.c:695
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr "%s: İmza bulundurmuyor (v1.0 RPM)\n"
-#: lib/rpmchecksig.c:933
+#: lib/rpmchecksig.c:950
msgid "NOT OK"
msgstr "TAMAM DEĞİL"
-#: lib/rpmchecksig.c:934 lib/rpmchecksig.c:948
+#: lib/rpmchecksig.c:951 lib/rpmchecksig.c:965
msgid " (MISSING KEYS:"
msgstr " (EKSİK ANAHTARLAR:"
-#: lib/rpmchecksig.c:936 lib/rpmchecksig.c:950
+#: lib/rpmchecksig.c:953 lib/rpmchecksig.c:967
msgid ") "
msgstr ") "
-#: lib/rpmchecksig.c:937 lib/rpmchecksig.c:951
+#: lib/rpmchecksig.c:954 lib/rpmchecksig.c:968
msgid " (UNTRUSTED KEYS:"
msgstr " (GÜVENCESİZ ANAHTARLAR:"
-#: lib/rpmchecksig.c:939 lib/rpmchecksig.c:953
+#: lib/rpmchecksig.c:956 lib/rpmchecksig.c:970
msgid ")"
msgstr ")"
-#: lib/rpmchecksig.c:947
+#: lib/rpmchecksig.c:964
msgid "OK"
msgstr "Tamam"
@@ -3642,6 +3642,10 @@ msgstr "%s: açılamadı: %s\n"
msgid "%s: read manifest failed: %s\n"
msgstr "%s: bildirge okuma başarısız: %s\n"
+#, fuzzy
+#~ msgid "%s: base64 encode failed.\n"
+#~ msgstr "%s: readLead başarısız\n"
+
#~ msgid "%s: readLead failed\n"
#~ msgstr "%s: readLead başarısız\n"
diff --git a/po/uk.po b/po/uk.po
index a60abfc77..2fb0518ee 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-08-05 21:40-0400\n"
+"POT-Creation-Date: 2002-08-06 15:06-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"
@@ -1516,7 +1516,7 @@ msgid "error creating temporary file %s\n"
msgstr ""
#: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709
-#: lib/package.c:739 lib/rpmchecksig.c:767
+#: lib/package.c:739 lib/rpmchecksig.c:784
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
@@ -1530,22 +1530,22 @@ msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
+#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:705
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
+#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:710
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/package.c:651 lib/rpmchecksig.c:586
+#: lib/package.c:651 lib/rpmchecksig.c:603
#, c-format
msgid "%s: headerRead failed\n"
msgstr ""
-#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
+#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:632
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr ""
@@ -2271,7 +2271,7 @@ msgstr ""
msgid "%s: Fwrite failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
+#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:689
#, c-format
msgid "%s: not an rpm package\n"
msgstr ""
@@ -2301,52 +2301,52 @@ msgstr ""
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:448
+#: lib/rpmchecksig.c:556
#, c-format
msgid "%s: import read failed.\n"
msgstr ""
-#: lib/rpmchecksig.c:453
+#: lib/rpmchecksig.c:561
#, c-format
msgid "%s: not an armored public key.\n"
msgstr ""
-#: lib/rpmchecksig.c:458
+#: lib/rpmchecksig.c:568
#, c-format
-msgid "%s: base64 encode failed.\n"
+msgid "%s: import failed.\n"
msgstr ""
-#: lib/rpmchecksig.c:600
+#: lib/rpmchecksig.c:617
#, c-format
msgid "%s: headerGetEntry failed\n"
msgstr ""
-#: lib/rpmchecksig.c:678
+#: lib/rpmchecksig.c:695
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr ""
-#: lib/rpmchecksig.c:933
+#: lib/rpmchecksig.c:950
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:934 lib/rpmchecksig.c:948
+#: lib/rpmchecksig.c:951 lib/rpmchecksig.c:965
msgid " (MISSING KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:936 lib/rpmchecksig.c:950
+#: lib/rpmchecksig.c:953 lib/rpmchecksig.c:967
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:937 lib/rpmchecksig.c:951
+#: lib/rpmchecksig.c:954 lib/rpmchecksig.c:968
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:939 lib/rpmchecksig.c:953
+#: lib/rpmchecksig.c:956 lib/rpmchecksig.c:970
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:947
+#: lib/rpmchecksig.c:964
msgid "OK"
msgstr ""
diff --git a/po/wa.po b/po/wa.po
index a60abfc77..2fb0518ee 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-08-05 21:40-0400\n"
+"POT-Creation-Date: 2002-08-06 15:06-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"
@@ -1516,7 +1516,7 @@ msgid "error creating temporary file %s\n"
msgstr ""
#: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709
-#: lib/package.c:739 lib/rpmchecksig.c:767
+#: lib/package.c:739 lib/rpmchecksig.c:784
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
@@ -1530,22 +1530,22 @@ msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
+#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:705
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
+#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:710
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/package.c:651 lib/rpmchecksig.c:586
+#: lib/package.c:651 lib/rpmchecksig.c:603
#, c-format
msgid "%s: headerRead failed\n"
msgstr ""
-#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
+#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:632
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr ""
@@ -2271,7 +2271,7 @@ msgstr ""
msgid "%s: Fwrite failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
+#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:689
#, c-format
msgid "%s: not an rpm package\n"
msgstr ""
@@ -2301,52 +2301,52 @@ msgstr ""
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:448
+#: lib/rpmchecksig.c:556
#, c-format
msgid "%s: import read failed.\n"
msgstr ""
-#: lib/rpmchecksig.c:453
+#: lib/rpmchecksig.c:561
#, c-format
msgid "%s: not an armored public key.\n"
msgstr ""
-#: lib/rpmchecksig.c:458
+#: lib/rpmchecksig.c:568
#, c-format
-msgid "%s: base64 encode failed.\n"
+msgid "%s: import failed.\n"
msgstr ""
-#: lib/rpmchecksig.c:600
+#: lib/rpmchecksig.c:617
#, c-format
msgid "%s: headerGetEntry failed\n"
msgstr ""
-#: lib/rpmchecksig.c:678
+#: lib/rpmchecksig.c:695
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr ""
-#: lib/rpmchecksig.c:933
+#: lib/rpmchecksig.c:950
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:934 lib/rpmchecksig.c:948
+#: lib/rpmchecksig.c:951 lib/rpmchecksig.c:965
msgid " (MISSING KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:936 lib/rpmchecksig.c:950
+#: lib/rpmchecksig.c:953 lib/rpmchecksig.c:967
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:937 lib/rpmchecksig.c:951
+#: lib/rpmchecksig.c:954 lib/rpmchecksig.c:968
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:939 lib/rpmchecksig.c:953
+#: lib/rpmchecksig.c:956 lib/rpmchecksig.c:970
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:947
+#: lib/rpmchecksig.c:964
msgid "OK"
msgstr ""
diff --git a/po/zh.po b/po/zh.po
index a60abfc77..2fb0518ee 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-08-05 21:40-0400\n"
+"POT-Creation-Date: 2002-08-06 15:06-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"
@@ -1516,7 +1516,7 @@ msgid "error creating temporary file %s\n"
msgstr ""
#: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709
-#: lib/package.c:739 lib/rpmchecksig.c:767
+#: lib/package.c:739 lib/rpmchecksig.c:784
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
@@ -1530,22 +1530,22 @@ msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
+#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:705
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
+#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:710
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/package.c:651 lib/rpmchecksig.c:586
+#: lib/package.c:651 lib/rpmchecksig.c:603
#, c-format
msgid "%s: headerRead failed\n"
msgstr ""
-#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
+#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:632
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr ""
@@ -2271,7 +2271,7 @@ msgstr ""
msgid "%s: Fwrite failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
+#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:689
#, c-format
msgid "%s: not an rpm package\n"
msgstr ""
@@ -2301,52 +2301,52 @@ msgstr ""
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:448
+#: lib/rpmchecksig.c:556
#, c-format
msgid "%s: import read failed.\n"
msgstr ""
-#: lib/rpmchecksig.c:453
+#: lib/rpmchecksig.c:561
#, c-format
msgid "%s: not an armored public key.\n"
msgstr ""
-#: lib/rpmchecksig.c:458
+#: lib/rpmchecksig.c:568
#, c-format
-msgid "%s: base64 encode failed.\n"
+msgid "%s: import failed.\n"
msgstr ""
-#: lib/rpmchecksig.c:600
+#: lib/rpmchecksig.c:617
#, c-format
msgid "%s: headerGetEntry failed\n"
msgstr ""
-#: lib/rpmchecksig.c:678
+#: lib/rpmchecksig.c:695
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr ""
-#: lib/rpmchecksig.c:933
+#: lib/rpmchecksig.c:950
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:934 lib/rpmchecksig.c:948
+#: lib/rpmchecksig.c:951 lib/rpmchecksig.c:965
msgid " (MISSING KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:936 lib/rpmchecksig.c:950
+#: lib/rpmchecksig.c:953 lib/rpmchecksig.c:967
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:937 lib/rpmchecksig.c:951
+#: lib/rpmchecksig.c:954 lib/rpmchecksig.c:968
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:939 lib/rpmchecksig.c:953
+#: lib/rpmchecksig.c:956 lib/rpmchecksig.c:970
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:947
+#: lib/rpmchecksig.c:964
msgid "OK"
msgstr ""
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index a60abfc77..2fb0518ee 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-08-05 21:40-0400\n"
+"POT-Creation-Date: 2002-08-06 15:06-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"
@@ -1516,7 +1516,7 @@ msgid "error creating temporary file %s\n"
msgstr ""
#: lib/package.c:442 lib/package.c:482 lib/package.c:685 lib/package.c:709
-#: lib/package.c:739 lib/rpmchecksig.c:767
+#: lib/package.c:739 lib/rpmchecksig.c:784
#, c-format
msgid "only V3 signatures can be verified, skipping V%u signature"
msgstr ""
@@ -1530,22 +1530,22 @@ msgid ""
"only packaging with major numbers <= 4 is supported by this version of RPM\n"
msgstr ""
-#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:688
+#: lib/package.c:608 lib/rpmchecksig.c:226 lib/rpmchecksig.c:705
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:693
+#: lib/package.c:612 lib/rpmchecksig.c:230 lib/rpmchecksig.c:710
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/package.c:651 lib/rpmchecksig.c:586
+#: lib/package.c:651 lib/rpmchecksig.c:603
#, c-format
msgid "%s: headerRead failed\n"
msgstr ""
-#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:615
+#: lib/package.c:751 lib/rpmchecksig.c:118 lib/rpmchecksig.c:632
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr ""
@@ -2271,7 +2271,7 @@ msgstr ""
msgid "%s: Fwrite failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:672
+#: lib/rpmchecksig.c:208 lib/rpmchecksig.c:689
#, c-format
msgid "%s: not an rpm package\n"
msgstr ""
@@ -2301,52 +2301,52 @@ msgstr ""
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:448
+#: lib/rpmchecksig.c:556
#, c-format
msgid "%s: import read failed.\n"
msgstr ""
-#: lib/rpmchecksig.c:453
+#: lib/rpmchecksig.c:561
#, c-format
msgid "%s: not an armored public key.\n"
msgstr ""
-#: lib/rpmchecksig.c:458
+#: lib/rpmchecksig.c:568
#, c-format
-msgid "%s: base64 encode failed.\n"
+msgid "%s: import failed.\n"
msgstr ""
-#: lib/rpmchecksig.c:600
+#: lib/rpmchecksig.c:617
#, c-format
msgid "%s: headerGetEntry failed\n"
msgstr ""
-#: lib/rpmchecksig.c:678
+#: lib/rpmchecksig.c:695
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr ""
-#: lib/rpmchecksig.c:933
+#: lib/rpmchecksig.c:950
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:934 lib/rpmchecksig.c:948
+#: lib/rpmchecksig.c:951 lib/rpmchecksig.c:965
msgid " (MISSING KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:936 lib/rpmchecksig.c:950
+#: lib/rpmchecksig.c:953 lib/rpmchecksig.c:967
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:937 lib/rpmchecksig.c:951
+#: lib/rpmchecksig.c:954 lib/rpmchecksig.c:968
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:939 lib/rpmchecksig.c:953
+#: lib/rpmchecksig.c:956 lib/rpmchecksig.c:970
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:947
+#: lib/rpmchecksig.c:964
msgid "OK"
msgstr ""
diff --git a/python/rpmts-py.c b/python/rpmts-py.c
index 87eba4dcf..6cb17a202 100644
--- a/python/rpmts-py.c
+++ b/python/rpmts-py.c
@@ -11,6 +11,7 @@
#endif
#include <rpmcli.h>
+#include <rpmpgp.h>
#include "header-py.h"
#include "rpmdb-py.h"
@@ -737,6 +738,70 @@ fprintf(stderr, "*** rpmts_SetVSFlags(%p) ts %p\n", s, s->ts);
/** \ingroup python
*/
static PyObject *
+rpmts_PgpPrtPkts(rpmtsObject * s, PyObject * args)
+ /*@globals _Py_NoneStruct @*/
+ /*@modifies _Py_NoneStruct @*/
+{
+ PyObject * blob;
+ unsigned char * pkt;
+ unsigned int pktlen;
+
+if (_rpmts_debug)
+fprintf(stderr, "*** rpmts_PgpPrtPkts(%p) ts %p\n", s, s->ts);
+
+ if (!PyArg_ParseTuple(args, "O:PgpPrtPkts", &blob)) return NULL;
+ if (blob == Py_None) {
+ Py_INCREF(Py_None);
+ return Py_None;
+ }
+ if (!PyString_Check(blob)) {
+ PyErr_SetString(pyrpmError, "pgpPrtPkts takes a string of octets");
+ return NULL;
+ }
+ pkt = PyString_AsString(blob);
+ pktlen = PyString_Size(blob);
+
+ (void) pgpPrtPkts(pkt, pktlen, NULL, 1);
+
+ Py_INCREF(Py_None);
+ return Py_None;
+}
+
+/** \ingroup python
+ */
+static PyObject *
+rpmts_PgpImportPubkey(rpmtsObject * s, PyObject * args)
+ /*@globals _Py_NoneStruct @*/
+ /*@modifies _Py_NoneStruct @*/
+{
+ PyObject * blob;
+ unsigned char * pkt;
+ unsigned int pktlen;
+
+if (_rpmts_debug)
+fprintf(stderr, "*** rpmts_PgpImportPubkey(%p) ts %p\n", s, s->ts);
+
+ if (!PyArg_ParseTuple(args, "O:PgpImportPubkey", &blob)) return NULL;
+ if (blob == Py_None) {
+ Py_INCREF(Py_None);
+ return Py_None;
+ }
+ if (!PyString_Check(blob)) {
+ PyErr_SetString(pyrpmError, "PgpImportPubkey takes a string of octets");
+ return NULL;
+ }
+ pkt = PyString_AsString(blob);
+ pktlen = PyString_Size(blob);
+
+ (void) rpmcliImportPubkey(s->ts, pkt, pktlen);
+
+ Py_INCREF(Py_None);
+ return Py_None;
+}
+
+/** \ingroup python
+ */
+static PyObject *
rpmts_GetKeys(rpmtsObject * s, PyObject * args)
/*@globals _Py_NoneStruct @*/
/*@modifies s, _Py_NoneStruct @*/
@@ -746,7 +811,7 @@ rpmts_GetKeys(rpmtsObject * s, PyObject * args)
PyObject *tuple;
if (_rpmts_debug)
-fprintf(stderr, "*** GetKeys(%p) ts %p\n", s, s->ts);
+fprintf(stderr, "*** rpmts_GetKeys(%p) ts %p\n", s, s->ts);
if (!PyArg_ParseTuple(args, ":GetKeys")) return NULL;
@@ -1066,6 +1131,10 @@ static struct PyMethodDef rpmts_methods[] = {
rpm.RPMVSF_NORSA if set, don't check header+payload RSA signature\n\
rpm._RPMVSF_NODIGESTS if set, don't check digest(s)\n\
rpm._RPMVSF_NOSIGNATURES if set, don't check signature(s)\n" },
+ {"pgpPrtPkts", (PyCFunction) rpmts_PgpPrtPkts, METH_VARARGS,
+ NULL },
+ {"pgpImportPubkey", (PyCFunction) rpmts_PgpImportPubkey, METH_VARARGS,
+ NULL },
{"getKeys", (PyCFunction) rpmts_GetKeys, METH_VARARGS,
NULL },
{"dbMatch", (PyCFunction) rpmts_Match, METH_VARARGS,
diff --git a/rpm.spec.in b/rpm.spec.in
index e3819bf3a..bdca82143 100644
--- a/rpm.spec.in
+++ b/rpm.spec.in
@@ -517,7 +517,10 @@ fi
%{__prefix}/include/popt.h
%changelog
-* Mon Aug 5 2002 Jeff Johnson <jbj@redhat.com> 4.1-0.71
+* Tue Aug 6 2002 Jeff Johnson <jbj@redhat.com> 4.1-0.73
+- python: bindings to import pubkeys and display openpgp packets.
+
+* Mon Aug 5 2002 Jeff Johnson <jbj@redhat.com> 4.1-0.72
- python: bare bones rollback bindings.
- python: enable threads on callbacks and longish rpmlib calls.
- python: expose RPMTAG_SOURCEPACKAGE to identify source headers.