summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES4
-rw-r--r--beecrypt/base64.c29
-rw-r--r--beecrypt/base64.h10
-rw-r--r--lib/formats.c135
-rw-r--r--lib/header.c27
-rw-r--r--lib/rpmchecksig.c18
-rw-r--r--lib/signature.c226
-rw-r--r--po/cs.po122
-rw-r--r--po/da.po122
-rw-r--r--po/de.po122
-rw-r--r--po/en_RN.po122
-rw-r--r--po/es.po122
-rw-r--r--po/eu_ES.po122
-rw-r--r--po/fi.po122
-rw-r--r--po/fr.po122
-rw-r--r--po/gl.po122
-rw-r--r--po/hu.po122
-rw-r--r--po/id.po122
-rw-r--r--po/is.po122
-rw-r--r--po/it.po122
-rw-r--r--po/ja.po124
-rw-r--r--po/ko.po122
-rw-r--r--po/no.po122
-rw-r--r--po/pl.po122
-rw-r--r--po/pt.po122
-rw-r--r--po/pt_BR.po122
-rw-r--r--po/ro.po122
-rw-r--r--po/rpm.pot80
-rw-r--r--po/ru.po122
-rw-r--r--po/sk.po122
-rw-r--r--po/sl.po124
-rw-r--r--po/sr.po122
-rw-r--r--po/sv.po122
-rw-r--r--po/tr.po122
-rw-r--r--po/uk.po122
-rw-r--r--po/wa.po122
-rw-r--r--po/zh.po122
-rw-r--r--po/zh_CN.GB2312.po122
-rw-r--r--rpm.spec4
-rw-r--r--rpm.spec.in4
-rw-r--r--rpmio/Makefile.am6
-rw-r--r--rpmio/rpmpgp.c46
-rw-r--r--rpmio/rpmpgp.h133
-rw-r--r--rpmio/tring.c215
44 files changed, 2695 insertions, 1906 deletions
diff --git a/CHANGES b/CHANGES
index b7f8ba990..d1ca4e052 100644
--- a/CHANGES
+++ b/CHANGES
@@ -12,7 +12,9 @@
- ratchet up to lclint "strict" level.
- upgrade to db-4.0.7.
- use only header methods, routines are now static.
- - beecrypt is at least as good as pgp/gpg on verify, pull the plug.
+ - beecrypt is at least as good as pgp/gpg on verify, pulling the plug.
+ - add :base64 and :armor format extensions, dump binary tags in hex.
+ - proof-of-concept pubkey retrieval from RPM-{PGP,GPG}-KEY.
4.0.3 -> 4.0.4:
diff --git a/beecrypt/base64.c b/beecrypt/base64.c
index f9ed04785..fef7ca3b3 100644
--- a/beecrypt/base64.c
+++ b/beecrypt/base64.c
@@ -339,6 +339,35 @@ fprintf(stderr, "%7u %02x %02x %02x -> %02x %02x %02x %02x\n",
}
/*@=internalglobs =modfilesys @*/
+/*@-internalglobs -modfilesys @*/
+#define CRC24_INIT 0xb704ceL
+#define CRC24_POLY 0x1864cfbL
+
+char * b64crc (const void * data, int ns)
+{
+ const unsigned char *s = data;
+ uint32 crc = CRC24_INIT;
+
+ while (ns-- > 0) {
+ int i;
+ crc ^= (*s++) << 16;
+ for (i = 0; i < 8; i++) {
+ crc <<= 1;
+ if (crc & 0x1000000)
+ crc ^= CRC24_POLY;
+ }
+ }
+ crc &= 0xffffff;
+ #if !WORDS_BIGENDIAN
+ crc = swapu32(crc);
+ #endif
+ data = (byte *)&crc;
+ data++;
+ ns = 3;
+ return b64encode(data, ns);
+}
+/*@=internalglobs =modfilesys @*/
+
/*@observer@*/ /*@unchecked@*/
const char * b64decode_whitespace = B64DECODE_WHITESPACE;
diff --git a/beecrypt/base64.h b/beecrypt/base64.h
index 04e72cb8b..fae722614 100644
--- a/beecrypt/base64.h
+++ b/beecrypt/base64.h
@@ -72,6 +72,16 @@ char * b64encode (const void * data, int ns)
/*@*/;
/**
+ * Encode crc of binary input data into 5 bytes of base64 output.
+ * @param data binary data
+ * @param ns crc of data
+ * @return (malloc'd) base64 string
+ */
+BEECRYPTAPI /*@only@*/ /*@null@*/ /*@unused@*/
+char * b64crc (const void * data, int ns)
+ /*@*/;
+
+/**
* Decode chunks of 4 bytes of base64 input into 3 bytes of binary output.
* @param s base64 string
* @retval datap address of (malloc'd) binary data
diff --git a/lib/formats.c b/lib/formats.c
index b8adab0a3..591b9e452 100644
--- a/lib/formats.c
+++ b/lib/formats.c
@@ -5,10 +5,15 @@
#include "system.h"
#include <rpmlib.h>
#include <rpmmacro.h> /* XXX for %_i18ndomains */
+#include "rpmpgp.h"
#include "manifest.h"
#include "misc.h"
#include "debug.h"
+/*@-exportheadervar@*/
+extern const char * RPMVERSION;
+/*@=exportheadervar@*/
+
/**
* @param type tag type
* @param data tag value
@@ -24,14 +29,12 @@ static /*@only@*/ char * triggertypeFormat(int_32 type, const void * data,
const int_32 * item = data;
char * val;
- if (type != RPM_INT32_TYPE) {
+ if (type != RPM_INT32_TYPE)
val = xstrdup(_("(not a number)"));
- } else if (*item & RPMSENSE_TRIGGERIN) {
+ else if (*item & RPMSENSE_TRIGGERIN)
val = xstrdup("in");
- } else {
+ else
val = xstrdup("un");
- }
-
return val;
}
@@ -108,7 +111,68 @@ static /*@only@*/ char * fflagsFormat(int_32 type, const void * data,
return val;
}
-#ifdef NOTYET
+/**
+ * @param type tag type
+ * @param data tag value
+ * @param formatPrefix
+ * @param padding
+ * @param element (unused)
+ * @return formatted string
+ */
+static /*@only@*/ char * armorFormat(int_32 type, const void * data,
+ /*@unused@*/ char * formatPrefix, int padding, int element)
+ /*@*/
+{
+ char * val;
+
+ if (type != RPM_BIN_TYPE) {
+ val = xstrdup(_("(not a blob)"));
+ } else {
+ const char * enc;
+ char * t;
+ int lc;
+ int nt = ((element + 2) / 3) * 4;
+
+ /*@-globs@*/
+ /* Add additional bytes necessary for eol string(s). */
+ if (b64encode_chars_per_line > 0 && b64encode_eolstr != NULL) {
+ lc = (nt + b64encode_chars_per_line - 1) / b64encode_chars_per_line;
+ if (((nt + b64encode_chars_per_line - 1) % b64encode_chars_per_line) != 0)
+ ++lc;
+ nt += lc * strlen(b64encode_eolstr);
+ }
+ /*@=globs@*/
+
+ nt += 512; /* XXX slop for armor and crc */
+
+ val = t = xmalloc(nt + padding + 1);
+
+ *t = '\0';
+ t = stpcpy(t, "-----BEGIN PGP ");
+ t = stpcpy(t, pgpValStr(pgpArmorTbl, PGPARMOR_SIGNATURE));
+ /*@-globs@*/
+ t = stpcpy( stpcpy(t, "-----\nVersion: rpm-"), RPMVERSION);
+ /*@=globs@*/
+ t = stpcpy(t, " (beecrypt-2.2.0)\n\n");
+
+ if ((enc = b64encode(data, element)) != NULL) {
+ t = stpcpy(t, enc);
+ enc = _free(enc);
+ if ((enc = b64crc(data, element)) != NULL) {
+ *t++ = '=';
+ t = stpcpy(t, enc);
+ enc = _free(enc);
+ }
+ }
+
+ t = stpcpy(t, "-----END PGP ");
+ t = stpcpy(t, pgpValStr(pgpArmorTbl, PGPARMOR_SIGNATURE));
+ t = stpcpy(t, "-----\n");
+ }
+
+ return val;
+}
+
/**
* @param type tag type
* @param data tag value
@@ -118,22 +182,59 @@ static /*@only@*/ char * fflagsFormat(int_32 type, const void * data,
* @return formatted string
*/
static /*@only@*/ char * base64Format(int_32 type, const void * data,
- char * formatPrefix, int padding, /*@unused@*/ int element)
- /*@modifies formatPrefix @*/
+ /*@unused@*/ char * formatPrefix, int padding, int element)
+ /*@*/
{
char * val;
- char buf[10];
if (type != RPM_BIN_TYPE) {
val = xstrdup(_("(not a blob)"));
} else {
- buf[0] = '\0';
+ const char * enc;
+ char * t;
+ int lc;
+ int nt = ((element + 2) / 3) * 4;
+
+ /*@-globs@*/
+ /* Add additional bytes necessary for eol string(s). */
+ if (b64encode_chars_per_line > 0 && b64encode_eolstr != NULL) {
+ lc = (nt + b64encode_chars_per_line - 1) / b64encode_chars_per_line;
+ if (((nt + b64encode_chars_per_line - 1) % b64encode_chars_per_line) != 0)
+ ++lc;
+ nt += lc * strlen(b64encode_eolstr);
+ }
+ /*@=globs@*/
- val = xmalloc(5 + padding);
- strcat(formatPrefix, "s");
- /*@-formatconst@*/
- sprintf(val, formatPrefix, buf);
- /*@=formatconst@*/
+ val = t = xmalloc(nt + padding + 1);
+
+ *t = '\0';
+ if ((enc = b64encode(data, element)) != NULL) {
+ t = stpcpy(t, enc);
+ enc = _free(enc);
+ }
+ }
+
+ return val;
+}
+
+#ifdef NOTYET
+/**
+ * @param type tag type
+ * @param data tag value
+ * @param formatPrefix
+ * @param padding
+ * @param element (unused)
+ * @return formatted string
+ */
+static /*@only@*/ char * pgppktFormat(int_32 type, const void * data,
+ char * formatPrefix, int padding, int element)
+ /*@modifies formatPrefix @*/
+{
+ char * val;
+
+ if (type != RPM_BIN_TYPE) {
+ val = xstrdup(_("(not a blob)"));
+ } else {
}
return val;
@@ -603,8 +704,10 @@ const struct headerSprintfExtension_s rpmHeaderFormats[] = {
{ HEADER_EXT_TAG, "RPMTAG_INSTALLPREFIX", { instprefixTag } },
{ HEADER_EXT_TAG, "RPMTAG_TRIGGERCONDS", { triggercondsTag } },
{ HEADER_EXT_TAG, "RPMTAG_TRIGGERTYPE", { triggertypeTag } },
-#ifdef NOTYET
+ { HEADER_EXT_FORMAT, "armor", { armorFormat } },
{ HEADER_EXT_FORMAT, "base64", { base64Format } },
+#ifdef NOTYET
+ { HEADER_EXT_FORMAT, "pgppkt", { pgppktFormat } },
#endif
{ HEADER_EXT_FORMAT, "depflags", { depflagsFormat } },
{ HEADER_EXT_FORMAT, "fflags", { fflagsFormat } },
diff --git a/lib/header.c b/lib/header.c
index 43e8f4a8b..a0b5c9d63 100644
--- a/lib/header.c
+++ b/lib/header.c
@@ -2642,6 +2642,33 @@ static char * formatValue(sprintfTag tag, Header h,
}
break;
+ case RPM_BIN_TYPE:
+ if (tagtype)
+ val = tagtype(RPM_BIN_TYPE, data, buf, tag->pad, count);
+
+ if (!val) {
+#ifdef NOTYET
+ val = memcpy(xmalloc(count), data, count);
+#else
+ /* XXX format string not used */
+ static char hex[] = "0123456789abcdef";
+ const char * s = data;
+ char * t;
+
+ strcat(buf, "s");
+ len = 2*count + tag->pad + 1;
+ val = t = xmalloc(len);
+ while (count-- > 0) {
+ unsigned int i;
+ i = *s++;
+ *t++ = hex[ (i >> 4) & 0xf ];
+ *t++ = hex[ (i ) & 0xf ];
+ }
+ *t = '\0';
+#endif
+ }
+ break;
+
default:
val = xstrdup(_("(unknown type)"));
break;
diff --git a/lib/rpmchecksig.c b/lib/rpmchecksig.c
index eb6d4bc50..d7f2a44a2 100644
--- a/lib/rpmchecksig.c
+++ b/lib/rpmchecksig.c
@@ -252,6 +252,8 @@ rpmDigest freeDig(/*@only@*/ /*@null@*/ rpmDigest dig)
/*@modifies dig @*/
{
if (dig != NULL) {
+ dig->signature.v3 = _free(dig->signature.v3);
+ dig->pubkey.v3 = _free(dig->pubkey.v3);
/*@-branchstate@*/
if (dig->md5ctx != NULL)
(void) rpmDigestFinal(dig->md5ctx, NULL, NULL, 0);
@@ -375,12 +377,12 @@ int rpmCheckSig(rpmCheckSigFlags flags, const char ** argv)
const void * ptr;
int res = 0;
int xx;
-
+#ifdef DYING
const char * gpgpk = NULL;
unsigned int gpgpklen = 0;
const char * pgppk = NULL;
unsigned int pgppklen = 0;
-
+#endif
rpmDigest dig = NULL;
rpmRC rc;
@@ -454,14 +456,17 @@ fprintf(stderr, "========================= Package RSA Signature\n");
/*@-type@*/ /* FIX: cast? */
/*@-nullpass@*/ /* FIX: dig->md5ctx may be null */
{ DIGEST_CTX ctx = rpmDigestDup(dig->md5ctx);
+ pgpPktSigV3 dsig = dig->signature.v3;
- xx = rpmDigestUpdate(ctx, &dig->sig.v3.sigtype, dig->sig.v3.hashlen);
+ xx = rpmDigestUpdate(ctx, &dsig->sigtype, dsig->hashlen);
xx = rpmDigestFinal(ctx, (void **)&dig->md5, &dig->md5len, 1);
/* XXX compare leading 16 bits of digest for quick check. */
}
/*@=nullpass@*/
/*@=type@*/
+ /* XXX sanity check on tag and signature agreement. */
+#ifdef DYING
/* XXX retrieve by keyid from signature. */
if (pgppk == NULL) {
xx = b64decode(redhatPubKeyRSA, (void **)&pgppk, &pgppklen);
@@ -471,6 +476,7 @@ fprintf(stderr, "========================= Red Hat RSA Public Key\n");
}
xx = pgpPrtPkts(pgppk, pgppklen, dig, 0);
+#endif
{ const char * prefix = "3020300c06082a864886f70d020505000410";
unsigned int nbits = 1024;
@@ -501,12 +507,15 @@ fprintf(stderr, "========================= Package DSA Signature\n");
/*@-type@*/ /* FIX: cast? */
/*@-nullpass@*/ /* FIX: dig->sha1ctx may be null */
{ DIGEST_CTX ctx = rpmDigestDup(dig->sha1ctx);
- xx = rpmDigestUpdate(ctx, &dig->sig.v3.sigtype, dig->sig.v3.hashlen);
+ pgpPktSigV3 dsig = dig->signature.v3;
+ xx = rpmDigestUpdate(ctx, &dsig->sigtype, dsig->hashlen);
xx = rpmDigestFinal(ctx, (void **)&dig->sha1, &dig->sha1len, 1);
mp32nzero(&dig->hm); mp32nsethex(&dig->hm, dig->sha1);
}
/*@=nullpass@*/
/*@=type@*/
+ /* XXX sanity check on tag and signature agreement. */
+#ifdef DYING
/* XXX retrieve by keyid from signature. */
if (gpgpk == NULL) {
xx = b64decode(redhatPubKeyDSA, (void **)&gpgpk, &gpgpklen);
@@ -515,6 +524,7 @@ fprintf(stderr, "========================= Red Hat DSA Public Key\n");
xx = pgpPrtPkts(gpgpk, gpgpklen, NULL, rpmIsDebug());
}
xx = pgpPrtPkts(gpgpk, gpgpklen, dig, 0);
+#endif
/*@switchbreak@*/ break;
case RPMSIGTAG_LEMD5_2:
case RPMSIGTAG_LEMD5_1:
diff --git a/lib/signature.c b/lib/signature.c
index 651baf858..a11617d7b 100644
--- a/lib/signature.c
+++ b/lib/signature.c
@@ -15,6 +15,7 @@
/*@access Header@*/ /* XXX compared with NULL */
/*@access FD_t@*/ /* XXX compared with NULL */
+/*@access rpmDigest@*/
int rpmLookupSignatureType(int action)
{
@@ -594,6 +595,185 @@ char * rpmGetPassPhrase(const char * prompt, const int sigTag)
return pass;
}
+static int rpmSlurp(const char * fn,
+ /*@out@*/ const byte ** bp, /*@out@*/ ssize_t * blenp)
+ /*@globals fileSystem @*/
+ /*@modifies *bp, *blenp, fileSystem @*/
+{
+ static ssize_t blenmax = (8 * BUFSIZ);
+ ssize_t blen = 0;
+ byte * b = NULL;
+ ssize_t size;
+ FD_t fd;
+ int rc = 0;
+
+ fd = Fopen(fn, "r.ufdio");
+ if (fd == NULL || Ferror(fd)) {
+ rc = 2;
+ goto exit;
+ }
+
+ size = fdSize(fd);
+ blen = (size >= 0 ? size : blenmax);
+ /*@-branchstate@*/
+ if (blen) {
+ int nb;
+ b = xmalloc(blen+1);
+ b[0] = '\0';
+ nb = Fread(b, sizeof(*b), blen, fd);
+ if (Ferror(fd) || (size > 0 && nb != blen)) {
+ rc = 1;
+ goto exit;
+ }
+ if (blen == blenmax && nb < blen) {
+ blen = nb;
+ b = xrealloc(b, blen+1);
+ }
+ b[blen] = '\0';
+ }
+ /*@=branchstate@*/
+
+exit:
+ if (fd) (void) Fclose(fd);
+
+ if (rc) {
+ if (b) free(b);
+ b = NULL;
+ blen = 0;
+ }
+
+ if (bp) *bp = b;
+ else if (b) free(b);
+
+ if (blenp) *blenp = blen;
+
+ return rc;
+}
+
+static int rpmReadPgpPkt(const char * fn,
+ /*@out@*/ const byte ** pkt, /*@out@*/ size_t * pktlen)
+ /*@globals fileSystem @*/
+ /*@modifies *pkt, *pktlen, fileSystem @*/
+{
+ const byte * b = NULL;
+ ssize_t blen;
+ const char * enc = NULL;
+ const char * crcenc = NULL;
+ byte * dec;
+ byte * crcdec;
+ size_t declen;
+ size_t crclen;
+ uint32 crcpkt, crc;
+ const char * armortype = NULL;
+ char * t, * te;
+ int pstate = 0;
+ int ec = 1; /* XXX assume failure */
+ int rc;
+
+ rc = rpmSlurp(fn, &b, &blen);
+ if (rc || b == NULL || blen <= 0)
+ goto exit;
+
+ if (pgpIsPkt(b)) {
+#ifdef NOTYET /* XXX ASCII Pubkeys only, please. */
+ ec = 0;
+#endif
+ goto exit;
+ }
+
+#define TOKEQ(_s, _tok) (!strncmp((_s), (_tok), sizeof(_tok)-1))
+
+ for (t = (char *)b; t && *t; t = te) {
+ if ((te = strchr(t, '\n')) == NULL)
+ te = t + strlen(t);
+ else
+ te++;
+
+ switch (pstate) {
+ case 0:
+ armortype = NULL;
+ if (!TOKEQ(t, "-----BEGIN PGP "))
+ continue;
+ t += sizeof("-----BEGIN PGP ")-1;
+
+ rc = pgpValTok(pgpArmorTbl, t, te);
+ if (rc < 0)
+ goto exit;
+ if (rc != PGPARMOR_PUBKEY) /* XXX ASCII Pubkeys only, please. */
+ continue;
+ armortype = t;
+
+ t = te - (sizeof("-----\n")-1);
+ if (!TOKEQ(t, "-----\n"))
+ continue;
+ *t = '\0';
+ pstate++;
+ /*@switchbreak@*/ break;
+ case 1:
+ enc = NULL;
+ rc = pgpValTok(pgpArmorKeyTbl, t, te);
+ if (rc >= 0)
+ continue;
+ if (*t != '\n') {
+ pstate = 0;
+ continue;
+ }
+ enc = te; /* Start of encoded packets */
+ pstate++;
+ /*@switchbreak@*/ break;
+ case 2:
+ crcenc = NULL;
+ if (*t != '=')
+ continue;
+ *t++ = '\0'; /* Terminate encoded packets */
+ crcenc = t; /* Start of encoded crc */
+ pstate++;
+ /*@switchbreak@*/ break;
+ case 3:
+ pstate = 0;
+ if (!TOKEQ(t, "-----END PGP "))
+ goto exit;
+ *t = '\0'; /* Terminate encoded crc */
+ t += sizeof("-----END PGP ")-1;
+
+ if (armortype == NULL) /* XXX can't happen */
+ continue;
+ rc = strncmp(t, armortype, strlen(armortype));
+ if (rc)
+ continue;
+
+ t = te - (sizeof("-----\n")-1);
+ if (!TOKEQ(t, "-----\n"))
+ goto exit;
+
+ if (b64decode(crcenc, (void **)&crcdec, &crclen) != 0)
+ continue;
+ crcpkt = pgpGrab(crcdec, crclen);
+ free(crcdec);
+ if (b64decode(enc, (void **)&dec, &declen) != 0)
+ goto exit;
+ crc = pgpCRC(dec, declen);
+ if (crcpkt != crc)
+ goto exit;
+ free((void *)b);
+ b = dec;
+ blen = declen;
+ ec = 0;
+ goto exit;
+ /*@notreached@*/ /*@switchbreak@*/ break;
+ }
+ }
+
+exit:
+ if (ec == 0 && pkt)
+ *pkt = b;
+ else if (b != NULL)
+ free((void *)b);
+ if (pktlen)
+ *pktlen = blen;
+ return rc;
+}
+
static rpmVerifySignatureReturn
verifySizeSignature(/*@unused@*/ const char * fn,
const byte * sig,
@@ -665,12 +845,33 @@ verifyPGPSignature(/*@unused@*/ const char * fn,
const rpmDigest dig, /*@out@*/ char * result)
/*@modifies *result */
{
+ /*@unchecked@*/ static const byte * pgppk = NULL;
+ /*@unchecked@*/ static size_t pgppklen = 0;
char * t = result;
- int res;
+ int res, xx;
*t = '\0';
t = stpcpy(t, "V3 RSA/MD5 signature: ");
+ /*@-globs -internalglobs -modfilesys@*/
+ /* XXX retrieve by keyid from signature. */
+ if (pgppk == NULL) {
+#ifdef DYING
+ xx = b64decode(redhatPubKeyRSA, (void **)&pgppk, &pgppklen);
+#else
+ xx = rpmReadPgpPkt("/usr/lib/rpm/RPM-PGP-KEY", &pgppk, &pgppklen);
+#endif
+if (rpmIsDebug())
+fprintf(stderr, "========================= Red Hat RSA Public Key\n");
+ xx = pgpPrtPkts(pgppk, pgppklen, NULL, rpmIsDebug());
+ }
+ /* XXX sanity check on pubkey and signature agreement. */
+
+ /*@-nullpass@*/
+ xx = pgpPrtPkts(pgppk, pgppklen, dig, 0);
+ /*@=nullpass@*/
+ /*@=globs =internalglobs =modfilesys@*/
+
/*@-type@*/
if (!rsavrfy(&dig->rsa_pk, &dig->rsahm, &dig->c)) {
res = RPMSIG_BAD;
@@ -691,12 +892,33 @@ verifyGPGSignature(/*@unused@*/ const char * fn,
const rpmDigest dig, /*@out@*/ char * result)
/*@modifies *result @*/
{
+ /*@unchecked@*/ static const byte * gpgpk = NULL;
+ /*@unchecked@*/ static size_t gpgpklen = 0;
char * t = result;
- int res;
+ int res, xx;
*t = '\0';
t = stpcpy(t, "V3 DSA signature: ");
+ /*@-globs -internalglobs -modfilesys@*/
+ /* XXX retrieve by keyid from signature. */
+ if (gpgpk == NULL) {
+#ifdef DYING
+ xx = b64decode(redhatPubKeyDSA, (void **)&gpgpk, &gpgpklen);
+#else
+ xx = rpmReadPgpPkt("/usr/lib/rpm/RPM-GPG-KEY", &gpgpk, &gpgpklen);
+#endif
+if (rpmIsDebug())
+fprintf(stderr, "========================= Red Hat DSA Public Key\n");
+ xx = pgpPrtPkts(gpgpk, gpgpklen, NULL, rpmIsDebug());
+ }
+ /* XXX sanity check on pubkey and signature agreement. */
+
+ /*@-nullpass@*/
+ xx = pgpPrtPkts(gpgpk, gpgpklen, dig, 0);
+ /*@=nullpass@*/
+ /*@=globs =internalglobs =modfilesys@*/
+
/*@-type@*/
if (!dsavrfy(&dig->p, &dig->q, &dig->g, &dig->hm, &dig->y, &dig->r, &dig->s)) {
res = RPMSIG_BAD;
diff --git a/po/cs.po b/po/cs.po
index 7f07e3e8a..8fa7c1965 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-19 15:08-0400\n"
+"POT-Creation-Date: 2001-10-20 16:18-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"
@@ -2227,12 +2227,12 @@ msgstr "SMYČKA:\n"
msgid "========== continuing tsort ...\n"
msgstr "========== pokračuje tsort ...\n"
-#: lib/formats.c:28 lib/formats.c:54 lib/formats.c:85 lib/formats.c:160
-#: lib/header.c:2902 lib/header.c:2923 lib/header.c:2945
+#: lib/formats.c:33 lib/formats.c:57 lib/formats.c:88 lib/formats.c:261
+#: lib/header.c:2929 lib/header.c:2950 lib/header.c:2972
msgid "(not a number)"
msgstr "(není číslo)"
-#: lib/formats.c:128
+#: lib/formats.c:129 lib/formats.c:191 lib/formats.c:236
#, fuzzy
msgid "(not a blob)"
msgstr "(není číslo)"
@@ -2394,7 +2394,7 @@ msgstr "ve výrazu je po : očekávána {"
msgid "| expected at end of expression"
msgstr "na konci výrazu je očekáváno |"
-#: lib/header.c:2646
+#: lib/header.c:2673
msgid "(unknown type)"
msgstr "(neznámý typ)"
@@ -3089,86 +3089,86 @@ msgstr "záznam %d nelze přečíst\n"
msgid "package %s is not installed\n"
msgstr "balíček %s není nainstalován\n"
-#: lib/rpmchecksig.c:46
+#: lib/rpmchecksig.c:47
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: otevření selhalo: %s\n"
-#: lib/rpmchecksig.c:58
+#: lib/rpmchecksig.c:59
msgid "makeTempFile failed\n"
msgstr "makeTempFile selhalo\n"
-#: lib/rpmchecksig.c:100
+#: lib/rpmchecksig.c:101
#, c-format
msgid "%s: Fwrite failed: %s\n"
msgstr "%s: Fwrite selhalo: %s\n"
-#: lib/rpmchecksig.c:106 lib/rpmchecksig.c:313
+#: lib/rpmchecksig.c:107 lib/rpmchecksig.c:326
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: Fread selhalo: %s\n"
-#: lib/rpmchecksig.c:143 lib/rpmchecksig.c:368
+#: lib/rpmchecksig.c:144 lib/rpmchecksig.c:401
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: readLead selhalo\n"
-#: lib/rpmchecksig.c:148
+#: lib/rpmchecksig.c:149
#, c-format
msgid "%s: Can't sign v1.0 RPM\n"
msgstr "%s: RPM v1.0 nelze podepsat\n"
-#: lib/rpmchecksig.c:152
+#: lib/rpmchecksig.c:153
#, c-format
msgid "%s: Can't re-sign v2.0 RPM\n"
msgstr "%s: Nemohu znovu podepsat RPM v2.0\n"
-#: lib/rpmchecksig.c:161 lib/rpmchecksig.c:384
+#: lib/rpmchecksig.c:162 lib/rpmchecksig.c:417
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: rpmReadSignature selhalo\n"
-#: lib/rpmchecksig.c:165 lib/rpmchecksig.c:389
+#: lib/rpmchecksig.c:166 lib/rpmchecksig.c:422
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Není dostupný žádný podpis\n"
-#: lib/rpmchecksig.c:198
+#: lib/rpmchecksig.c:199
#, c-format
msgid "%s: writeLead failed: %s\n"
msgstr "%s: writeLead selhalo: %s\n"
-#: lib/rpmchecksig.c:204
+#: lib/rpmchecksig.c:205
#, c-format
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: rpmWriteSignature selhalo: %s\n"
-#: lib/rpmchecksig.c:374
+#: lib/rpmchecksig.c:407
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr "%s: Není dostupný žádný podpis (RPM v1.0)\n"
-#: lib/rpmchecksig.c:604
+#: lib/rpmchecksig.c:649
msgid "NOT OK"
msgstr "NENÍ OK"
-#: lib/rpmchecksig.c:605 lib/rpmchecksig.c:619
+#: lib/rpmchecksig.c:650 lib/rpmchecksig.c:664
msgid " (MISSING KEYS:"
msgstr " (CHYBÍ KLÍČ:"
-#: lib/rpmchecksig.c:607 lib/rpmchecksig.c:621
+#: lib/rpmchecksig.c:652 lib/rpmchecksig.c:666
msgid ") "
msgstr ") "
-#: lib/rpmchecksig.c:608 lib/rpmchecksig.c:622
+#: lib/rpmchecksig.c:653 lib/rpmchecksig.c:667
msgid " (UNTRUSTED KEYS:"
msgstr " (NEDŮVĚRYHODNÝ KLÍČ:"
-#: lib/rpmchecksig.c:610 lib/rpmchecksig.c:624
+#: lib/rpmchecksig.c:655 lib/rpmchecksig.c:669
msgid ")"
msgstr ")"
-#: lib/rpmchecksig.c:618
+#: lib/rpmchecksig.c:663
msgid "OK"
msgstr "OK"
@@ -3364,116 +3364,116 @@ msgstr "Nemohu číst %s, HOME je příliš velký.\n"
msgid "Unable to open %s for reading: %s.\n"
msgstr "Nemohu otevřít %s pro čtení: %s.\n"
-#: lib/signature.c:111
+#: lib/signature.c:112
msgid "file is not regular -- skipping size check\n"
msgstr "není obyčejný soubor -- přeskakuji kontrolu velikosti\n"
-#: lib/signature.c:120
+#: lib/signature.c:121
#, c-format
msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
msgstr ""
"Předpokl. délka: %12d = hlavička(%d)+signatura(%d)+výplň(%d)+data(%d)\n"
-#: lib/signature.c:125
+#: lib/signature.c:126
#, c-format
msgid " Actual size: %12d\n"
msgstr "Aktuální délka: %12d\n"
-#: lib/signature.c:145
+#: lib/signature.c:146
msgid "No signature\n"
msgstr "Chybí podpis\n"
-#: lib/signature.c:149
+#: lib/signature.c:150
msgid "Old PGP signature\n"
msgstr "Starý PGP podpis\n"
-#: lib/signature.c:162
+#: lib/signature.c:163
msgid "Old (internal-only) signature! How did you get that!?\n"
msgstr "Starý (pouze interní) podpis! Jak jste to získali!?\n"
-#: lib/signature.c:218
+#: lib/signature.c:219
#, c-format
msgid "Signature: size(%d)+pad(%d)\n"
msgstr "Podpisu: velikost(%d)+vata(%d)\n"
-#: lib/signature.c:281
+#: lib/signature.c:282
#, c-format
msgid "Couldn't exec pgp (%s)\n"
msgstr "Nemohu spustit pgp (%s)\n"
-#: lib/signature.c:294
+#: lib/signature.c:295
msgid "pgp failed\n"
msgstr "pgp selhalo\n"
#. PGP failed to write signature
#. Just in case
-#: lib/signature.c:301
+#: lib/signature.c:302
msgid "pgp failed to write signature\n"
msgstr "pgp selhalo při zápisu podpisu\n"
-#: lib/signature.c:306
+#: lib/signature.c:307
#, c-format
msgid "PGP sig size: %d\n"
msgstr "Velikost podpisu PGP: %d\n"
-#: lib/signature.c:321 lib/signature.c:408
+#: lib/signature.c:322 lib/signature.c:409
msgid "unable to read the signature\n"
msgstr "nemohu číst podpis\n"
-#: lib/signature.c:326
+#: lib/signature.c:327
#, c-format
msgid "Got %d bytes of PGP sig\n"
msgstr "Přečteno %d bajtů PGP podpisu\n"
-#: lib/signature.c:368 lib/signature.c:498
+#: lib/signature.c:369 lib/signature.c:499
msgid "Couldn't exec gpg\n"
msgstr "Nemohu spustit gpg\n"
-#: lib/signature.c:381
+#: lib/signature.c:382
msgid "gpg failed\n"
msgstr "gpg selhalo\n"
#. GPG failed to write signature
#. Just in case
-#: lib/signature.c:388
+#: lib/signature.c:389
msgid "gpg failed to write signature\n"
msgstr "gpg selhalo při zápisu podpisu\n"
-#: lib/signature.c:393
+#: lib/signature.c:394
#, c-format
msgid "GPG sig size: %d\n"
msgstr "Velikost GPG podpisu: %d\n"
-#: lib/signature.c:413
+#: lib/signature.c:414
#, c-format
msgid "Got %d bytes of GPG sig\n"
msgstr "Přečteno %d bajtů GPG podpisu\n"
-#: lib/signature.c:441
+#: lib/signature.c:442
msgid "Generating signature using PGP.\n"
msgstr "Generuji PGP podpis.\n"
-#: lib/signature.c:447
+#: lib/signature.c:448
msgid "Generating signature using GPG.\n"
msgstr "Generuji GPG podpis.\n"
-#: lib/signature.c:527
+#: lib/signature.c:528
msgid "Couldn't exec pgp\n"
msgstr "Nemohu spustit pgp\n"
#. @notreached@
#. This case should have been screened out long ago.
-#: lib/signature.c:531 lib/signature.c:584
+#: lib/signature.c:532 lib/signature.c:585
#, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr "Špatná %%_signature spec v souboru maker\n"
-#: lib/signature.c:564
+#: lib/signature.c:565
#, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr "Musíte nastavit \"%%_gpg_name\" ve svém makro souboru\n"
-#: lib/signature.c:576
+#: lib/signature.c:577
#, c-format
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr "Musíte nastavit \"%%_pgp_name\" ve svém makro souboru\n"
@@ -3905,59 +3905,59 @@ msgstr "Soubor %s: %s\n"
msgid "File %s is smaller than %u bytes\n"
msgstr "Soubor %s je menší, než %d bajtů\n"
-#: rpmio/rpmio.c:644
+#: rpmio/rpmio.c:656
msgid "Success"
msgstr "Úspěch"
-#: rpmio/rpmio.c:647
+#: rpmio/rpmio.c:659
msgid "Bad server response"
msgstr "Chybná odezva FTP serveru"
-#: rpmio/rpmio.c:650
+#: rpmio/rpmio.c:662
msgid "Server I/O error"
msgstr "I/O chyba serveru"
-#: rpmio/rpmio.c:653
+#: rpmio/rpmio.c:665
msgid "Server timeout"
msgstr "Timeout serveru"
-#: rpmio/rpmio.c:656
+#: rpmio/rpmio.c:668
msgid "Unable to lookup server host address"
msgstr "Nelze převést jméno na IP adresu počítače"
-#: rpmio/rpmio.c:659
+#: rpmio/rpmio.c:671
msgid "Unable to lookup server host name"
msgstr "Nelze převést IP na jméno počítače"
-#: rpmio/rpmio.c:662
+#: rpmio/rpmio.c:674
msgid "Failed to connect to server"
msgstr "Připojení k serveru selhalo"
-#: rpmio/rpmio.c:665
+#: rpmio/rpmio.c:677
msgid "Failed to establish data connection to server"
msgstr "Selhalo navázání datového spojení se serverem"
-#: rpmio/rpmio.c:668
+#: rpmio/rpmio.c:680
msgid "I/O error to local file"
msgstr "I/O chyba při lokálním souboru"
-#: rpmio/rpmio.c:671
+#: rpmio/rpmio.c:683
msgid "Error setting remote server to passive mode"
msgstr "Chyba při nastavení vzdáleného serveru do pasivního režimu"
-#: rpmio/rpmio.c:674
+#: rpmio/rpmio.c:686
msgid "File not found on server"
msgstr "Soubor nebyl na serveru nalezen"
-#: rpmio/rpmio.c:677
+#: rpmio/rpmio.c:689
msgid "Abort in progress"
msgstr "Probíhá přerušení"
-#: rpmio/rpmio.c:681
+#: rpmio/rpmio.c:693
msgid "Unknown or unexpected error"
msgstr "Neznámá nebo neočekávaná chyba"
-#: rpmio/rpmio.c:1353
+#: rpmio/rpmio.c:1365
#, c-format
msgid "logging into %s as %s, pw %s\n"
msgstr "přihlašování na %s jako %s, heslo %s\n"
diff --git a/po/da.po b/po/da.po
index bfbfeae48..6ddff6bc2 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-19 15:08-0400\n"
+"POT-Creation-Date: 2001-10-20 16:18-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"
@@ -2232,12 +2232,12 @@ msgstr "LŘKKE:\n"
msgid "========== continuing tsort ...\n"
msgstr "========== fortsćtter tsort ...\n"
-#: lib/formats.c:28 lib/formats.c:54 lib/formats.c:85 lib/formats.c:160
-#: lib/header.c:2902 lib/header.c:2923 lib/header.c:2945
+#: lib/formats.c:33 lib/formats.c:57 lib/formats.c:88 lib/formats.c:261
+#: lib/header.c:2929 lib/header.c:2950 lib/header.c:2972
msgid "(not a number)"
msgstr "(ikke et tal)"
-#: lib/formats.c:128
+#: lib/formats.c:129 lib/formats.c:191 lib/formats.c:236
#, fuzzy
msgid "(not a blob)"
msgstr "(ikke et tal)"
@@ -2398,7 +2398,7 @@ msgstr "{ forventet efter : i udtryk"
msgid "| expected at end of expression"
msgstr "| forventet ved slutningen af udtryk"
-#: lib/header.c:2646
+#: lib/header.c:2673
msgid "(unknown type)"
msgstr "(ukendt type)"
@@ -3114,86 +3114,86 @@ msgstr "post %d kunne ikke lćses\n"
msgid "package %s is not installed\n"
msgstr "pakken %s er ikke installeret\n"
-#: lib/rpmchecksig.c:46
+#: lib/rpmchecksig.c:47
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: ĺbning mislykkedes: %s\n"
-#: lib/rpmchecksig.c:58
+#: lib/rpmchecksig.c:59
msgid "makeTempFile failed\n"
msgstr "makeTempFile mislykkedes\n"
-#: lib/rpmchecksig.c:100
+#: lib/rpmchecksig.c:101
#, c-format
msgid "%s: Fwrite failed: %s\n"
msgstr "%s: Fwrite mislykkedes: %s\n"
-#: lib/rpmchecksig.c:106 lib/rpmchecksig.c:313
+#: lib/rpmchecksig.c:107 lib/rpmchecksig.c:326
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: Fread mislykkedes: %s\n"
-#: lib/rpmchecksig.c:143 lib/rpmchecksig.c:368
+#: lib/rpmchecksig.c:144 lib/rpmchecksig.c:401
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: readLead mislykkedes\n"
-#: lib/rpmchecksig.c:148
+#: lib/rpmchecksig.c:149
#, c-format
msgid "%s: Can't sign v1.0 RPM\n"
msgstr "%s: Kan ikke underskrive v1.0 RPM\n"
-#: lib/rpmchecksig.c:152
+#: lib/rpmchecksig.c:153
#, c-format
msgid "%s: Can't re-sign v2.0 RPM\n"
msgstr "%s: Kan ikke genunderskrive v2.0 RPM\n"
-#: lib/rpmchecksig.c:161 lib/rpmchecksig.c:384
+#: lib/rpmchecksig.c:162 lib/rpmchecksig.c:417
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: rpmReadSignature mislykkedes\n"
-#: lib/rpmchecksig.c:165 lib/rpmchecksig.c:389
+#: lib/rpmchecksig.c:166 lib/rpmchecksig.c:422
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Ingen tilgćngelig signatur\n"
-#: lib/rpmchecksig.c:198
+#: lib/rpmchecksig.c:199
#, c-format
msgid "%s: writeLead failed: %s\n"
msgstr "%s: writeLead mislykkedes: %s\n"
-#: lib/rpmchecksig.c:204
+#: lib/rpmchecksig.c:205
#, c-format
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: rpmWriteSignature mislykkedes: %s\n"
-#: lib/rpmchecksig.c:374
+#: lib/rpmchecksig.c:407
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr "%s: Ingen tilgćngelig signatur (v1.0 RPM)\n"
-#: lib/rpmchecksig.c:604
+#: lib/rpmchecksig.c:649
msgid "NOT OK"
msgstr "IKKE O.K."
-#: lib/rpmchecksig.c:605 lib/rpmchecksig.c:619
+#: lib/rpmchecksig.c:650 lib/rpmchecksig.c:664
msgid " (MISSING KEYS:"
msgstr " (MANGLENDE NŘGLER: "
-#: lib/rpmchecksig.c:607 lib/rpmchecksig.c:621
+#: lib/rpmchecksig.c:652 lib/rpmchecksig.c:666
msgid ") "
msgstr ") "
-#: lib/rpmchecksig.c:608 lib/rpmchecksig.c:622
+#: lib/rpmchecksig.c:653 lib/rpmchecksig.c:667
msgid " (UNTRUSTED KEYS:"
msgstr " (IKKE-BETROEDE NŘGLER:"
-#: lib/rpmchecksig.c:610 lib/rpmchecksig.c:624
+#: lib/rpmchecksig.c:655 lib/rpmchecksig.c:669
msgid ")"
msgstr ")"
-#: lib/rpmchecksig.c:618
+#: lib/rpmchecksig.c:663
msgid "OK"
msgstr "O.K."
@@ -3391,115 +3391,115 @@ msgstr "Kunne ikke lćse %s, HOME er for stor.\n"
msgid "Unable to open %s for reading: %s.\n"
msgstr "Kunne ikke ĺbne %s for lćsning: %s.\n"
-#: lib/signature.c:111
+#: lib/signature.c:112
msgid "file is not regular -- skipping size check\n"
msgstr "filen er ikke regulćr -- overspringer střrrelsestjek\n"
-#: lib/signature.c:120
+#: lib/signature.c:121
#, c-format
msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
msgstr "Forventet střrrelse: %12d = indled(%d)+sign(%d)+fyld(%d)+data(%d)\n"
-#: lib/signature.c:125
+#: lib/signature.c:126
#, c-format
msgid " Actual size: %12d\n"
msgstr " Faktisk střrrelse: %12d\n"
-#: lib/signature.c:145
+#: lib/signature.c:146
msgid "No signature\n"
msgstr "Ingen signatur\n"
-#: lib/signature.c:149
+#: lib/signature.c:150
msgid "Old PGP signature\n"
msgstr "Gammel PGP-signatur\n"
-#: lib/signature.c:162
+#: lib/signature.c:163
msgid "Old (internal-only) signature! How did you get that!?\n"
msgstr "Gammel (internt brug) signatur! Hvordan fik du fingre i den!?\n"
-#: lib/signature.c:218
+#: lib/signature.c:219
#, fuzzy, c-format
msgid "Signature: size(%d)+pad(%d)\n"
msgstr "Signaturstřrrelse: %d\n"
-#: lib/signature.c:281
+#: lib/signature.c:282
#, c-format
msgid "Couldn't exec pgp (%s)\n"
msgstr "Kunne ikke křre pgp (%s)\n"
-#: lib/signature.c:294
+#: lib/signature.c:295
msgid "pgp failed\n"
msgstr "pgp fejlede\n"
#. PGP failed to write signature
#. Just in case
-#: lib/signature.c:301
+#: lib/signature.c:302
msgid "pgp failed to write signature\n"
msgstr "pgp kunne ikke skrive signatur\n"
-#: lib/signature.c:306
+#: lib/signature.c:307
#, c-format
msgid "PGP sig size: %d\n"
msgstr "PGP-signaturstřrrelse: %d\n"
-#: lib/signature.c:321 lib/signature.c:408
+#: lib/signature.c:322 lib/signature.c:409
msgid "unable to read the signature\n"
msgstr "kunne ikke lćse signaturen\n"
-#: lib/signature.c:326
+#: lib/signature.c:327
#, c-format
msgid "Got %d bytes of PGP sig\n"
msgstr "Fik %d byte af PGP-signatur\n"
-#: lib/signature.c:368 lib/signature.c:498
+#: lib/signature.c:369 lib/signature.c:499
msgid "Couldn't exec gpg\n"
msgstr "Kunne ikke křre gpg\n"
-#: lib/signature.c:381
+#: lib/signature.c:382
msgid "gpg failed\n"
msgstr "gpg fejlede\n"
#. GPG failed to write signature
#. Just in case
-#: lib/signature.c:388
+#: lib/signature.c:389
msgid "gpg failed to write signature\n"
msgstr "gpg kunne ikke skrive signaturen\n"
-#: lib/signature.c:393
+#: lib/signature.c:394
#, c-format
msgid "GPG sig size: %d\n"
msgstr "GPG-signaturstřrrelse: %d\n"
-#: lib/signature.c:413
+#: lib/signature.c:414
#, c-format
msgid "Got %d bytes of GPG sig\n"
msgstr "Fik %d byte GPG-signatur\n"
-#: lib/signature.c:441
+#: lib/signature.c:442
msgid "Generating signature using PGP.\n"
msgstr "Genererer signatur med pgp.\n"
-#: lib/signature.c:447
+#: lib/signature.c:448
msgid "Generating signature using GPG.\n"
msgstr "Genererer signatur med gpg.\n"
-#: lib/signature.c:527
+#: lib/signature.c:528
msgid "Couldn't exec pgp\n"
msgstr "Kunne ikke křre pgp\n"
#. @notreached@
#. This case should have been screened out long ago.
-#: lib/signature.c:531 lib/signature.c:584
+#: lib/signature.c:532 lib/signature.c:585
#, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr "Ugyldig angivelse af '%%_signature'-spec i makrofil.\n"
-#: lib/signature.c:564
+#: lib/signature.c:565
#, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr "Du skal angive \"%%_gpg_name\" i din makrofil\n"
-#: lib/signature.c:576
+#: lib/signature.c:577
#, c-format
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr "Du skal angive \"%%_pgp_name\" i din makrofil\n"
@@ -3937,59 +3937,59 @@ msgstr "Fil %s: %s\n"
msgid "File %s is smaller than %u bytes\n"
msgstr "Filen %s er mindre end %u byte\n"
-#: rpmio/rpmio.c:644
+#: rpmio/rpmio.c:656
msgid "Success"
msgstr "Succes"
-#: rpmio/rpmio.c:647
+#: rpmio/rpmio.c:659
msgid "Bad server response"
msgstr "Ugyldigt svar fra server"
-#: rpmio/rpmio.c:650
+#: rpmio/rpmio.c:662
msgid "Server I/O error"
msgstr "I/O-fejl for server"
-#: rpmio/rpmio.c:653
+#: rpmio/rpmio.c:665
msgid "Server timeout"
msgstr "Tidsudlřb for server"
-#: rpmio/rpmio.c:656
+#: rpmio/rpmio.c:668
msgid "Unable to lookup server host address"
msgstr "Kunne ikke skaffe serverens IP-addresse"
-#: rpmio/rpmio.c:659
+#: rpmio/rpmio.c:671
msgid "Unable to lookup server host name"
msgstr "Kunne ikke slĺ serverens navn op"
-#: rpmio/rpmio.c:662
+#: rpmio/rpmio.c:674
msgid "Failed to connect to server"
msgstr "Kunne ikke etablere en forbindelse til serveren"
-#: rpmio/rpmio.c:665
+#: rpmio/rpmio.c:677
msgid "Failed to establish data connection to server"
msgstr "Kunne ikke etablere en data-forbindelse til serveren"
-#: rpmio/rpmio.c:668
+#: rpmio/rpmio.c:680
msgid "I/O error to local file"
msgstr "I/O-fejl i lokal fil"
-#: rpmio/rpmio.c:671
+#: rpmio/rpmio.c:683
msgid "Error setting remote server to passive mode"
msgstr "Kunne ikke sćtte fjernserveren i passiv tilstand"
-#: rpmio/rpmio.c:674
+#: rpmio/rpmio.c:686
msgid "File not found on server"
msgstr "Fil ikke fundet pĺ server"
-#: rpmio/rpmio.c:677
+#: rpmio/rpmio.c:689
msgid "Abort in progress"
msgstr "Afbryder programmet"
-#: rpmio/rpmio.c:681
+#: rpmio/rpmio.c:693
msgid "Unknown or unexpected error"
msgstr "Ukendt eller uventet fejl"
-#: rpmio/rpmio.c:1353
+#: rpmio/rpmio.c:1365
#, c-format
msgid "logging into %s as %s, pw %s\n"
msgstr "logger pĺ %s som %s, adgangskode %s\n"
diff --git a/po/de.po b/po/de.po
index 915175adb..e38d1763a 100644
--- a/po/de.po
+++ b/po/de.po
@@ -37,7 +37,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-19 15:08-0400\n"
+"POT-Creation-Date: 2001-10-20 16:18-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"
@@ -2410,12 +2410,12 @@ msgstr ""
msgid "========== continuing tsort ...\n"
msgstr ""
-#: lib/formats.c:28 lib/formats.c:54 lib/formats.c:85 lib/formats.c:160
-#: lib/header.c:2902 lib/header.c:2923 lib/header.c:2945
+#: lib/formats.c:33 lib/formats.c:57 lib/formats.c:88 lib/formats.c:261
+#: lib/header.c:2929 lib/header.c:2950 lib/header.c:2972
msgid "(not a number)"
msgstr "(keine Zahl)"
-#: lib/formats.c:128
+#: lib/formats.c:129 lib/formats.c:191 lib/formats.c:236
#, fuzzy
msgid "(not a blob)"
msgstr "(keine Zahl)"
@@ -2583,7 +2583,7 @@ msgstr "{ nach : im Ausdruck erwartet"
msgid "| expected at end of expression"
msgstr "| am Ende des Ausdrucks erwartet"
-#: lib/header.c:2646
+#: lib/header.c:2673
msgid "(unknown type)"
msgstr "(unbekannter Typ)"
@@ -3347,88 +3347,88 @@ msgstr "Eintrag %d konnte nicht gelesen werden\n"
msgid "package %s is not installed\n"
msgstr "Paket %s ist nicht installiert\n"
-#: lib/rpmchecksig.c:46
+#: lib/rpmchecksig.c:47
#, fuzzy, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: Öffnen fehlgeschlagen\n"
-#: lib/rpmchecksig.c:58
+#: lib/rpmchecksig.c:59
#, fuzzy
msgid "makeTempFile failed\n"
msgstr "%s: Öffnen fehlgeschlagen\n"
-#: lib/rpmchecksig.c:100
+#: lib/rpmchecksig.c:101
#, fuzzy, c-format
msgid "%s: Fwrite failed: %s\n"
msgstr "%s: ťreadLeadŤ fehlgeschlagen\n"
-#: lib/rpmchecksig.c:106 lib/rpmchecksig.c:313
+#: lib/rpmchecksig.c:107 lib/rpmchecksig.c:326
#, fuzzy, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: ťreadLeadŤ fehlgeschlagen\n"
-#: lib/rpmchecksig.c:143 lib/rpmchecksig.c:368
+#: lib/rpmchecksig.c:144 lib/rpmchecksig.c:401
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: ťreadLeadŤ fehlgeschlagen\n"
-#: lib/rpmchecksig.c:148
+#: lib/rpmchecksig.c:149
#, c-format
msgid "%s: Can't sign v1.0 RPM\n"
msgstr "%s: Kann v1.0-RPM nicht signieren\n"
-#: lib/rpmchecksig.c:152
+#: lib/rpmchecksig.c:153
#, c-format
msgid "%s: Can't re-sign v2.0 RPM\n"
msgstr "%s: Kann v2.0-RPM nicht erneuert signieren\n"
-#: lib/rpmchecksig.c:161 lib/rpmchecksig.c:384
+#: lib/rpmchecksig.c:162 lib/rpmchecksig.c:417
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: ťrpmReadSignatureŤ fehlgeschlagen\n"
-#: lib/rpmchecksig.c:165 lib/rpmchecksig.c:389
+#: lib/rpmchecksig.c:166 lib/rpmchecksig.c:422
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Keine Signatur verfügbar\n"
-#: lib/rpmchecksig.c:198
+#: lib/rpmchecksig.c:199
#, fuzzy, c-format
msgid "%s: writeLead failed: %s\n"
msgstr "%s: ťreadLeadŤ fehlgeschlagen\n"
-#: lib/rpmchecksig.c:204
+#: lib/rpmchecksig.c:205
#, fuzzy, c-format
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: ťrpmReadSignatureŤ fehlgeschlagen\n"
-#: lib/rpmchecksig.c:374
+#: lib/rpmchecksig.c:407
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr "%s: Keine Signatur verfügbar (v1.0 RPM)\n"
-#: lib/rpmchecksig.c:604
+#: lib/rpmchecksig.c:649
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:605 lib/rpmchecksig.c:619
+#: lib/rpmchecksig.c:650 lib/rpmchecksig.c:664
#, fuzzy
msgid " (MISSING KEYS:"
msgstr " (FEHLENDE SCHLüSSEL)"
-#: lib/rpmchecksig.c:607 lib/rpmchecksig.c:621
+#: lib/rpmchecksig.c:652 lib/rpmchecksig.c:666
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:608 lib/rpmchecksig.c:622
+#: lib/rpmchecksig.c:653 lib/rpmchecksig.c:667
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:610 lib/rpmchecksig.c:624
+#: lib/rpmchecksig.c:655 lib/rpmchecksig.c:669
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:618
+#: lib/rpmchecksig.c:663
msgid "OK"
msgstr ""
@@ -3631,127 +3631,127 @@ msgstr ""
msgid "Unable to open %s for reading: %s.\n"
msgstr "Datei %s kann nicht zum Lesen geöffnet werden: %s."
-#: lib/signature.c:111
+#: lib/signature.c:112
msgid "file is not regular -- skipping size check\n"
msgstr ""
-#: lib/signature.c:120
+#: lib/signature.c:121
#, c-format
msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
msgstr ""
-#: lib/signature.c:125
+#: lib/signature.c:126
#, c-format
msgid " Actual size: %12d\n"
msgstr ""
-#: lib/signature.c:145
+#: lib/signature.c:146
#, fuzzy
msgid "No signature\n"
msgstr "%s: Keine Signatur verfügbar\n"
-#: lib/signature.c:149
+#: lib/signature.c:150
#, fuzzy
msgid "Old PGP signature\n"
msgstr "PGP-Signatur generieren"
-#: lib/signature.c:162
+#: lib/signature.c:163
#, fuzzy
msgid "Old (internal-only) signature! How did you get that!?\n"
msgstr "Alte Signatur (nur intern)! Wie bist du daran gekommen!?"
-#: lib/signature.c:218
+#: lib/signature.c:219
#, c-format
msgid "Signature: size(%d)+pad(%d)\n"
msgstr ""
-#: lib/signature.c:281
+#: lib/signature.c:282
#, fuzzy, c-format
msgid "Couldn't exec pgp (%s)\n"
msgstr "Konnte pgp nicht durchführen"
-#: lib/signature.c:294
+#: lib/signature.c:295
#, fuzzy
msgid "pgp failed\n"
msgstr "pgp fehlgeschlagen"
#. PGP failed to write signature
#. Just in case
-#: lib/signature.c:301
+#: lib/signature.c:302
#, fuzzy
msgid "pgp failed to write signature\n"
msgstr "pgp fehlgeschlagen beim Schreiben der Signatur"
-#: lib/signature.c:306
+#: lib/signature.c:307
#, c-format
msgid "PGP sig size: %d\n"
msgstr ""
-#: lib/signature.c:321 lib/signature.c:408
+#: lib/signature.c:322 lib/signature.c:409
#, fuzzy
msgid "unable to read the signature\n"
msgstr "nicht möglich, die Signatur zu lesen"
-#: lib/signature.c:326
+#: lib/signature.c:327
#, c-format
msgid "Got %d bytes of PGP sig\n"
msgstr ""
-#: lib/signature.c:368 lib/signature.c:498
+#: lib/signature.c:369 lib/signature.c:499
#, fuzzy
msgid "Couldn't exec gpg\n"
msgstr "Konnte pgp nicht durchführen"
-#: lib/signature.c:381
+#: lib/signature.c:382
#, fuzzy
msgid "gpg failed\n"
msgstr "pgp fehlgeschlagen"
#. GPG failed to write signature
#. Just in case
-#: lib/signature.c:388
+#: lib/signature.c:389
#, fuzzy
msgid "gpg failed to write signature\n"
msgstr "pgp fehlgeschlagen beim Schreiben der Signatur"
-#: lib/signature.c:393
+#: lib/signature.c:394
#, c-format
msgid "GPG sig size: %d\n"
msgstr ""
-#: lib/signature.c:413
+#: lib/signature.c:414
#, c-format
msgid "Got %d bytes of GPG sig\n"
msgstr ""
-#: lib/signature.c:441
+#: lib/signature.c:442
#, fuzzy
msgid "Generating signature using PGP.\n"
msgstr "PGP-Signatur generieren"
-#: lib/signature.c:447
+#: lib/signature.c:448
#, fuzzy
msgid "Generating signature using GPG.\n"
msgstr "PGP-Signatur generieren"
-#: lib/signature.c:527
+#: lib/signature.c:528
#, fuzzy
msgid "Couldn't exec pgp\n"
msgstr "Konnte pgp nicht durchführen"
#. @notreached@
#. This case should have been screened out long ago.
-#: lib/signature.c:531 lib/signature.c:584
+#: lib/signature.c:532 lib/signature.c:585
#, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr ""
-#: lib/signature.c:564
+#: lib/signature.c:565
#, fuzzy, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr "\"pgp_name:\" muss in der rpmrc-Datei gesetzt sein"
-#: lib/signature.c:576
+#: lib/signature.c:577
#, fuzzy, c-format
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr "\"pgp_name:\" muss in der rpmrc-Datei gesetzt sein"
@@ -4183,68 +4183,68 @@ msgstr "Öffnen von %s fehlgeschlagen: %s"
msgid "File %s is smaller than %u bytes\n"
msgstr ""
-#: rpmio/rpmio.c:644
+#: rpmio/rpmio.c:656
msgid "Success"
msgstr ""
-#: rpmio/rpmio.c:647
+#: rpmio/rpmio.c:659
#, fuzzy
msgid "Bad server response"
msgstr "Nicht passende Antwort des FTP-Servers"
-#: rpmio/rpmio.c:650
+#: rpmio/rpmio.c:662
#, fuzzy
msgid "Server I/O error"
msgstr "FTP IO-Fehler"
-#: rpmio/rpmio.c:653
+#: rpmio/rpmio.c:665
#, fuzzy
msgid "Server timeout"
msgstr "Timeout des FTP-Servers"
-#: rpmio/rpmio.c:656
+#: rpmio/rpmio.c:668
#, fuzzy
msgid "Unable to lookup server host address"
msgstr "Unmöglich die Hostadresse des FTP-Servers zu bestimmen"
-#: rpmio/rpmio.c:659
+#: rpmio/rpmio.c:671
#, fuzzy
msgid "Unable to lookup server host name"
msgstr "Unmöglich den Hostnamen des FTP-Servers zu bestimmen"
-#: rpmio/rpmio.c:662
+#: rpmio/rpmio.c:674
#, fuzzy
msgid "Failed to connect to server"
msgstr "Verbindung zum FTP-Server fehlgeschlagen"
-#: rpmio/rpmio.c:665
+#: rpmio/rpmio.c:677
#, fuzzy
msgid "Failed to establish data connection to server"
msgstr "Aufbau einer Datenverbindung zum FTP-Server fehlgeschlagen"
-#: rpmio/rpmio.c:668
+#: rpmio/rpmio.c:680
#, fuzzy
msgid "I/O error to local file"
msgstr "IO-Fehler bei lokaler Datei"
-#: rpmio/rpmio.c:671
+#: rpmio/rpmio.c:683
msgid "Error setting remote server to passive mode"
msgstr "Fehler beim Setzen des FTP-Servers in den passiven Modus"
-#: rpmio/rpmio.c:674
+#: rpmio/rpmio.c:686
msgid "File not found on server"
msgstr "Datei auf dem Server nicht gefunden"
-#: rpmio/rpmio.c:677
+#: rpmio/rpmio.c:689
msgid "Abort in progress"
msgstr ""
-#: rpmio/rpmio.c:681
+#: rpmio/rpmio.c:693
#, fuzzy
msgid "Unknown or unexpected error"
msgstr "FTP Unbekannter oder nicht erwarteter Fehler"
-#: rpmio/rpmio.c:1353
+#: rpmio/rpmio.c:1365
#, c-format
msgid "logging into %s as %s, pw %s\n"
msgstr ""
diff --git a/po/en_RN.po b/po/en_RN.po
index bd7c3685f..c17a7f548 100644
--- a/po/en_RN.po
+++ b/po/en_RN.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-19 15:08-0400\n"
+"POT-Creation-Date: 2001-10-20 16:18-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"
@@ -2172,12 +2172,12 @@ msgstr ""
msgid "========== continuing tsort ...\n"
msgstr ""
-#: lib/formats.c:28 lib/formats.c:54 lib/formats.c:85 lib/formats.c:160
-#: lib/header.c:2902 lib/header.c:2923 lib/header.c:2945
+#: lib/formats.c:33 lib/formats.c:57 lib/formats.c:88 lib/formats.c:261
+#: lib/header.c:2929 lib/header.c:2950 lib/header.c:2972
msgid "(not a number)"
msgstr ""
-#: lib/formats.c:128
+#: lib/formats.c:129 lib/formats.c:191 lib/formats.c:236
msgid "(not a blob)"
msgstr ""
@@ -2337,7 +2337,7 @@ msgstr ""
msgid "| expected at end of expression"
msgstr ""
-#: lib/header.c:2646
+#: lib/header.c:2673
msgid "(unknown type)"
msgstr ""
@@ -3027,86 +3027,86 @@ msgstr ""
msgid "package %s is not installed\n"
msgstr ""
-#: lib/rpmchecksig.c:46
+#: lib/rpmchecksig.c:47
#, c-format
msgid "%s: open failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:58
+#: lib/rpmchecksig.c:59
msgid "makeTempFile failed\n"
msgstr ""
-#: lib/rpmchecksig.c:100
+#: lib/rpmchecksig.c:101
#, c-format
msgid "%s: Fwrite failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:106 lib/rpmchecksig.c:313
+#: lib/rpmchecksig.c:107 lib/rpmchecksig.c:326
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:143 lib/rpmchecksig.c:368
+#: lib/rpmchecksig.c:144 lib/rpmchecksig.c:401
#, c-format
msgid "%s: readLead failed\n"
msgstr ""
-#: lib/rpmchecksig.c:148
+#: lib/rpmchecksig.c:149
#, c-format
msgid "%s: Can't sign v1.0 RPM\n"
msgstr ""
-#: lib/rpmchecksig.c:152
+#: lib/rpmchecksig.c:153
#, c-format
msgid "%s: Can't re-sign v2.0 RPM\n"
msgstr ""
-#: lib/rpmchecksig.c:161 lib/rpmchecksig.c:384
+#: lib/rpmchecksig.c:162 lib/rpmchecksig.c:417
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/rpmchecksig.c:165 lib/rpmchecksig.c:389
+#: lib/rpmchecksig.c:166 lib/rpmchecksig.c:422
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/rpmchecksig.c:198
+#: lib/rpmchecksig.c:199
#, c-format
msgid "%s: writeLead failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:204
+#: lib/rpmchecksig.c:205
#, c-format
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:374
+#: lib/rpmchecksig.c:407
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr ""
-#: lib/rpmchecksig.c:604
+#: lib/rpmchecksig.c:649
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:605 lib/rpmchecksig.c:619
+#: lib/rpmchecksig.c:650 lib/rpmchecksig.c:664
msgid " (MISSING KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:607 lib/rpmchecksig.c:621
+#: lib/rpmchecksig.c:652 lib/rpmchecksig.c:666
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:608 lib/rpmchecksig.c:622
+#: lib/rpmchecksig.c:653 lib/rpmchecksig.c:667
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:610 lib/rpmchecksig.c:624
+#: lib/rpmchecksig.c:655 lib/rpmchecksig.c:669
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:618
+#: lib/rpmchecksig.c:663
msgid "OK"
msgstr ""
@@ -3302,115 +3302,115 @@ msgstr ""
msgid "Unable to open %s for reading: %s.\n"
msgstr ""
-#: lib/signature.c:111
+#: lib/signature.c:112
msgid "file is not regular -- skipping size check\n"
msgstr ""
-#: lib/signature.c:120
+#: lib/signature.c:121
#, c-format
msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
msgstr ""
-#: lib/signature.c:125
+#: lib/signature.c:126
#, c-format
msgid " Actual size: %12d\n"
msgstr ""
-#: lib/signature.c:145
+#: lib/signature.c:146
msgid "No signature\n"
msgstr ""
-#: lib/signature.c:149
+#: lib/signature.c:150
msgid "Old PGP signature\n"
msgstr ""
-#: lib/signature.c:162
+#: lib/signature.c:163
msgid "Old (internal-only) signature! How did you get that!?\n"
msgstr ""
-#: lib/signature.c:218
+#: lib/signature.c:219
#, c-format
msgid "Signature: size(%d)+pad(%d)\n"
msgstr ""
-#: lib/signature.c:281
+#: lib/signature.c:282
#, c-format
msgid "Couldn't exec pgp (%s)\n"
msgstr ""
-#: lib/signature.c:294
+#: lib/signature.c:295
msgid "pgp failed\n"
msgstr ""
#. PGP failed to write signature
#. Just in case
-#: lib/signature.c:301
+#: lib/signature.c:302
msgid "pgp failed to write signature\n"
msgstr ""
-#: lib/signature.c:306
+#: lib/signature.c:307
#, c-format
msgid "PGP sig size: %d\n"
msgstr ""
-#: lib/signature.c:321 lib/signature.c:408
+#: lib/signature.c:322 lib/signature.c:409
msgid "unable to read the signature\n"
msgstr ""
-#: lib/signature.c:326
+#: lib/signature.c:327
#, c-format
msgid "Got %d bytes of PGP sig\n"
msgstr ""
-#: lib/signature.c:368 lib/signature.c:498
+#: lib/signature.c:369 lib/signature.c:499
msgid "Couldn't exec gpg\n"
msgstr ""
-#: lib/signature.c:381
+#: lib/signature.c:382
msgid "gpg failed\n"
msgstr ""
#. GPG failed to write signature
#. Just in case
-#: lib/signature.c:388
+#: lib/signature.c:389
msgid "gpg failed to write signature\n"
msgstr ""
-#: lib/signature.c:393
+#: lib/signature.c:394
#, c-format
msgid "GPG sig size: %d\n"
msgstr ""
-#: lib/signature.c:413
+#: lib/signature.c:414
#, c-format
msgid "Got %d bytes of GPG sig\n"
msgstr ""
-#: lib/signature.c:441
+#: lib/signature.c:442
msgid "Generating signature using PGP.\n"
msgstr ""
-#: lib/signature.c:447
+#: lib/signature.c:448
msgid "Generating signature using GPG.\n"
msgstr ""
-#: lib/signature.c:527
+#: lib/signature.c:528
msgid "Couldn't exec pgp\n"
msgstr ""
#. @notreached@
#. This case should have been screened out long ago.
-#: lib/signature.c:531 lib/signature.c:584
+#: lib/signature.c:532 lib/signature.c:585
#, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr ""
-#: lib/signature.c:564
+#: lib/signature.c:565
#, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr ""
-#: lib/signature.c:576
+#: lib/signature.c:577
#, c-format
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr ""
@@ -3832,59 +3832,59 @@ msgstr ""
msgid "File %s is smaller than %u bytes\n"
msgstr ""
-#: rpmio/rpmio.c:644
+#: rpmio/rpmio.c:656
msgid "Success"
msgstr ""
-#: rpmio/rpmio.c:647
+#: rpmio/rpmio.c:659
msgid "Bad server response"
msgstr ""
-#: rpmio/rpmio.c:650
+#: rpmio/rpmio.c:662
msgid "Server I/O error"
msgstr ""
-#: rpmio/rpmio.c:653
+#: rpmio/rpmio.c:665
msgid "Server timeout"
msgstr ""
-#: rpmio/rpmio.c:656
+#: rpmio/rpmio.c:668
msgid "Unable to lookup server host address"
msgstr ""
-#: rpmio/rpmio.c:659
+#: rpmio/rpmio.c:671
msgid "Unable to lookup server host name"
msgstr ""
-#: rpmio/rpmio.c:662
+#: rpmio/rpmio.c:674
msgid "Failed to connect to server"
msgstr ""
-#: rpmio/rpmio.c:665
+#: rpmio/rpmio.c:677
msgid "Failed to establish data connection to server"
msgstr ""
-#: rpmio/rpmio.c:668
+#: rpmio/rpmio.c:680
msgid "I/O error to local file"
msgstr ""
-#: rpmio/rpmio.c:671
+#: rpmio/rpmio.c:683
msgid "Error setting remote server to passive mode"
msgstr ""
-#: rpmio/rpmio.c:674
+#: rpmio/rpmio.c:686
msgid "File not found on server"
msgstr ""
-#: rpmio/rpmio.c:677
+#: rpmio/rpmio.c:689
msgid "Abort in progress"
msgstr ""
-#: rpmio/rpmio.c:681
+#: rpmio/rpmio.c:693
msgid "Unknown or unexpected error"
msgstr ""
-#: rpmio/rpmio.c:1353
+#: rpmio/rpmio.c:1365
#, c-format
msgid "logging into %s as %s, pw %s\n"
msgstr ""
diff --git a/po/es.po b/po/es.po
index bd7c3685f..c17a7f548 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-19 15:08-0400\n"
+"POT-Creation-Date: 2001-10-20 16:18-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"
@@ -2172,12 +2172,12 @@ msgstr ""
msgid "========== continuing tsort ...\n"
msgstr ""
-#: lib/formats.c:28 lib/formats.c:54 lib/formats.c:85 lib/formats.c:160
-#: lib/header.c:2902 lib/header.c:2923 lib/header.c:2945
+#: lib/formats.c:33 lib/formats.c:57 lib/formats.c:88 lib/formats.c:261
+#: lib/header.c:2929 lib/header.c:2950 lib/header.c:2972
msgid "(not a number)"
msgstr ""
-#: lib/formats.c:128
+#: lib/formats.c:129 lib/formats.c:191 lib/formats.c:236
msgid "(not a blob)"
msgstr ""
@@ -2337,7 +2337,7 @@ msgstr ""
msgid "| expected at end of expression"
msgstr ""
-#: lib/header.c:2646
+#: lib/header.c:2673
msgid "(unknown type)"
msgstr ""
@@ -3027,86 +3027,86 @@ msgstr ""
msgid "package %s is not installed\n"
msgstr ""
-#: lib/rpmchecksig.c:46
+#: lib/rpmchecksig.c:47
#, c-format
msgid "%s: open failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:58
+#: lib/rpmchecksig.c:59
msgid "makeTempFile failed\n"
msgstr ""
-#: lib/rpmchecksig.c:100
+#: lib/rpmchecksig.c:101
#, c-format
msgid "%s: Fwrite failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:106 lib/rpmchecksig.c:313
+#: lib/rpmchecksig.c:107 lib/rpmchecksig.c:326
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:143 lib/rpmchecksig.c:368
+#: lib/rpmchecksig.c:144 lib/rpmchecksig.c:401
#, c-format
msgid "%s: readLead failed\n"
msgstr ""
-#: lib/rpmchecksig.c:148
+#: lib/rpmchecksig.c:149
#, c-format
msgid "%s: Can't sign v1.0 RPM\n"
msgstr ""
-#: lib/rpmchecksig.c:152
+#: lib/rpmchecksig.c:153
#, c-format
msgid "%s: Can't re-sign v2.0 RPM\n"
msgstr ""
-#: lib/rpmchecksig.c:161 lib/rpmchecksig.c:384
+#: lib/rpmchecksig.c:162 lib/rpmchecksig.c:417
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/rpmchecksig.c:165 lib/rpmchecksig.c:389
+#: lib/rpmchecksig.c:166 lib/rpmchecksig.c:422
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/rpmchecksig.c:198
+#: lib/rpmchecksig.c:199
#, c-format
msgid "%s: writeLead failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:204
+#: lib/rpmchecksig.c:205
#, c-format
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:374
+#: lib/rpmchecksig.c:407
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr ""
-#: lib/rpmchecksig.c:604
+#: lib/rpmchecksig.c:649
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:605 lib/rpmchecksig.c:619
+#: lib/rpmchecksig.c:650 lib/rpmchecksig.c:664
msgid " (MISSING KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:607 lib/rpmchecksig.c:621
+#: lib/rpmchecksig.c:652 lib/rpmchecksig.c:666
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:608 lib/rpmchecksig.c:622
+#: lib/rpmchecksig.c:653 lib/rpmchecksig.c:667
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:610 lib/rpmchecksig.c:624
+#: lib/rpmchecksig.c:655 lib/rpmchecksig.c:669
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:618
+#: lib/rpmchecksig.c:663
msgid "OK"
msgstr ""
@@ -3302,115 +3302,115 @@ msgstr ""
msgid "Unable to open %s for reading: %s.\n"
msgstr ""
-#: lib/signature.c:111
+#: lib/signature.c:112
msgid "file is not regular -- skipping size check\n"
msgstr ""
-#: lib/signature.c:120
+#: lib/signature.c:121
#, c-format
msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
msgstr ""
-#: lib/signature.c:125
+#: lib/signature.c:126
#, c-format
msgid " Actual size: %12d\n"
msgstr ""
-#: lib/signature.c:145
+#: lib/signature.c:146
msgid "No signature\n"
msgstr ""
-#: lib/signature.c:149
+#: lib/signature.c:150
msgid "Old PGP signature\n"
msgstr ""
-#: lib/signature.c:162
+#: lib/signature.c:163
msgid "Old (internal-only) signature! How did you get that!?\n"
msgstr ""
-#: lib/signature.c:218
+#: lib/signature.c:219
#, c-format
msgid "Signature: size(%d)+pad(%d)\n"
msgstr ""
-#: lib/signature.c:281
+#: lib/signature.c:282
#, c-format
msgid "Couldn't exec pgp (%s)\n"
msgstr ""
-#: lib/signature.c:294
+#: lib/signature.c:295
msgid "pgp failed\n"
msgstr ""
#. PGP failed to write signature
#. Just in case
-#: lib/signature.c:301
+#: lib/signature.c:302
msgid "pgp failed to write signature\n"
msgstr ""
-#: lib/signature.c:306
+#: lib/signature.c:307
#, c-format
msgid "PGP sig size: %d\n"
msgstr ""
-#: lib/signature.c:321 lib/signature.c:408
+#: lib/signature.c:322 lib/signature.c:409
msgid "unable to read the signature\n"
msgstr ""
-#: lib/signature.c:326
+#: lib/signature.c:327
#, c-format
msgid "Got %d bytes of PGP sig\n"
msgstr ""
-#: lib/signature.c:368 lib/signature.c:498
+#: lib/signature.c:369 lib/signature.c:499
msgid "Couldn't exec gpg\n"
msgstr ""
-#: lib/signature.c:381
+#: lib/signature.c:382
msgid "gpg failed\n"
msgstr ""
#. GPG failed to write signature
#. Just in case
-#: lib/signature.c:388
+#: lib/signature.c:389
msgid "gpg failed to write signature\n"
msgstr ""
-#: lib/signature.c:393
+#: lib/signature.c:394
#, c-format
msgid "GPG sig size: %d\n"
msgstr ""
-#: lib/signature.c:413
+#: lib/signature.c:414
#, c-format
msgid "Got %d bytes of GPG sig\n"
msgstr ""
-#: lib/signature.c:441
+#: lib/signature.c:442
msgid "Generating signature using PGP.\n"
msgstr ""
-#: lib/signature.c:447
+#: lib/signature.c:448
msgid "Generating signature using GPG.\n"
msgstr ""
-#: lib/signature.c:527
+#: lib/signature.c:528
msgid "Couldn't exec pgp\n"
msgstr ""
#. @notreached@
#. This case should have been screened out long ago.
-#: lib/signature.c:531 lib/signature.c:584
+#: lib/signature.c:532 lib/signature.c:585
#, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr ""
-#: lib/signature.c:564
+#: lib/signature.c:565
#, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr ""
-#: lib/signature.c:576
+#: lib/signature.c:577
#, c-format
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr ""
@@ -3832,59 +3832,59 @@ msgstr ""
msgid "File %s is smaller than %u bytes\n"
msgstr ""
-#: rpmio/rpmio.c:644
+#: rpmio/rpmio.c:656
msgid "Success"
msgstr ""
-#: rpmio/rpmio.c:647
+#: rpmio/rpmio.c:659
msgid "Bad server response"
msgstr ""
-#: rpmio/rpmio.c:650
+#: rpmio/rpmio.c:662
msgid "Server I/O error"
msgstr ""
-#: rpmio/rpmio.c:653
+#: rpmio/rpmio.c:665
msgid "Server timeout"
msgstr ""
-#: rpmio/rpmio.c:656
+#: rpmio/rpmio.c:668
msgid "Unable to lookup server host address"
msgstr ""
-#: rpmio/rpmio.c:659
+#: rpmio/rpmio.c:671
msgid "Unable to lookup server host name"
msgstr ""
-#: rpmio/rpmio.c:662
+#: rpmio/rpmio.c:674
msgid "Failed to connect to server"
msgstr ""
-#: rpmio/rpmio.c:665
+#: rpmio/rpmio.c:677
msgid "Failed to establish data connection to server"
msgstr ""
-#: rpmio/rpmio.c:668
+#: rpmio/rpmio.c:680
msgid "I/O error to local file"
msgstr ""
-#: rpmio/rpmio.c:671
+#: rpmio/rpmio.c:683
msgid "Error setting remote server to passive mode"
msgstr ""
-#: rpmio/rpmio.c:674
+#: rpmio/rpmio.c:686
msgid "File not found on server"
msgstr ""
-#: rpmio/rpmio.c:677
+#: rpmio/rpmio.c:689
msgid "Abort in progress"
msgstr ""
-#: rpmio/rpmio.c:681
+#: rpmio/rpmio.c:693
msgid "Unknown or unexpected error"
msgstr ""
-#: rpmio/rpmio.c:1353
+#: rpmio/rpmio.c:1365
#, c-format
msgid "logging into %s as %s, pw %s\n"
msgstr ""
diff --git a/po/eu_ES.po b/po/eu_ES.po
index bd7c3685f..c17a7f548 100644
--- a/po/eu_ES.po
+++ b/po/eu_ES.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-19 15:08-0400\n"
+"POT-Creation-Date: 2001-10-20 16:18-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"
@@ -2172,12 +2172,12 @@ msgstr ""
msgid "========== continuing tsort ...\n"
msgstr ""
-#: lib/formats.c:28 lib/formats.c:54 lib/formats.c:85 lib/formats.c:160
-#: lib/header.c:2902 lib/header.c:2923 lib/header.c:2945
+#: lib/formats.c:33 lib/formats.c:57 lib/formats.c:88 lib/formats.c:261
+#: lib/header.c:2929 lib/header.c:2950 lib/header.c:2972
msgid "(not a number)"
msgstr ""
-#: lib/formats.c:128
+#: lib/formats.c:129 lib/formats.c:191 lib/formats.c:236
msgid "(not a blob)"
msgstr ""
@@ -2337,7 +2337,7 @@ msgstr ""
msgid "| expected at end of expression"
msgstr ""
-#: lib/header.c:2646
+#: lib/header.c:2673
msgid "(unknown type)"
msgstr ""
@@ -3027,86 +3027,86 @@ msgstr ""
msgid "package %s is not installed\n"
msgstr ""
-#: lib/rpmchecksig.c:46
+#: lib/rpmchecksig.c:47
#, c-format
msgid "%s: open failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:58
+#: lib/rpmchecksig.c:59
msgid "makeTempFile failed\n"
msgstr ""
-#: lib/rpmchecksig.c:100
+#: lib/rpmchecksig.c:101
#, c-format
msgid "%s: Fwrite failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:106 lib/rpmchecksig.c:313
+#: lib/rpmchecksig.c:107 lib/rpmchecksig.c:326
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:143 lib/rpmchecksig.c:368
+#: lib/rpmchecksig.c:144 lib/rpmchecksig.c:401
#, c-format
msgid "%s: readLead failed\n"
msgstr ""
-#: lib/rpmchecksig.c:148
+#: lib/rpmchecksig.c:149
#, c-format
msgid "%s: Can't sign v1.0 RPM\n"
msgstr ""
-#: lib/rpmchecksig.c:152
+#: lib/rpmchecksig.c:153
#, c-format
msgid "%s: Can't re-sign v2.0 RPM\n"
msgstr ""
-#: lib/rpmchecksig.c:161 lib/rpmchecksig.c:384
+#: lib/rpmchecksig.c:162 lib/rpmchecksig.c:417
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/rpmchecksig.c:165 lib/rpmchecksig.c:389
+#: lib/rpmchecksig.c:166 lib/rpmchecksig.c:422
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/rpmchecksig.c:198
+#: lib/rpmchecksig.c:199
#, c-format
msgid "%s: writeLead failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:204
+#: lib/rpmchecksig.c:205
#, c-format
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:374
+#: lib/rpmchecksig.c:407
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr ""
-#: lib/rpmchecksig.c:604
+#: lib/rpmchecksig.c:649
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:605 lib/rpmchecksig.c:619
+#: lib/rpmchecksig.c:650 lib/rpmchecksig.c:664
msgid " (MISSING KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:607 lib/rpmchecksig.c:621
+#: lib/rpmchecksig.c:652 lib/rpmchecksig.c:666
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:608 lib/rpmchecksig.c:622
+#: lib/rpmchecksig.c:653 lib/rpmchecksig.c:667
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:610 lib/rpmchecksig.c:624
+#: lib/rpmchecksig.c:655 lib/rpmchecksig.c:669
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:618
+#: lib/rpmchecksig.c:663
msgid "OK"
msgstr ""
@@ -3302,115 +3302,115 @@ msgstr ""
msgid "Unable to open %s for reading: %s.\n"
msgstr ""
-#: lib/signature.c:111
+#: lib/signature.c:112
msgid "file is not regular -- skipping size check\n"
msgstr ""
-#: lib/signature.c:120
+#: lib/signature.c:121
#, c-format
msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
msgstr ""
-#: lib/signature.c:125
+#: lib/signature.c:126
#, c-format
msgid " Actual size: %12d\n"
msgstr ""
-#: lib/signature.c:145
+#: lib/signature.c:146
msgid "No signature\n"
msgstr ""
-#: lib/signature.c:149
+#: lib/signature.c:150
msgid "Old PGP signature\n"
msgstr ""
-#: lib/signature.c:162
+#: lib/signature.c:163
msgid "Old (internal-only) signature! How did you get that!?\n"
msgstr ""
-#: lib/signature.c:218
+#: lib/signature.c:219
#, c-format
msgid "Signature: size(%d)+pad(%d)\n"
msgstr ""
-#: lib/signature.c:281
+#: lib/signature.c:282
#, c-format
msgid "Couldn't exec pgp (%s)\n"
msgstr ""
-#: lib/signature.c:294
+#: lib/signature.c:295
msgid "pgp failed\n"
msgstr ""
#. PGP failed to write signature
#. Just in case
-#: lib/signature.c:301
+#: lib/signature.c:302
msgid "pgp failed to write signature\n"
msgstr ""
-#: lib/signature.c:306
+#: lib/signature.c:307
#, c-format
msgid "PGP sig size: %d\n"
msgstr ""
-#: lib/signature.c:321 lib/signature.c:408
+#: lib/signature.c:322 lib/signature.c:409
msgid "unable to read the signature\n"
msgstr ""
-#: lib/signature.c:326
+#: lib/signature.c:327
#, c-format
msgid "Got %d bytes of PGP sig\n"
msgstr ""
-#: lib/signature.c:368 lib/signature.c:498
+#: lib/signature.c:369 lib/signature.c:499
msgid "Couldn't exec gpg\n"
msgstr ""
-#: lib/signature.c:381
+#: lib/signature.c:382
msgid "gpg failed\n"
msgstr ""
#. GPG failed to write signature
#. Just in case
-#: lib/signature.c:388
+#: lib/signature.c:389
msgid "gpg failed to write signature\n"
msgstr ""
-#: lib/signature.c:393
+#: lib/signature.c:394
#, c-format
msgid "GPG sig size: %d\n"
msgstr ""
-#: lib/signature.c:413
+#: lib/signature.c:414
#, c-format
msgid "Got %d bytes of GPG sig\n"
msgstr ""
-#: lib/signature.c:441
+#: lib/signature.c:442
msgid "Generating signature using PGP.\n"
msgstr ""
-#: lib/signature.c:447
+#: lib/signature.c:448
msgid "Generating signature using GPG.\n"
msgstr ""
-#: lib/signature.c:527
+#: lib/signature.c:528
msgid "Couldn't exec pgp\n"
msgstr ""
#. @notreached@
#. This case should have been screened out long ago.
-#: lib/signature.c:531 lib/signature.c:584
+#: lib/signature.c:532 lib/signature.c:585
#, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr ""
-#: lib/signature.c:564
+#: lib/signature.c:565
#, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr ""
-#: lib/signature.c:576
+#: lib/signature.c:577
#, c-format
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr ""
@@ -3832,59 +3832,59 @@ msgstr ""
msgid "File %s is smaller than %u bytes\n"
msgstr ""
-#: rpmio/rpmio.c:644
+#: rpmio/rpmio.c:656
msgid "Success"
msgstr ""
-#: rpmio/rpmio.c:647
+#: rpmio/rpmio.c:659
msgid "Bad server response"
msgstr ""
-#: rpmio/rpmio.c:650
+#: rpmio/rpmio.c:662
msgid "Server I/O error"
msgstr ""
-#: rpmio/rpmio.c:653
+#: rpmio/rpmio.c:665
msgid "Server timeout"
msgstr ""
-#: rpmio/rpmio.c:656
+#: rpmio/rpmio.c:668
msgid "Unable to lookup server host address"
msgstr ""
-#: rpmio/rpmio.c:659
+#: rpmio/rpmio.c:671
msgid "Unable to lookup server host name"
msgstr ""
-#: rpmio/rpmio.c:662
+#: rpmio/rpmio.c:674
msgid "Failed to connect to server"
msgstr ""
-#: rpmio/rpmio.c:665
+#: rpmio/rpmio.c:677
msgid "Failed to establish data connection to server"
msgstr ""
-#: rpmio/rpmio.c:668
+#: rpmio/rpmio.c:680
msgid "I/O error to local file"
msgstr ""
-#: rpmio/rpmio.c:671
+#: rpmio/rpmio.c:683
msgid "Error setting remote server to passive mode"
msgstr ""
-#: rpmio/rpmio.c:674
+#: rpmio/rpmio.c:686
msgid "File not found on server"
msgstr ""
-#: rpmio/rpmio.c:677
+#: rpmio/rpmio.c:689
msgid "Abort in progress"
msgstr ""
-#: rpmio/rpmio.c:681
+#: rpmio/rpmio.c:693
msgid "Unknown or unexpected error"
msgstr ""
-#: rpmio/rpmio.c:1353
+#: rpmio/rpmio.c:1365
#, c-format
msgid "logging into %s as %s, pw %s\n"
msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 7b0d29141..41d35f4e2 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-19 15:08-0400\n"
+"POT-Creation-Date: 2001-10-20 16:18-0400\n"
"Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
"Language-Team: Finnish <linux@sot.com>\n"
"Content-Type: text/plain; charset=\n"
@@ -2271,12 +2271,12 @@ msgstr ""
msgid "========== continuing tsort ...\n"
msgstr ""
-#: lib/formats.c:28 lib/formats.c:54 lib/formats.c:85 lib/formats.c:160
-#: lib/header.c:2902 lib/header.c:2923 lib/header.c:2945
+#: lib/formats.c:33 lib/formats.c:57 lib/formats.c:88 lib/formats.c:261
+#: lib/header.c:2929 lib/header.c:2950 lib/header.c:2972
msgid "(not a number)"
msgstr "(ei ole luku)"
-#: lib/formats.c:128
+#: lib/formats.c:129 lib/formats.c:191 lib/formats.c:236
#, fuzzy
msgid "(not a blob)"
msgstr "(ei ole luku)"
@@ -2439,7 +2439,7 @@ msgstr "odotin '{' ':'-merkin jälkeen ilmauksessa "
msgid "| expected at end of expression"
msgstr "odotin '}'-merkkiä ilmauksen lopussa"
-#: lib/header.c:2646
+#: lib/header.c:2673
msgid "(unknown type)"
msgstr "(tuntematon tyyppi)"
@@ -3187,88 +3187,88 @@ msgstr "tietuetta %d ei voitu lukea\n"
msgid "package %s is not installed\n"
msgstr "paketti %s ei ole asennettu\n"
-#: lib/rpmchecksig.c:46
+#: lib/rpmchecksig.c:47
#, fuzzy, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: avaus ei onnistunut\n"
-#: lib/rpmchecksig.c:58
+#: lib/rpmchecksig.c:59
#, fuzzy
msgid "makeTempFile failed\n"
msgstr "%s: avaus ei onnistunut\n"
-#: lib/rpmchecksig.c:100
+#: lib/rpmchecksig.c:101
#, fuzzy, c-format
msgid "%s: Fwrite failed: %s\n"
msgstr "%s: readLead epäonnistui\n"
-#: lib/rpmchecksig.c:106 lib/rpmchecksig.c:313
+#: lib/rpmchecksig.c:107 lib/rpmchecksig.c:326
#, fuzzy, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: readLead epäonnistui\n"
-#: lib/rpmchecksig.c:143 lib/rpmchecksig.c:368
+#: lib/rpmchecksig.c:144 lib/rpmchecksig.c:401
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: readLead epäonnistui\n"
-#: lib/rpmchecksig.c:148
+#: lib/rpmchecksig.c:149
#, c-format
msgid "%s: Can't sign v1.0 RPM\n"
msgstr "%s: En voi allekirjoittaa v1.0 RPM:ää\n"
-#: lib/rpmchecksig.c:152
+#: lib/rpmchecksig.c:153
#, c-format
msgid "%s: Can't re-sign v2.0 RPM\n"
msgstr "%s: En voi uudelleen allekirjoittaa v2.0 RPM:ää\n"
-#: lib/rpmchecksig.c:161 lib/rpmchecksig.c:384
+#: lib/rpmchecksig.c:162 lib/rpmchecksig.c:417
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: rpmReadSignature epäonnistui\n"
-#: lib/rpmchecksig.c:165 lib/rpmchecksig.c:389
+#: lib/rpmchecksig.c:166 lib/rpmchecksig.c:422
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Ei allekirjoitusta saatavilla\n"
-#: lib/rpmchecksig.c:198
+#: lib/rpmchecksig.c:199
#, fuzzy, c-format
msgid "%s: writeLead failed: %s\n"
msgstr "%s: readLead epäonnistui\n"
-#: lib/rpmchecksig.c:204
+#: lib/rpmchecksig.c:205
#, fuzzy, c-format
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: rpmReadSignature epäonnistui\n"
-#: lib/rpmchecksig.c:374
+#: lib/rpmchecksig.c:407
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr "%s: Ei allekirjoitusta saatavilla (v1.0 RPM)\n"
-#: lib/rpmchecksig.c:604
+#: lib/rpmchecksig.c:649
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:605 lib/rpmchecksig.c:619
+#: lib/rpmchecksig.c:650 lib/rpmchecksig.c:664
#, fuzzy
msgid " (MISSING KEYS:"
msgstr "(PUUTTUVAT AVAIMET)"
-#: lib/rpmchecksig.c:607 lib/rpmchecksig.c:621
+#: lib/rpmchecksig.c:652 lib/rpmchecksig.c:666
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:608 lib/rpmchecksig.c:622
+#: lib/rpmchecksig.c:653 lib/rpmchecksig.c:667
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:610 lib/rpmchecksig.c:624
+#: lib/rpmchecksig.c:655 lib/rpmchecksig.c:669
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:618
+#: lib/rpmchecksig.c:663
msgid "OK"
msgstr ""
@@ -3466,127 +3466,127 @@ msgstr ""
msgid "Unable to open %s for reading: %s.\n"
msgstr "En voi avata %s luettavaksi: %s."
-#: lib/signature.c:111
+#: lib/signature.c:112
msgid "file is not regular -- skipping size check\n"
msgstr ""
-#: lib/signature.c:120
+#: lib/signature.c:121
#, c-format
msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
msgstr ""
-#: lib/signature.c:125
+#: lib/signature.c:126
#, c-format
msgid " Actual size: %12d\n"
msgstr ""
-#: lib/signature.c:145
+#: lib/signature.c:146
#, fuzzy
msgid "No signature\n"
msgstr "%s: Ei allekirjoitusta saatavilla\n"
-#: lib/signature.c:149
+#: lib/signature.c:150
#, fuzzy
msgid "Old PGP signature\n"
msgstr "generoi PGP-allekirjoitus"
-#: lib/signature.c:162
+#: lib/signature.c:163
#, fuzzy
msgid "Old (internal-only) signature! How did you get that!?\n"
msgstr "Vanha (sisäisen käytön) allekirjoitus! Mistä sait sen!?"
-#: lib/signature.c:218
+#: lib/signature.c:219
#, c-format
msgid "Signature: size(%d)+pad(%d)\n"
msgstr ""
-#: lib/signature.c:281
+#: lib/signature.c:282
#, fuzzy, c-format
msgid "Couldn't exec pgp (%s)\n"
msgstr "En voinut ajaa pgp:tä"
-#: lib/signature.c:294
+#: lib/signature.c:295
#, fuzzy
msgid "pgp failed\n"
msgstr "pgp epäonnistui"
#. PGP failed to write signature
#. Just in case
-#: lib/signature.c:301
+#: lib/signature.c:302
#, fuzzy
msgid "pgp failed to write signature\n"
msgstr "pgp ei voinut kirjoittaa allekirjoitusta"
-#: lib/signature.c:306
+#: lib/signature.c:307
#, c-format
msgid "PGP sig size: %d\n"
msgstr ""
-#: lib/signature.c:321 lib/signature.c:408
+#: lib/signature.c:322 lib/signature.c:409
#, fuzzy
msgid "unable to read the signature\n"
msgstr "en voinut lukea allekirjoitusta"
-#: lib/signature.c:326
+#: lib/signature.c:327
#, c-format
msgid "Got %d bytes of PGP sig\n"
msgstr ""
-#: lib/signature.c:368 lib/signature.c:498
+#: lib/signature.c:369 lib/signature.c:499
#, fuzzy
msgid "Couldn't exec gpg\n"
msgstr "En voinut ajaa pgp:tä"
-#: lib/signature.c:381
+#: lib/signature.c:382
#, fuzzy
msgid "gpg failed\n"
msgstr "pgp epäonnistui"
#. GPG failed to write signature
#. Just in case
-#: lib/signature.c:388
+#: lib/signature.c:389
#, fuzzy
msgid "gpg failed to write signature\n"
msgstr "pgp ei voinut kirjoittaa allekirjoitusta"
-#: lib/signature.c:393
+#: lib/signature.c:394
#, c-format
msgid "GPG sig size: %d\n"
msgstr ""
-#: lib/signature.c:413
+#: lib/signature.c:414
#, c-format
msgid "Got %d bytes of GPG sig\n"
msgstr ""
-#: lib/signature.c:441
+#: lib/signature.c:442
#, fuzzy
msgid "Generating signature using PGP.\n"
msgstr "generoi PGP-allekirjoitus"
-#: lib/signature.c:447
+#: lib/signature.c:448
#, fuzzy
msgid "Generating signature using GPG.\n"
msgstr "generoi PGP-allekirjoitus"
-#: lib/signature.c:527
+#: lib/signature.c:528
#, fuzzy
msgid "Couldn't exec pgp\n"
msgstr "En voinut ajaa pgp:tä"
#. @notreached@
#. This case should have been screened out long ago.
-#: lib/signature.c:531 lib/signature.c:584
+#: lib/signature.c:532 lib/signature.c:585
#, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr ""
-#: lib/signature.c:564
+#: lib/signature.c:565
#, fuzzy, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr "Sinun pitää asettaa \"pgp_name:\" rpmrc-tiedostossa"
-#: lib/signature.c:576
+#: lib/signature.c:577
#, fuzzy, c-format
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr "Sinun pitää asettaa \"pgp_name:\" rpmrc-tiedostossa"
@@ -4010,68 +4010,68 @@ msgstr "en voinut avata %s: %s"
msgid "File %s is smaller than %u bytes\n"
msgstr ""
-#: rpmio/rpmio.c:644
+#: rpmio/rpmio.c:656
msgid "Success"
msgstr ""
-#: rpmio/rpmio.c:647
+#: rpmio/rpmio.c:659
#, fuzzy
msgid "Bad server response"
msgstr "Virheellinen FTP-palvelijan vastaus"
-#: rpmio/rpmio.c:650
+#: rpmio/rpmio.c:662
#, fuzzy
msgid "Server I/O error"
msgstr "FTP:n IO-virhe"
-#: rpmio/rpmio.c:653
+#: rpmio/rpmio.c:665
#, fuzzy
msgid "Server timeout"
msgstr "FTP-palvelimen timeout"
-#: rpmio/rpmio.c:656
+#: rpmio/rpmio.c:668
#, fuzzy
msgid "Unable to lookup server host address"
msgstr "FTP-palvelimen osoitetta ei löytynyt"
-#: rpmio/rpmio.c:659
+#: rpmio/rpmio.c:671
#, fuzzy
msgid "Unable to lookup server host name"
msgstr "FTP-palvelimen nimeä ei löytynyt"
-#: rpmio/rpmio.c:662
+#: rpmio/rpmio.c:674
#, fuzzy
msgid "Failed to connect to server"
msgstr "En saanut yhteyttä FTP-palvelijaan"
-#: rpmio/rpmio.c:665
+#: rpmio/rpmio.c:677
#, fuzzy
msgid "Failed to establish data connection to server"
msgstr "En saanut data-yhteyttä FTP-palvelijaan"
-#: rpmio/rpmio.c:668
+#: rpmio/rpmio.c:680
#, fuzzy
msgid "I/O error to local file"
msgstr "Paikallisen tiedoston IO-virhe"
-#: rpmio/rpmio.c:671
+#: rpmio/rpmio.c:683
msgid "Error setting remote server to passive mode"
msgstr "Virhe asetettaessa palvelinta passiiviin moodiin"
-#: rpmio/rpmio.c:674
+#: rpmio/rpmio.c:686
msgid "File not found on server"
msgstr "Tiedostoa ei löytynyt palvelimelta"
-#: rpmio/rpmio.c:677
+#: rpmio/rpmio.c:689
msgid "Abort in progress"
msgstr ""
-#: rpmio/rpmio.c:681
+#: rpmio/rpmio.c:693
#, fuzzy
msgid "Unknown or unexpected error"
msgstr "FTP:n tuntematon tai odottamaton virhe"
-#: rpmio/rpmio.c:1353
+#: rpmio/rpmio.c:1365
#, c-format
msgid "logging into %s as %s, pw %s\n"
msgstr ""
diff --git a/po/fr.po b/po/fr.po
index ae7e633e3..3f9a95b17 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-19 15:08-0400\n"
+"POT-Creation-Date: 2001-10-20 16:18-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"
@@ -2335,12 +2335,12 @@ msgstr ""
msgid "========== continuing tsort ...\n"
msgstr ""
-#: lib/formats.c:28 lib/formats.c:54 lib/formats.c:85 lib/formats.c:160
-#: lib/header.c:2902 lib/header.c:2923 lib/header.c:2945
+#: lib/formats.c:33 lib/formats.c:57 lib/formats.c:88 lib/formats.c:261
+#: lib/header.c:2929 lib/header.c:2950 lib/header.c:2972
msgid "(not a number)"
msgstr ""
-#: lib/formats.c:128
+#: lib/formats.c:129 lib/formats.c:191 lib/formats.c:236
msgid "(not a blob)"
msgstr ""
@@ -2502,7 +2502,7 @@ msgstr ""
msgid "| expected at end of expression"
msgstr ""
-#: lib/header.c:2646
+#: lib/header.c:2673
msgid "(unknown type)"
msgstr ""
@@ -3255,87 +3255,87 @@ msgstr ""
msgid "package %s is not installed\n"
msgstr "aucun package n'a t spcifi pour l'installation"
-#: lib/rpmchecksig.c:46
+#: lib/rpmchecksig.c:47
#, fuzzy, c-format
msgid "%s: open failed: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/rpmchecksig.c:58
+#: lib/rpmchecksig.c:59
#, fuzzy
msgid "makeTempFile failed\n"
msgstr "La construction a chou.\n"
-#: lib/rpmchecksig.c:100
+#: lib/rpmchecksig.c:101
#, fuzzy, c-format
msgid "%s: Fwrite failed: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/rpmchecksig.c:106 lib/rpmchecksig.c:313
+#: lib/rpmchecksig.c:107 lib/rpmchecksig.c:326
#, fuzzy, c-format
msgid "%s: Fread failed: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/rpmchecksig.c:143 lib/rpmchecksig.c:368
+#: lib/rpmchecksig.c:144 lib/rpmchecksig.c:401
#, c-format
msgid "%s: readLead failed\n"
msgstr ""
-#: lib/rpmchecksig.c:148
+#: lib/rpmchecksig.c:149
#, c-format
msgid "%s: Can't sign v1.0 RPM\n"
msgstr ""
-#: lib/rpmchecksig.c:152
+#: lib/rpmchecksig.c:153
#, c-format
msgid "%s: Can't re-sign v2.0 RPM\n"
msgstr ""
-#: lib/rpmchecksig.c:161 lib/rpmchecksig.c:384
+#: lib/rpmchecksig.c:162 lib/rpmchecksig.c:417
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/rpmchecksig.c:165 lib/rpmchecksig.c:389
+#: lib/rpmchecksig.c:166 lib/rpmchecksig.c:422
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/rpmchecksig.c:198
+#: lib/rpmchecksig.c:199
#, c-format
msgid "%s: writeLead failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:204
+#: lib/rpmchecksig.c:205
#, fuzzy, c-format
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/rpmchecksig.c:374
+#: lib/rpmchecksig.c:407
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr ""
-#: lib/rpmchecksig.c:604
+#: lib/rpmchecksig.c:649
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:605 lib/rpmchecksig.c:619
+#: lib/rpmchecksig.c:650 lib/rpmchecksig.c:664
msgid " (MISSING KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:607 lib/rpmchecksig.c:621
+#: lib/rpmchecksig.c:652 lib/rpmchecksig.c:666
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:608 lib/rpmchecksig.c:622
+#: lib/rpmchecksig.c:653 lib/rpmchecksig.c:667
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:610 lib/rpmchecksig.c:624
+#: lib/rpmchecksig.c:655 lib/rpmchecksig.c:669
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:618
+#: lib/rpmchecksig.c:663
msgid "OK"
msgstr ""
@@ -3532,125 +3532,125 @@ msgstr ""
msgid "Unable to open %s for reading: %s.\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/signature.c:111
+#: lib/signature.c:112
msgid "file is not regular -- skipping size check\n"
msgstr ""
-#: lib/signature.c:120
+#: lib/signature.c:121
#, c-format
msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
msgstr ""
-#: lib/signature.c:125
+#: lib/signature.c:126
#, c-format
msgid " Actual size: %12d\n"
msgstr ""
-#: lib/signature.c:145
+#: lib/signature.c:146
msgid "No signature\n"
msgstr ""
-#: lib/signature.c:149
+#: lib/signature.c:150
#, fuzzy
msgid "Old PGP signature\n"
msgstr " --sign - genre une signature PGP"
-#: lib/signature.c:162
+#: lib/signature.c:163
msgid "Old (internal-only) signature! How did you get that!?\n"
msgstr ""
-#: lib/signature.c:218
+#: lib/signature.c:219
#, c-format
msgid "Signature: size(%d)+pad(%d)\n"
msgstr ""
-#: lib/signature.c:281
+#: lib/signature.c:282
#, fuzzy, c-format
msgid "Couldn't exec pgp (%s)\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/signature.c:294
+#: lib/signature.c:295
#, fuzzy
msgid "pgp failed\n"
msgstr "La construction a chou.\n"
#. PGP failed to write signature
#. Just in case
-#: lib/signature.c:301
+#: lib/signature.c:302
#, fuzzy
msgid "pgp failed to write signature\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/signature.c:306
+#: lib/signature.c:307
#, c-format
msgid "PGP sig size: %d\n"
msgstr ""
-#: lib/signature.c:321 lib/signature.c:408
+#: lib/signature.c:322 lib/signature.c:409
#, fuzzy
msgid "unable to read the signature\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/signature.c:326
+#: lib/signature.c:327
#, c-format
msgid "Got %d bytes of PGP sig\n"
msgstr ""
-#: lib/signature.c:368 lib/signature.c:498
+#: lib/signature.c:369 lib/signature.c:499
#, fuzzy
msgid "Couldn't exec gpg\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/signature.c:381
+#: lib/signature.c:382
#, fuzzy
msgid "gpg failed\n"
msgstr "La construction a chou.\n"
#. GPG failed to write signature
#. Just in case
-#: lib/signature.c:388
+#: lib/signature.c:389
#, fuzzy
msgid "gpg failed to write signature\n"
msgstr "impossible d'ouvrir: %s\n"
-#: lib/signature.c:393
+#: lib/signature.c:394
#, c-format
msgid "GPG sig size: %d\n"
msgstr ""
-#: lib/signature.c:413
+#: lib/signature.c:414
#, c-format
msgid "Got %d bytes of GPG sig\n"
msgstr ""
-#: lib/signature.c:441
+#: lib/signature.c:442
#, fuzzy
msgid "Generating signature using PGP.\n"
msgstr " --sign - genre une signature PGP"
-#: lib/signature.c:447
+#: lib/signature.c:448
#, fuzzy
msgid "Generating signature using GPG.\n"
msgstr " --sign - genre une signature PGP"
-#: lib/signature.c:527
+#: lib/signature.c:528
#, fuzzy
msgid "Couldn't exec pgp\n"
msgstr "impossible d'ouvrir: %s\n"
#. @notreached@
#. This case should have been screened out long ago.
-#: lib/signature.c:531 lib/signature.c:584
+#: lib/signature.c:532 lib/signature.c:585
#, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr ""
-#: lib/signature.c:564
+#: lib/signature.c:565
#, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr ""
-#: lib/signature.c:576
+#: lib/signature.c:577
#, c-format
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr ""
@@ -4072,59 +4072,59 @@ msgstr "impossible d'ouvrir: %s\n"
msgid "File %s is smaller than %u bytes\n"
msgstr ""
-#: rpmio/rpmio.c:644
+#: rpmio/rpmio.c:656
msgid "Success"
msgstr ""
-#: rpmio/rpmio.c:647
+#: rpmio/rpmio.c:659
msgid "Bad server response"
msgstr ""
-#: rpmio/rpmio.c:650
+#: rpmio/rpmio.c:662
msgid "Server I/O error"
msgstr ""
-#: rpmio/rpmio.c:653
+#: rpmio/rpmio.c:665
msgid "Server timeout"
msgstr ""
-#: rpmio/rpmio.c:656
+#: rpmio/rpmio.c:668
msgid "Unable to lookup server host address"
msgstr ""
-#: rpmio/rpmio.c:659
+#: rpmio/rpmio.c:671
msgid "Unable to lookup server host name"
msgstr ""
-#: rpmio/rpmio.c:662
+#: rpmio/rpmio.c:674
msgid "Failed to connect to server"
msgstr ""
-#: rpmio/rpmio.c:665
+#: rpmio/rpmio.c:677
msgid "Failed to establish data connection to server"
msgstr ""
-#: rpmio/rpmio.c:668
+#: rpmio/rpmio.c:680
msgid "I/O error to local file"
msgstr ""
-#: rpmio/rpmio.c:671
+#: rpmio/rpmio.c:683
msgid "Error setting remote server to passive mode"
msgstr ""
-#: rpmio/rpmio.c:674
+#: rpmio/rpmio.c:686
msgid "File not found on server"
msgstr ""
-#: rpmio/rpmio.c:677
+#: rpmio/rpmio.c:689
msgid "Abort in progress"
msgstr ""
-#: rpmio/rpmio.c:681
+#: rpmio/rpmio.c:693
msgid "Unknown or unexpected error"
msgstr ""
-#: rpmio/rpmio.c:1353
+#: rpmio/rpmio.c:1365
#, c-format
msgid "logging into %s as %s, pw %s\n"
msgstr ""
diff --git a/po/gl.po b/po/gl.po
index 75aa95243..7a043b37c 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2001-10-19 15:08-0400\n"
+"POT-Creation-Date: 2001-10-20 16:18-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"
@@ -2167,12 +2167,12 @@ msgstr ""
msgid "========== continuing tsort ...\n"
msgstr ""
-#: lib/formats.c:28 lib/formats.c:54 lib/formats.c:85 lib/formats.c:160
-#: lib/header.c:2902 lib/header.c:2923 lib/header.c:2945
+#: lib/formats.c:33 lib/formats.c:57 lib/formats.c:88 lib/formats.c:261
+#: lib/header.c:2929 lib/header.c:2950 lib/header.c:2972
msgid "(not a number)"
msgstr ""
-#: lib/formats.c:128
+#: lib/formats.c:129 lib/formats.c:191 lib/formats.c:236
msgid "(not a blob)"
msgstr ""
@@ -2332,7 +2332,7 @@ msgstr ""
msgid "| expected at end of expression"
msgstr ""
-#: lib/header.c:2646
+#: lib/header.c:2673
msgid "(unknown type)"
msgstr ""
@@ -3022,86 +3022,86 @@ msgstr ""
msgid "package %s is not installed\n"
msgstr ""
-#: lib/rpmchecksig.c:46
+#: lib/rpmchecksig.c:47
#, c-format
msgid "%s: open failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:58
+#: lib/rpmchecksig.c:59
msgid "makeTempFile failed\n"
msgstr ""
-#: lib/rpmchecksig.c:100
+#: lib/rpmchecksig.c:101
#, c-format
msgid "%s: Fwrite failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:106 lib/rpmchecksig.c:313
+#: lib/rpmchecksig.c:107 lib/rpmchecksig.c:326
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:143 lib/rpmchecksig.c:368
+#: lib/rpmchecksig.c:144 lib/rpmchecksig.c:401
#, c-format
msgid "%s: readLead failed\n"
msgstr ""
-#: lib/rpmchecksig.c:148
+#: lib/rpmchecksig.c:149
#, c-format
msgid "%s: Can't sign v1.0 RPM\n"
msgstr ""
-#: lib/rpmchecksig.c:152
+#: lib/rpmchecksig.c:153
#, c-format
msgid "%s: Can't re-sign v2.0 RPM\n"
msgstr ""
-#: lib/rpmchecksig.c:161 lib/rpmchecksig.c:384
+#: lib/rpmchecksig.c:162 lib/rpmchecksig.c:417
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/rpmchecksig.c:165 lib/rpmchecksig.c:389
+#: lib/rpmchecksig.c:166 lib/rpmchecksig.c:422
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/rpmchecksig.c:198
+#: lib/rpmchecksig.c:199
#, c-format
msgid "%s: writeLead failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:204
+#: lib/rpmchecksig.c:205
#, c-format
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:374
+#: lib/rpmchecksig.c:407
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr ""
-#: lib/rpmchecksig.c:604
+#: lib/rpmchecksig.c:649
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:605 lib/rpmchecksig.c:619
+#: lib/rpmchecksig.c:650 lib/rpmchecksig.c:664
msgid " (MISSING KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:607 lib/rpmchecksig.c:621
+#: lib/rpmchecksig.c:652 lib/rpmchecksig.c:666
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:608 lib/rpmchecksig.c:622
+#: lib/rpmchecksig.c:653 lib/rpmchecksig.c:667
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:610 lib/rpmchecksig.c:624
+#: lib/rpmchecksig.c:655 lib/rpmchecksig.c:669
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:618
+#: lib/rpmchecksig.c:663
msgid "OK"
msgstr ""
@@ -3297,115 +3297,115 @@ msgstr ""
msgid "Unable to open %s for reading: %s.\n"
msgstr ""
-#: lib/signature.c:111
+#: lib/signature.c:112
msgid "file is not regular -- skipping size check\n"
msgstr ""
-#: lib/signature.c:120
+#: lib/signature.c:121
#, c-format
msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
msgstr ""
-#: lib/signature.c:125
+#: lib/signature.c:126
#, c-format
msgid " Actual size: %12d\n"
msgstr ""
-#: lib/signature.c:145
+#: lib/signature.c:146
msgid "No signature\n"
msgstr ""
-#: lib/signature.c:149
+#: lib/signature.c:150
msgid "Old PGP signature\n"
msgstr ""
-#: lib/signature.c:162
+#: lib/signature.c:163
msgid "Old (internal-only) signature! How did you get that!?\n"
msgstr ""
-#: lib/signature.c:218
+#: lib/signature.c:219
#, c-format
msgid "Signature: size(%d)+pad(%d)\n"
msgstr ""
-#: lib/signature.c:281
+#: lib/signature.c:282
#, c-format
msgid "Couldn't exec pgp (%s)\n"
msgstr ""
-#: lib/signature.c:294
+#: lib/signature.c:295
msgid "pgp failed\n"
msgstr ""
#. PGP failed to write signature
#. Just in case
-#: lib/signature.c:301
+#: lib/signature.c:302
msgid "pgp failed to write signature\n"
msgstr ""
-#: lib/signature.c:306
+#: lib/signature.c:307
#, c-format
msgid "PGP sig size: %d\n"
msgstr ""
-#: lib/signature.c:321 lib/signature.c:408
+#: lib/signature.c:322 lib/signature.c:409
msgid "unable to read the signature\n"
msgstr ""
-#: lib/signature.c:326
+#: lib/signature.c:327
#, c-format
msgid "Got %d bytes of PGP sig\n"
msgstr ""
-#: lib/signature.c:368 lib/signature.c:498
+#: lib/signature.c:369 lib/signature.c:499
msgid "Couldn't exec gpg\n"
msgstr ""
-#: lib/signature.c:381
+#: lib/signature.c:382
msgid "gpg failed\n"
msgstr ""
#. GPG failed to write signature
#. Just in case
-#: lib/signature.c:388
+#: lib/signature.c:389
msgid "gpg failed to write signature\n"
msgstr ""
-#: lib/signature.c:393
+#: lib/signature.c:394
#, c-format
msgid "GPG sig size: %d\n"
msgstr ""
-#: lib/signature.c:413
+#: lib/signature.c:414
#, c-format
msgid "Got %d bytes of GPG sig\n"
msgstr ""
-#: lib/signature.c:441
+#: lib/signature.c:442
msgid "Generating signature using PGP.\n"
msgstr ""
-#: lib/signature.c:447
+#: lib/signature.c:448
msgid "Generating signature using GPG.\n"
msgstr ""
-#: lib/signature.c:527
+#: lib/signature.c:528
msgid "Couldn't exec pgp\n"
msgstr ""
#. @notreached@
#. This case should have been screened out long ago.
-#: lib/signature.c:531 lib/signature.c:584
+#: lib/signature.c:532 lib/signature.c:585
#, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr ""
-#: lib/signature.c:564
+#: lib/signature.c:565
#, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr ""
-#: lib/signature.c:576
+#: lib/signature.c:577
#, c-format
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr ""
@@ -3827,59 +3827,59 @@ msgstr ""
msgid "File %s is smaller than %u bytes\n"
msgstr ""
-#: rpmio/rpmio.c:644
+#: rpmio/rpmio.c:656
msgid "Success"
msgstr ""
-#: rpmio/rpmio.c:647
+#: rpmio/rpmio.c:659
msgid "Bad server response"
msgstr ""
-#: rpmio/rpmio.c:650
+#: rpmio/rpmio.c:662
msgid "Server I/O error"
msgstr ""
-#: rpmio/rpmio.c:653
+#: rpmio/rpmio.c:665
msgid "Server timeout"
msgstr ""
-#: rpmio/rpmio.c:656
+#: rpmio/rpmio.c:668
msgid "Unable to lookup server host address"
msgstr ""
-#: rpmio/rpmio.c:659
+#: rpmio/rpmio.c:671
msgid "Unable to lookup server host name"
msgstr ""
-#: rpmio/rpmio.c:662
+#: rpmio/rpmio.c:674
msgid "Failed to connect to server"
msgstr ""
-#: rpmio/rpmio.c:665
+#: rpmio/rpmio.c:677
msgid "Failed to establish data connection to server"
msgstr ""
-#: rpmio/rpmio.c:668
+#: rpmio/rpmio.c:680
msgid "I/O error to local file"
msgstr ""
-#: rpmio/rpmio.c:671
+#: rpmio/rpmio.c:683
msgid "Error setting remote server to passive mode"
msgstr ""
-#: rpmio/rpmio.c:674
+#: rpmio/rpmio.c:686
msgid "File not found on server"
msgstr ""
-#: rpmio/rpmio.c:677
+#: rpmio/rpmio.c:689
msgid "Abort in progress"
msgstr ""
-#: rpmio/rpmio.c:681
+#: rpmio/rpmio.c:693
msgid "Unknown or unexpected error"
msgstr ""
-#: rpmio/rpmio.c:1353
+#: rpmio/rpmio.c:1365
#, c-format
msgid "logging into %s as %s, pw %s\n"
msgstr ""
diff --git a/po/hu.po b/po/hu.po
index bd7c3685f..c17a7f548 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-19 15:08-0400\n"
+"POT-Creation-Date: 2001-10-20 16:18-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"
@@ -2172,12 +2172,12 @@ msgstr ""
msgid "========== continuing tsort ...\n"
msgstr ""
-#: lib/formats.c:28 lib/formats.c:54 lib/formats.c:85 lib/formats.c:160
-#: lib/header.c:2902 lib/header.c:2923 lib/header.c:2945
+#: lib/formats.c:33 lib/formats.c:57 lib/formats.c:88 lib/formats.c:261
+#: lib/header.c:2929 lib/header.c:2950 lib/header.c:2972
msgid "(not a number)"
msgstr ""
-#: lib/formats.c:128
+#: lib/formats.c:129 lib/formats.c:191 lib/formats.c:236
msgid "(not a blob)"
msgstr ""
@@ -2337,7 +2337,7 @@ msgstr ""
msgid "| expected at end of expression"
msgstr ""
-#: lib/header.c:2646
+#: lib/header.c:2673
msgid "(unknown type)"
msgstr ""
@@ -3027,86 +3027,86 @@ msgstr ""
msgid "package %s is not installed\n"
msgstr ""
-#: lib/rpmchecksig.c:46
+#: lib/rpmchecksig.c:47
#, c-format
msgid "%s: open failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:58
+#: lib/rpmchecksig.c:59
msgid "makeTempFile failed\n"
msgstr ""
-#: lib/rpmchecksig.c:100
+#: lib/rpmchecksig.c:101
#, c-format
msgid "%s: Fwrite failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:106 lib/rpmchecksig.c:313
+#: lib/rpmchecksig.c:107 lib/rpmchecksig.c:326
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:143 lib/rpmchecksig.c:368
+#: lib/rpmchecksig.c:144 lib/rpmchecksig.c:401
#, c-format
msgid "%s: readLead failed\n"
msgstr ""
-#: lib/rpmchecksig.c:148
+#: lib/rpmchecksig.c:149
#, c-format
msgid "%s: Can't sign v1.0 RPM\n"
msgstr ""
-#: lib/rpmchecksig.c:152
+#: lib/rpmchecksig.c:153
#, c-format
msgid "%s: Can't re-sign v2.0 RPM\n"
msgstr ""
-#: lib/rpmchecksig.c:161 lib/rpmchecksig.c:384
+#: lib/rpmchecksig.c:162 lib/rpmchecksig.c:417
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/rpmchecksig.c:165 lib/rpmchecksig.c:389
+#: lib/rpmchecksig.c:166 lib/rpmchecksig.c:422
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/rpmchecksig.c:198
+#: lib/rpmchecksig.c:199
#, c-format
msgid "%s: writeLead failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:204
+#: lib/rpmchecksig.c:205
#, c-format
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:374
+#: lib/rpmchecksig.c:407
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr ""
-#: lib/rpmchecksig.c:604
+#: lib/rpmchecksig.c:649
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:605 lib/rpmchecksig.c:619
+#: lib/rpmchecksig.c:650 lib/rpmchecksig.c:664
msgid " (MISSING KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:607 lib/rpmchecksig.c:621
+#: lib/rpmchecksig.c:652 lib/rpmchecksig.c:666
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:608 lib/rpmchecksig.c:622
+#: lib/rpmchecksig.c:653 lib/rpmchecksig.c:667
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:610 lib/rpmchecksig.c:624
+#: lib/rpmchecksig.c:655 lib/rpmchecksig.c:669
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:618
+#: lib/rpmchecksig.c:663
msgid "OK"
msgstr ""
@@ -3302,115 +3302,115 @@ msgstr ""
msgid "Unable to open %s for reading: %s.\n"
msgstr ""
-#: lib/signature.c:111
+#: lib/signature.c:112
msgid "file is not regular -- skipping size check\n"
msgstr ""
-#: lib/signature.c:120
+#: lib/signature.c:121
#, c-format
msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
msgstr ""
-#: lib/signature.c:125
+#: lib/signature.c:126
#, c-format
msgid " Actual size: %12d\n"
msgstr ""
-#: lib/signature.c:145
+#: lib/signature.c:146
msgid "No signature\n"
msgstr ""
-#: lib/signature.c:149
+#: lib/signature.c:150
msgid "Old PGP signature\n"
msgstr ""
-#: lib/signature.c:162
+#: lib/signature.c:163
msgid "Old (internal-only) signature! How did you get that!?\n"
msgstr ""
-#: lib/signature.c:218
+#: lib/signature.c:219
#, c-format
msgid "Signature: size(%d)+pad(%d)\n"
msgstr ""
-#: lib/signature.c:281
+#: lib/signature.c:282
#, c-format
msgid "Couldn't exec pgp (%s)\n"
msgstr ""
-#: lib/signature.c:294
+#: lib/signature.c:295
msgid "pgp failed\n"
msgstr ""
#. PGP failed to write signature
#. Just in case
-#: lib/signature.c:301
+#: lib/signature.c:302
msgid "pgp failed to write signature\n"
msgstr ""
-#: lib/signature.c:306
+#: lib/signature.c:307
#, c-format
msgid "PGP sig size: %d\n"
msgstr ""
-#: lib/signature.c:321 lib/signature.c:408
+#: lib/signature.c:322 lib/signature.c:409
msgid "unable to read the signature\n"
msgstr ""
-#: lib/signature.c:326
+#: lib/signature.c:327
#, c-format
msgid "Got %d bytes of PGP sig\n"
msgstr ""
-#: lib/signature.c:368 lib/signature.c:498
+#: lib/signature.c:369 lib/signature.c:499
msgid "Couldn't exec gpg\n"
msgstr ""
-#: lib/signature.c:381
+#: lib/signature.c:382
msgid "gpg failed\n"
msgstr ""
#. GPG failed to write signature
#. Just in case
-#: lib/signature.c:388
+#: lib/signature.c:389
msgid "gpg failed to write signature\n"
msgstr ""
-#: lib/signature.c:393
+#: lib/signature.c:394
#, c-format
msgid "GPG sig size: %d\n"
msgstr ""
-#: lib/signature.c:413
+#: lib/signature.c:414
#, c-format
msgid "Got %d bytes of GPG sig\n"
msgstr ""
-#: lib/signature.c:441
+#: lib/signature.c:442
msgid "Generating signature using PGP.\n"
msgstr ""
-#: lib/signature.c:447
+#: lib/signature.c:448
msgid "Generating signature using GPG.\n"
msgstr ""
-#: lib/signature.c:527
+#: lib/signature.c:528
msgid "Couldn't exec pgp\n"
msgstr ""
#. @notreached@
#. This case should have been screened out long ago.
-#: lib/signature.c:531 lib/signature.c:584
+#: lib/signature.c:532 lib/signature.c:585
#, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr ""
-#: lib/signature.c:564
+#: lib/signature.c:565
#, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr ""
-#: lib/signature.c:576
+#: lib/signature.c:577
#, c-format
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr ""
@@ -3832,59 +3832,59 @@ msgstr ""
msgid "File %s is smaller than %u bytes\n"
msgstr ""
-#: rpmio/rpmio.c:644
+#: rpmio/rpmio.c:656
msgid "Success"
msgstr ""
-#: rpmio/rpmio.c:647
+#: rpmio/rpmio.c:659
msgid "Bad server response"
msgstr ""
-#: rpmio/rpmio.c:650
+#: rpmio/rpmio.c:662
msgid "Server I/O error"
msgstr ""
-#: rpmio/rpmio.c:653
+#: rpmio/rpmio.c:665
msgid "Server timeout"
msgstr ""
-#: rpmio/rpmio.c:656
+#: rpmio/rpmio.c:668
msgid "Unable to lookup server host address"
msgstr ""
-#: rpmio/rpmio.c:659
+#: rpmio/rpmio.c:671
msgid "Unable to lookup server host name"
msgstr ""
-#: rpmio/rpmio.c:662
+#: rpmio/rpmio.c:674
msgid "Failed to connect to server"
msgstr ""
-#: rpmio/rpmio.c:665
+#: rpmio/rpmio.c:677
msgid "Failed to establish data connection to server"
msgstr ""
-#: rpmio/rpmio.c:668
+#: rpmio/rpmio.c:680
msgid "I/O error to local file"
msgstr ""
-#: rpmio/rpmio.c:671
+#: rpmio/rpmio.c:683
msgid "Error setting remote server to passive mode"
msgstr ""
-#: rpmio/rpmio.c:674
+#: rpmio/rpmio.c:686
msgid "File not found on server"
msgstr ""
-#: rpmio/rpmio.c:677
+#: rpmio/rpmio.c:689
msgid "Abort in progress"
msgstr ""
-#: rpmio/rpmio.c:681
+#: rpmio/rpmio.c:693
msgid "Unknown or unexpected error"
msgstr ""
-#: rpmio/rpmio.c:1353
+#: rpmio/rpmio.c:1365
#, c-format
msgid "logging into %s as %s, pw %s\n"
msgstr ""
diff --git a/po/id.po b/po/id.po
index bd7c3685f..c17a7f548 100644
--- a/po/id.po
+++ b/po/id.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-19 15:08-0400\n"
+"POT-Creation-Date: 2001-10-20 16:18-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"
@@ -2172,12 +2172,12 @@ msgstr ""
msgid "========== continuing tsort ...\n"
msgstr ""
-#: lib/formats.c:28 lib/formats.c:54 lib/formats.c:85 lib/formats.c:160
-#: lib/header.c:2902 lib/header.c:2923 lib/header.c:2945
+#: lib/formats.c:33 lib/formats.c:57 lib/formats.c:88 lib/formats.c:261
+#: lib/header.c:2929 lib/header.c:2950 lib/header.c:2972
msgid "(not a number)"
msgstr ""
-#: lib/formats.c:128
+#: lib/formats.c:129 lib/formats.c:191 lib/formats.c:236
msgid "(not a blob)"
msgstr ""
@@ -2337,7 +2337,7 @@ msgstr ""
msgid "| expected at end of expression"
msgstr ""
-#: lib/header.c:2646
+#: lib/header.c:2673
msgid "(unknown type)"
msgstr ""
@@ -3027,86 +3027,86 @@ msgstr ""
msgid "package %s is not installed\n"
msgstr ""
-#: lib/rpmchecksig.c:46
+#: lib/rpmchecksig.c:47
#, c-format
msgid "%s: open failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:58
+#: lib/rpmchecksig.c:59
msgid "makeTempFile failed\n"
msgstr ""
-#: lib/rpmchecksig.c:100
+#: lib/rpmchecksig.c:101
#, c-format
msgid "%s: Fwrite failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:106 lib/rpmchecksig.c:313
+#: lib/rpmchecksig.c:107 lib/rpmchecksig.c:326
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:143 lib/rpmchecksig.c:368
+#: lib/rpmchecksig.c:144 lib/rpmchecksig.c:401
#, c-format
msgid "%s: readLead failed\n"
msgstr ""
-#: lib/rpmchecksig.c:148
+#: lib/rpmchecksig.c:149
#, c-format
msgid "%s: Can't sign v1.0 RPM\n"
msgstr ""
-#: lib/rpmchecksig.c:152
+#: lib/rpmchecksig.c:153
#, c-format
msgid "%s: Can't re-sign v2.0 RPM\n"
msgstr ""
-#: lib/rpmchecksig.c:161 lib/rpmchecksig.c:384
+#: lib/rpmchecksig.c:162 lib/rpmchecksig.c:417
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/rpmchecksig.c:165 lib/rpmchecksig.c:389
+#: lib/rpmchecksig.c:166 lib/rpmchecksig.c:422
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/rpmchecksig.c:198
+#: lib/rpmchecksig.c:199
#, c-format
msgid "%s: writeLead failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:204
+#: lib/rpmchecksig.c:205
#, c-format
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:374
+#: lib/rpmchecksig.c:407
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr ""
-#: lib/rpmchecksig.c:604
+#: lib/rpmchecksig.c:649
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:605 lib/rpmchecksig.c:619
+#: lib/rpmchecksig.c:650 lib/rpmchecksig.c:664
msgid " (MISSING KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:607 lib/rpmchecksig.c:621
+#: lib/rpmchecksig.c:652 lib/rpmchecksig.c:666
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:608 lib/rpmchecksig.c:622
+#: lib/rpmchecksig.c:653 lib/rpmchecksig.c:667
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:610 lib/rpmchecksig.c:624
+#: lib/rpmchecksig.c:655 lib/rpmchecksig.c:669
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:618
+#: lib/rpmchecksig.c:663
msgid "OK"
msgstr ""
@@ -3302,115 +3302,115 @@ msgstr ""
msgid "Unable to open %s for reading: %s.\n"
msgstr ""
-#: lib/signature.c:111
+#: lib/signature.c:112
msgid "file is not regular -- skipping size check\n"
msgstr ""
-#: lib/signature.c:120
+#: lib/signature.c:121
#, c-format
msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
msgstr ""
-#: lib/signature.c:125
+#: lib/signature.c:126
#, c-format
msgid " Actual size: %12d\n"
msgstr ""
-#: lib/signature.c:145
+#: lib/signature.c:146
msgid "No signature\n"
msgstr ""
-#: lib/signature.c:149
+#: lib/signature.c:150
msgid "Old PGP signature\n"
msgstr ""
-#: lib/signature.c:162
+#: lib/signature.c:163
msgid "Old (internal-only) signature! How did you get that!?\n"
msgstr ""
-#: lib/signature.c:218
+#: lib/signature.c:219
#, c-format
msgid "Signature: size(%d)+pad(%d)\n"
msgstr ""
-#: lib/signature.c:281
+#: lib/signature.c:282
#, c-format
msgid "Couldn't exec pgp (%s)\n"
msgstr ""
-#: lib/signature.c:294
+#: lib/signature.c:295
msgid "pgp failed\n"
msgstr ""
#. PGP failed to write signature
#. Just in case
-#: lib/signature.c:301
+#: lib/signature.c:302
msgid "pgp failed to write signature\n"
msgstr ""
-#: lib/signature.c:306
+#: lib/signature.c:307
#, c-format
msgid "PGP sig size: %d\n"
msgstr ""
-#: lib/signature.c:321 lib/signature.c:408
+#: lib/signature.c:322 lib/signature.c:409
msgid "unable to read the signature\n"
msgstr ""
-#: lib/signature.c:326
+#: lib/signature.c:327
#, c-format
msgid "Got %d bytes of PGP sig\n"
msgstr ""
-#: lib/signature.c:368 lib/signature.c:498
+#: lib/signature.c:369 lib/signature.c:499
msgid "Couldn't exec gpg\n"
msgstr ""
-#: lib/signature.c:381
+#: lib/signature.c:382
msgid "gpg failed\n"
msgstr ""
#. GPG failed to write signature
#. Just in case
-#: lib/signature.c:388
+#: lib/signature.c:389
msgid "gpg failed to write signature\n"
msgstr ""
-#: lib/signature.c:393
+#: lib/signature.c:394
#, c-format
msgid "GPG sig size: %d\n"
msgstr ""
-#: lib/signature.c:413
+#: lib/signature.c:414
#, c-format
msgid "Got %d bytes of GPG sig\n"
msgstr ""
-#: lib/signature.c:441
+#: lib/signature.c:442
msgid "Generating signature using PGP.\n"
msgstr ""
-#: lib/signature.c:447
+#: lib/signature.c:448
msgid "Generating signature using GPG.\n"
msgstr ""
-#: lib/signature.c:527
+#: lib/signature.c:528
msgid "Couldn't exec pgp\n"
msgstr ""
#. @notreached@
#. This case should have been screened out long ago.
-#: lib/signature.c:531 lib/signature.c:584
+#: lib/signature.c:532 lib/signature.c:585
#, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr ""
-#: lib/signature.c:564
+#: lib/signature.c:565
#, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr ""
-#: lib/signature.c:576
+#: lib/signature.c:577
#, c-format
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr ""
@@ -3832,59 +3832,59 @@ msgstr ""
msgid "File %s is smaller than %u bytes\n"
msgstr ""
-#: rpmio/rpmio.c:644
+#: rpmio/rpmio.c:656
msgid "Success"
msgstr ""
-#: rpmio/rpmio.c:647
+#: rpmio/rpmio.c:659
msgid "Bad server response"
msgstr ""
-#: rpmio/rpmio.c:650
+#: rpmio/rpmio.c:662
msgid "Server I/O error"
msgstr ""
-#: rpmio/rpmio.c:653
+#: rpmio/rpmio.c:665
msgid "Server timeout"
msgstr ""
-#: rpmio/rpmio.c:656
+#: rpmio/rpmio.c:668
msgid "Unable to lookup server host address"
msgstr ""
-#: rpmio/rpmio.c:659
+#: rpmio/rpmio.c:671
msgid "Unable to lookup server host name"
msgstr ""
-#: rpmio/rpmio.c:662
+#: rpmio/rpmio.c:674
msgid "Failed to connect to server"
msgstr ""
-#: rpmio/rpmio.c:665
+#: rpmio/rpmio.c:677
msgid "Failed to establish data connection to server"
msgstr ""
-#: rpmio/rpmio.c:668
+#: rpmio/rpmio.c:680
msgid "I/O error to local file"
msgstr ""
-#: rpmio/rpmio.c:671
+#: rpmio/rpmio.c:683
msgid "Error setting remote server to passive mode"
msgstr ""
-#: rpmio/rpmio.c:674
+#: rpmio/rpmio.c:686
msgid "File not found on server"
msgstr ""
-#: rpmio/rpmio.c:677
+#: rpmio/rpmio.c:689
msgid "Abort in progress"
msgstr ""
-#: rpmio/rpmio.c:681
+#: rpmio/rpmio.c:693
msgid "Unknown or unexpected error"
msgstr ""
-#: rpmio/rpmio.c:1353
+#: rpmio/rpmio.c:1365
#, c-format
msgid "logging into %s as %s, pw %s\n"
msgstr ""
diff --git a/po/is.po b/po/is.po
index 608dd211b..1621cfe36 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-19 15:08-0400\n"
+"POT-Creation-Date: 2001-10-20 16:18-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"
@@ -2191,12 +2191,12 @@ msgstr ""
msgid "========== continuing tsort ...\n"
msgstr ""
-#: lib/formats.c:28 lib/formats.c:54 lib/formats.c:85 lib/formats.c:160
-#: lib/header.c:2902 lib/header.c:2923 lib/header.c:2945
+#: lib/formats.c:33 lib/formats.c:57 lib/formats.c:88 lib/formats.c:261
+#: lib/header.c:2929 lib/header.c:2950 lib/header.c:2972
msgid "(not a number)"
msgstr ""
-#: lib/formats.c:128
+#: lib/formats.c:129 lib/formats.c:191 lib/formats.c:236
msgid "(not a blob)"
msgstr ""
@@ -2356,7 +2356,7 @@ msgstr ""
msgid "| expected at end of expression"
msgstr ""
-#: lib/header.c:2646
+#: lib/header.c:2673
msgid "(unknown type)"
msgstr ""
@@ -3047,86 +3047,86 @@ msgstr ""
msgid "package %s is not installed\n"
msgstr ""
-#: lib/rpmchecksig.c:46
+#: lib/rpmchecksig.c:47
#, c-format
msgid "%s: open failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:58
+#: lib/rpmchecksig.c:59
msgid "makeTempFile failed\n"
msgstr ""
-#: lib/rpmchecksig.c:100
+#: lib/rpmchecksig.c:101
#, c-format
msgid "%s: Fwrite failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:106 lib/rpmchecksig.c:313
+#: lib/rpmchecksig.c:107 lib/rpmchecksig.c:326
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:143 lib/rpmchecksig.c:368
+#: lib/rpmchecksig.c:144 lib/rpmchecksig.c:401
#, c-format
msgid "%s: readLead failed\n"
msgstr ""
-#: lib/rpmchecksig.c:148
+#: lib/rpmchecksig.c:149
#, c-format
msgid "%s: Can't sign v1.0 RPM\n"
msgstr ""
-#: lib/rpmchecksig.c:152
+#: lib/rpmchecksig.c:153
#, c-format
msgid "%s: Can't re-sign v2.0 RPM\n"
msgstr ""
-#: lib/rpmchecksig.c:161 lib/rpmchecksig.c:384
+#: lib/rpmchecksig.c:162 lib/rpmchecksig.c:417
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/rpmchecksig.c:165 lib/rpmchecksig.c:389
+#: lib/rpmchecksig.c:166 lib/rpmchecksig.c:422
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/rpmchecksig.c:198
+#: lib/rpmchecksig.c:199
#, c-format
msgid "%s: writeLead failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:204
+#: lib/rpmchecksig.c:205
#, c-format
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:374
+#: lib/rpmchecksig.c:407
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr ""
-#: lib/rpmchecksig.c:604
+#: lib/rpmchecksig.c:649
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:605 lib/rpmchecksig.c:619
+#: lib/rpmchecksig.c:650 lib/rpmchecksig.c:664
msgid " (MISSING KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:607 lib/rpmchecksig.c:621
+#: lib/rpmchecksig.c:652 lib/rpmchecksig.c:666
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:608 lib/rpmchecksig.c:622
+#: lib/rpmchecksig.c:653 lib/rpmchecksig.c:667
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:610 lib/rpmchecksig.c:624
+#: lib/rpmchecksig.c:655 lib/rpmchecksig.c:669
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:618
+#: lib/rpmchecksig.c:663
msgid "OK"
msgstr ""
@@ -3322,115 +3322,115 @@ msgstr ""
msgid "Unable to open %s for reading: %s.\n"
msgstr "Get ekki opnađ %s til lesturs: %s.\n"
-#: lib/signature.c:111
+#: lib/signature.c:112
msgid "file is not regular -- skipping size check\n"
msgstr ""
-#: lib/signature.c:120
+#: lib/signature.c:121
#, c-format
msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
msgstr ""
-#: lib/signature.c:125
+#: lib/signature.c:126
#, c-format
msgid " Actual size: %12d\n"
msgstr ""
-#: lib/signature.c:145
+#: lib/signature.c:146
msgid "No signature\n"
msgstr ""
-#: lib/signature.c:149
+#: lib/signature.c:150
msgid "Old PGP signature\n"
msgstr ""
-#: lib/signature.c:162
+#: lib/signature.c:163
msgid "Old (internal-only) signature! How did you get that!?\n"
msgstr ""
-#: lib/signature.c:218
+#: lib/signature.c:219
#, c-format
msgid "Signature: size(%d)+pad(%d)\n"
msgstr ""
-#: lib/signature.c:281
+#: lib/signature.c:282
#, c-format
msgid "Couldn't exec pgp (%s)\n"
msgstr "Gat ekki keyrt pgp (%s)\n"
-#: lib/signature.c:294
+#: lib/signature.c:295
msgid "pgp failed\n"
msgstr "pgp brást\n"
#. PGP failed to write signature
#. Just in case
-#: lib/signature.c:301
+#: lib/signature.c:302
msgid "pgp failed to write signature\n"
msgstr "pgp gat ekki lesiđ undirskriftina\n"
-#: lib/signature.c:306
+#: lib/signature.c:307
#, c-format
msgid "PGP sig size: %d\n"
msgstr ""
-#: lib/signature.c:321 lib/signature.c:408
+#: lib/signature.c:322 lib/signature.c:409
msgid "unable to read the signature\n"
msgstr "get ekki lesiđ undirskriftina\n"
-#: lib/signature.c:326
+#: lib/signature.c:327
#, c-format
msgid "Got %d bytes of PGP sig\n"
msgstr ""
-#: lib/signature.c:368 lib/signature.c:498
+#: lib/signature.c:369 lib/signature.c:499
msgid "Couldn't exec gpg\n"
msgstr "Gat ekki keyrt gpg\n"
-#: lib/signature.c:381
+#: lib/signature.c:382
msgid "gpg failed\n"
msgstr "ggp brást\n"
#. GPG failed to write signature
#. Just in case
-#: lib/signature.c:388
+#: lib/signature.c:389
msgid "gpg failed to write signature\n"
msgstr "gpg get ekki lesiđ undirskriftina\n"
-#: lib/signature.c:393
+#: lib/signature.c:394
#, c-format
msgid "GPG sig size: %d\n"
msgstr ""
-#: lib/signature.c:413
+#: lib/signature.c:414
#, c-format
msgid "Got %d bytes of GPG sig\n"
msgstr ""
-#: lib/signature.c:441
+#: lib/signature.c:442
msgid "Generating signature using PGP.\n"
msgstr ""
-#: lib/signature.c:447
+#: lib/signature.c:448
msgid "Generating signature using GPG.\n"
msgstr ""
-#: lib/signature.c:527
+#: lib/signature.c:528
msgid "Couldn't exec pgp\n"
msgstr "Gat ekki keyrt pgp\n"
#. @notreached@
#. This case should have been screened out long ago.
-#: lib/signature.c:531 lib/signature.c:584
+#: lib/signature.c:532 lib/signature.c:585
#, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr ""
-#: lib/signature.c:564
+#: lib/signature.c:565
#, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr ""
-#: lib/signature.c:576
+#: lib/signature.c:577
#, c-format
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr ""
@@ -3852,59 +3852,59 @@ msgstr "Skrá %s: %s\n"
msgid "File %s is smaller than %u bytes\n"
msgstr "Skráin %s er minni en %u bćti\n"
-#: rpmio/rpmio.c:644
+#: rpmio/rpmio.c:656
msgid "Success"
msgstr "Tókst"
-#: rpmio/rpmio.c:647
+#: rpmio/rpmio.c:659
msgid "Bad server response"
msgstr "Ţjónninn svarađi rangt"
-#: rpmio/rpmio.c:650
+#: rpmio/rpmio.c:662
msgid "Server I/O error"
msgstr "Les/ritvilla á ţjóninum"
-#: rpmio/rpmio.c:653
+#: rpmio/rpmio.c:665
msgid "Server timeout"
msgstr "Ţjónninn tímađi út"
-#: rpmio/rpmio.c:656
+#: rpmio/rpmio.c:668
msgid "Unable to lookup server host address"
msgstr "Gat ekki flett upp vistfangi ţjónsins"
-#: rpmio/rpmio.c:659
+#: rpmio/rpmio.c:671
msgid "Unable to lookup server host name"
msgstr "Gat ekki flett upp heiti ţjónsins"
-#: rpmio/rpmio.c:662
+#: rpmio/rpmio.c:674
msgid "Failed to connect to server"
msgstr "Gat ekki tengst ţjóninum"
-#: rpmio/rpmio.c:665
+#: rpmio/rpmio.c:677
msgid "Failed to establish data connection to server"
msgstr "Gat ekki opnađ gagnatengingu viđ ţjóninn"
-#: rpmio/rpmio.c:668
+#: rpmio/rpmio.c:680
msgid "I/O error to local file"
msgstr "Les/ritvilla í skrána"
-#: rpmio/rpmio.c:671
+#: rpmio/rpmio.c:683
msgid "Error setting remote server to passive mode"
msgstr "Ekki tókst ađ fá ţjóninn í \"passive\" ham"
-#: rpmio/rpmio.c:674
+#: rpmio/rpmio.c:686
msgid "File not found on server"
msgstr "Skráin fannst ekki á ţjóninum"
-#: rpmio/rpmio.c:677
+#: rpmio/rpmio.c:689
msgid "Abort in progress"
msgstr "Er ađ hćtta viđ"
-#: rpmio/rpmio.c:681
+#: rpmio/rpmio.c:693
msgid "Unknown or unexpected error"
msgstr "Óţekkt eđa óvćnt villa"
-#: rpmio/rpmio.c:1353
+#: rpmio/rpmio.c:1365
#, c-format
msgid "logging into %s as %s, pw %s\n"
msgstr "tengist %s sem %s međ ađgangsorđi %s\n"
diff --git a/po/it.po b/po/it.po
index bd7c3685f..c17a7f548 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-19 15:08-0400\n"
+"POT-Creation-Date: 2001-10-20 16:18-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"
@@ -2172,12 +2172,12 @@ msgstr ""
msgid "========== continuing tsort ...\n"
msgstr ""
-#: lib/formats.c:28 lib/formats.c:54 lib/formats.c:85 lib/formats.c:160
-#: lib/header.c:2902 lib/header.c:2923 lib/header.c:2945
+#: lib/formats.c:33 lib/formats.c:57 lib/formats.c:88 lib/formats.c:261
+#: lib/header.c:2929 lib/header.c:2950 lib/header.c:2972
msgid "(not a number)"
msgstr ""
-#: lib/formats.c:128
+#: lib/formats.c:129 lib/formats.c:191 lib/formats.c:236
msgid "(not a blob)"
msgstr ""
@@ -2337,7 +2337,7 @@ msgstr ""
msgid "| expected at end of expression"
msgstr ""
-#: lib/header.c:2646
+#: lib/header.c:2673
msgid "(unknown type)"
msgstr ""
@@ -3027,86 +3027,86 @@ msgstr ""
msgid "package %s is not installed\n"
msgstr ""
-#: lib/rpmchecksig.c:46
+#: lib/rpmchecksig.c:47
#, c-format
msgid "%s: open failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:58
+#: lib/rpmchecksig.c:59
msgid "makeTempFile failed\n"
msgstr ""
-#: lib/rpmchecksig.c:100
+#: lib/rpmchecksig.c:101
#, c-format
msgid "%s: Fwrite failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:106 lib/rpmchecksig.c:313
+#: lib/rpmchecksig.c:107 lib/rpmchecksig.c:326
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:143 lib/rpmchecksig.c:368
+#: lib/rpmchecksig.c:144 lib/rpmchecksig.c:401
#, c-format
msgid "%s: readLead failed\n"
msgstr ""
-#: lib/rpmchecksig.c:148
+#: lib/rpmchecksig.c:149
#, c-format
msgid "%s: Can't sign v1.0 RPM\n"
msgstr ""
-#: lib/rpmchecksig.c:152
+#: lib/rpmchecksig.c:153
#, c-format
msgid "%s: Can't re-sign v2.0 RPM\n"
msgstr ""
-#: lib/rpmchecksig.c:161 lib/rpmchecksig.c:384
+#: lib/rpmchecksig.c:162 lib/rpmchecksig.c:417
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/rpmchecksig.c:165 lib/rpmchecksig.c:389
+#: lib/rpmchecksig.c:166 lib/rpmchecksig.c:422
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/rpmchecksig.c:198
+#: lib/rpmchecksig.c:199
#, c-format
msgid "%s: writeLead failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:204
+#: lib/rpmchecksig.c:205
#, c-format
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:374
+#: lib/rpmchecksig.c:407
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr ""
-#: lib/rpmchecksig.c:604
+#: lib/rpmchecksig.c:649
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:605 lib/rpmchecksig.c:619
+#: lib/rpmchecksig.c:650 lib/rpmchecksig.c:664
msgid " (MISSING KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:607 lib/rpmchecksig.c:621
+#: lib/rpmchecksig.c:652 lib/rpmchecksig.c:666
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:608 lib/rpmchecksig.c:622
+#: lib/rpmchecksig.c:653 lib/rpmchecksig.c:667
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:610 lib/rpmchecksig.c:624
+#: lib/rpmchecksig.c:655 lib/rpmchecksig.c:669
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:618
+#: lib/rpmchecksig.c:663
msgid "OK"
msgstr ""
@@ -3302,115 +3302,115 @@ msgstr ""
msgid "Unable to open %s for reading: %s.\n"
msgstr ""
-#: lib/signature.c:111
+#: lib/signature.c:112
msgid "file is not regular -- skipping size check\n"
msgstr ""
-#: lib/signature.c:120
+#: lib/signature.c:121
#, c-format
msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
msgstr ""
-#: lib/signature.c:125
+#: lib/signature.c:126
#, c-format
msgid " Actual size: %12d\n"
msgstr ""
-#: lib/signature.c:145
+#: lib/signature.c:146
msgid "No signature\n"
msgstr ""
-#: lib/signature.c:149
+#: lib/signature.c:150
msgid "Old PGP signature\n"
msgstr ""
-#: lib/signature.c:162
+#: lib/signature.c:163
msgid "Old (internal-only) signature! How did you get that!?\n"
msgstr ""
-#: lib/signature.c:218
+#: lib/signature.c:219
#, c-format
msgid "Signature: size(%d)+pad(%d)\n"
msgstr ""
-#: lib/signature.c:281
+#: lib/signature.c:282
#, c-format
msgid "Couldn't exec pgp (%s)\n"
msgstr ""
-#: lib/signature.c:294
+#: lib/signature.c:295
msgid "pgp failed\n"
msgstr ""
#. PGP failed to write signature
#. Just in case
-#: lib/signature.c:301
+#: lib/signature.c:302
msgid "pgp failed to write signature\n"
msgstr ""
-#: lib/signature.c:306
+#: lib/signature.c:307
#, c-format
msgid "PGP sig size: %d\n"
msgstr ""
-#: lib/signature.c:321 lib/signature.c:408
+#: lib/signature.c:322 lib/signature.c:409
msgid "unable to read the signature\n"
msgstr ""
-#: lib/signature.c:326
+#: lib/signature.c:327
#, c-format
msgid "Got %d bytes of PGP sig\n"
msgstr ""
-#: lib/signature.c:368 lib/signature.c:498
+#: lib/signature.c:369 lib/signature.c:499
msgid "Couldn't exec gpg\n"
msgstr ""
-#: lib/signature.c:381
+#: lib/signature.c:382
msgid "gpg failed\n"
msgstr ""
#. GPG failed to write signature
#. Just in case
-#: lib/signature.c:388
+#: lib/signature.c:389
msgid "gpg failed to write signature\n"
msgstr ""
-#: lib/signature.c:393
+#: lib/signature.c:394
#, c-format
msgid "GPG sig size: %d\n"
msgstr ""
-#: lib/signature.c:413
+#: lib/signature.c:414
#, c-format
msgid "Got %d bytes of GPG sig\n"
msgstr ""
-#: lib/signature.c:441
+#: lib/signature.c:442
msgid "Generating signature using PGP.\n"
msgstr ""
-#: lib/signature.c:447
+#: lib/signature.c:448
msgid "Generating signature using GPG.\n"
msgstr ""
-#: lib/signature.c:527
+#: lib/signature.c:528
msgid "Couldn't exec pgp\n"
msgstr ""
#. @notreached@
#. This case should have been screened out long ago.
-#: lib/signature.c:531 lib/signature.c:584
+#: lib/signature.c:532 lib/signature.c:585
#, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr ""
-#: lib/signature.c:564
+#: lib/signature.c:565
#, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr ""
-#: lib/signature.c:576
+#: lib/signature.c:577
#, c-format
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr ""
@@ -3832,59 +3832,59 @@ msgstr ""
msgid "File %s is smaller than %u bytes\n"
msgstr ""
-#: rpmio/rpmio.c:644
+#: rpmio/rpmio.c:656
msgid "Success"
msgstr ""
-#: rpmio/rpmio.c:647
+#: rpmio/rpmio.c:659
msgid "Bad server response"
msgstr ""
-#: rpmio/rpmio.c:650
+#: rpmio/rpmio.c:662
msgid "Server I/O error"
msgstr ""
-#: rpmio/rpmio.c:653
+#: rpmio/rpmio.c:665
msgid "Server timeout"
msgstr ""
-#: rpmio/rpmio.c:656
+#: rpmio/rpmio.c:668
msgid "Unable to lookup server host address"
msgstr ""
-#: rpmio/rpmio.c:659
+#: rpmio/rpmio.c:671
msgid "Unable to lookup server host name"
msgstr ""
-#: rpmio/rpmio.c:662
+#: rpmio/rpmio.c:674
msgid "Failed to connect to server"
msgstr ""
-#: rpmio/rpmio.c:665
+#: rpmio/rpmio.c:677
msgid "Failed to establish data connection to server"
msgstr ""
-#: rpmio/rpmio.c:668
+#: rpmio/rpmio.c:680
msgid "I/O error to local file"
msgstr ""
-#: rpmio/rpmio.c:671
+#: rpmio/rpmio.c:683
msgid "Error setting remote server to passive mode"
msgstr ""
-#: rpmio/rpmio.c:674
+#: rpmio/rpmio.c:686
msgid "File not found on server"
msgstr ""
-#: rpmio/rpmio.c:677
+#: rpmio/rpmio.c:689
msgid "Abort in progress"
msgstr ""
-#: rpmio/rpmio.c:681
+#: rpmio/rpmio.c:693
msgid "Unknown or unexpected error"
msgstr ""
-#: rpmio/rpmio.c:1353
+#: rpmio/rpmio.c:1365
#, c-format
msgid "logging into %s as %s, pw %s\n"
msgstr ""
diff --git a/po/ja.po b/po/ja.po
index ff45d26a2..a9c1054f0 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-19 15:08-0400\n"
+"POT-Creation-Date: 2001-10-20 16:18-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"
@@ -88,7 +88,7 @@ msgstr "ĽżĄźĽ˛ĽĂĽČ %s ÍѤ˺îŔŽĂć\n"
# build root [BuildRoot]
# net share [ĽÍĽĂĽČśŚÍ­]
# reloate [şĆÇŰĂÖ/°ÜĆ°¤š¤ë]
-# $Id: ja.po,v 1.181 2001/10/19 19:51:21 jbj Exp $
+# $Id: ja.po,v 1.182 2001/10/20 20:29:02 jbj Exp $
#: rpm.c:227
#, c-format
msgid "rpm: %s\n"
@@ -2304,12 +2304,12 @@ msgstr ""
msgid "========== continuing tsort ...\n"
msgstr ""
-#: lib/formats.c:28 lib/formats.c:54 lib/formats.c:85 lib/formats.c:160
-#: lib/header.c:2902 lib/header.c:2923 lib/header.c:2945
+#: lib/formats.c:33 lib/formats.c:57 lib/formats.c:88 lib/formats.c:261
+#: lib/header.c:2929 lib/header.c:2950 lib/header.c:2972
msgid "(not a number)"
msgstr "(żôťú¤Ç¤Ď¤˘¤ę¤Ţ¤ť¤ó)"
-#: lib/formats.c:128
+#: lib/formats.c:129 lib/formats.c:191 lib/formats.c:236
#, fuzzy
msgid "(not a blob)"
msgstr "(żôťú¤Ç¤Ď¤˘¤ę¤Ţ¤ť¤ó)"
@@ -2471,7 +2471,7 @@ msgstr "ź°Ăć¤Ç : ¤Î¸ĺ¤Ë { ¤Ź´üÂÔ¤ľ¤ě¤Ţ¤š"
msgid "| expected at end of expression"
msgstr "ź°¤Î˝Ş¤ę¤Ë | ¤Ź´üÂÔ¤ľ¤ě¤Ţ¤š"
-#: lib/header.c:2646
+#: lib/header.c:2673
msgid "(unknown type)"
msgstr "(ÉÔĚŔ¤ĘĽżĽ¤Ľ×)"
@@ -3237,88 +3237,88 @@ msgstr "ĽěĽłĄźĽÉ %d ¤ňĆɤळ¤Č¤Ź¤Ç¤­¤Ţ¤ť¤ó¤Ç¤ˇ¤ż\n"
msgid "package %s is not installed\n"
msgstr "ĽŃĽĂĽąĄźĽ¸ %s ¤ĎĽ¤ĽóĽšĽČĄźĽë¤ľ¤ě¤Ć¤¤¤Ţ¤ť¤ó\n"
-#: lib/rpmchecksig.c:46
+#: lib/rpmchecksig.c:47
#, fuzzy, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: fdOpen ¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż: %s\n"
-#: lib/rpmchecksig.c:58
+#: lib/rpmchecksig.c:59
#, fuzzy
msgid "makeTempFile failed\n"
msgstr "makeTempFile ¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż\n"
-#: lib/rpmchecksig.c:100
+#: lib/rpmchecksig.c:101
#, fuzzy, c-format
msgid "%s: Fwrite failed: %s\n"
msgstr "%s: Fwrite ¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż: %s\n"
-#: lib/rpmchecksig.c:106 lib/rpmchecksig.c:313
+#: lib/rpmchecksig.c:107 lib/rpmchecksig.c:326
#, fuzzy, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: Fread ¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż: %s\n"
-#: lib/rpmchecksig.c:143 lib/rpmchecksig.c:368
+#: lib/rpmchecksig.c:144 lib/rpmchecksig.c:401
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: readLead ¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż\n"
-#: lib/rpmchecksig.c:148
+#: lib/rpmchecksig.c:149
#, c-format
msgid "%s: Can't sign v1.0 RPM\n"
msgstr "%s: v1.0 ¤Î RPM ¤Ë¤Ď˝đĚž¤Ç¤­¤Ţ¤ť¤ó\n"
-#: lib/rpmchecksig.c:152
+#: lib/rpmchecksig.c:153
#, c-format
msgid "%s: Can't re-sign v2.0 RPM\n"
msgstr "%s: v2.0 ¤Î RPM ¤Ë¤ĎşĆ˝đĚž¤Ç¤­¤Ţ¤ť¤ó\n"
-#: lib/rpmchecksig.c:161 lib/rpmchecksig.c:384
+#: lib/rpmchecksig.c:162 lib/rpmchecksig.c:417
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: rpmReadSignature ¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż\n"
-#: lib/rpmchecksig.c:165 lib/rpmchecksig.c:389
+#: lib/rpmchecksig.c:166 lib/rpmchecksig.c:422
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Í­¸ú¤Ę˝đĚž¤Ď¤˘¤ę¤Ţ¤ť¤ó\n"
-#: lib/rpmchecksig.c:198
+#: lib/rpmchecksig.c:199
#, fuzzy, c-format
msgid "%s: writeLead failed: %s\n"
msgstr "%s: writedLead ¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż: %s\n"
-#: lib/rpmchecksig.c:204
+#: lib/rpmchecksig.c:205
#, fuzzy, c-format
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: rpmWriteSignature ¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż\n"
-#: lib/rpmchecksig.c:374
+#: lib/rpmchecksig.c:407
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr "%s: Í­¸ú¤Ę˝đĚž¤Ď¤˘¤ę¤Ţ¤ť¤ó(v1.0 RPM)\n"
-#: lib/rpmchecksig.c:604
+#: lib/rpmchecksig.c:649
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:605 lib/rpmchecksig.c:619
+#: lib/rpmchecksig.c:650 lib/rpmchecksig.c:664
#, fuzzy
msgid " (MISSING KEYS:"
msgstr " (Ľ­Ąź¤ÎĘśźş) "
-#: lib/rpmchecksig.c:607 lib/rpmchecksig.c:621
+#: lib/rpmchecksig.c:652 lib/rpmchecksig.c:666
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:608 lib/rpmchecksig.c:622
+#: lib/rpmchecksig.c:653 lib/rpmchecksig.c:667
msgid " (UNTRUSTED KEYS:"
msgstr " (żŽÍę¤Ç¤­¤Ę¤¤¸°:"
-#: lib/rpmchecksig.c:610 lib/rpmchecksig.c:624
+#: lib/rpmchecksig.c:655 lib/rpmchecksig.c:669
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:618
+#: lib/rpmchecksig.c:663
msgid "OK"
msgstr ""
@@ -3515,126 +3515,126 @@ msgstr ""
msgid "Unable to open %s for reading: %s.\n"
msgstr "Ćɤߚţ¤ŕ¤ż¤á¤Ë %s ¤ňĽŞĄźĽ×Ľó¤Ç¤­¤Ţ¤ť¤ó: %sĄŁ"
-#: lib/signature.c:111
+#: lib/signature.c:112
msgid "file is not regular -- skipping size check\n"
msgstr ""
"ĽŐĽĄĽ¤Ľë¤Ď°ěČ̤μռĄĽ¤Ľë¤Ç¤Ď¤˘¤ę¤Ţ¤ť¤ó -- ĽľĽ¤ĽşĽÁĽ§ĽĂĽŻ¤ňĽšĽ­ĽĂĽ×¤ˇ¤Ţ¤š\n"
-#: lib/signature.c:120
+#: lib/signature.c:121
#, c-format
msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
msgstr ""
-#: lib/signature.c:125
+#: lib/signature.c:126
#, fuzzy, c-format
msgid " Actual size: %12d\n"
msgstr "˝đĚžĽľĽ¤Ľş: %d\n"
-#: lib/signature.c:145
+#: lib/signature.c:146
msgid "No signature\n"
msgstr "˝đĚž¤Ď¤˘¤ę¤Ţ¤ť¤ó\n"
-#: lib/signature.c:149
+#: lib/signature.c:150
msgid "Old PGP signature\n"
msgstr "¸Ĺ¤¤ PGP ˝đĚž\n"
-#: lib/signature.c:162
+#: lib/signature.c:163
#, fuzzy
msgid "Old (internal-only) signature! How did you get that!?\n"
msgstr "¸Ĺ¤¤(ĆâÉô¤Ŕ¤ą¤Î)˝đĚž! ¤É¤Ś¤ä¤Ă¤Ć¤˝¤ě¤ňźę¤Ë¤¤¤ě¤Ţ¤ˇ¤ż¤Ť!?"
-#: lib/signature.c:218
+#: lib/signature.c:219
#, fuzzy, c-format
msgid "Signature: size(%d)+pad(%d)\n"
msgstr "˝đĚžĽľĽ¤Ľş: %d\n"
-#: lib/signature.c:281
+#: lib/signature.c:282
#, fuzzy, c-format
msgid "Couldn't exec pgp (%s)\n"
msgstr "pgp ¤ňźÂšÔ¤Ç¤­¤Ţ¤ť¤ó(%s)"
-#: lib/signature.c:294
+#: lib/signature.c:295
#, fuzzy
msgid "pgp failed\n"
msgstr "pgp źşÇÔ"
#. PGP failed to write signature
#. Just in case
-#: lib/signature.c:301
+#: lib/signature.c:302
#, fuzzy
msgid "pgp failed to write signature\n"
msgstr "pgp ¤Ź˝đĚž¤ň˝ń¤­šţ¤ŕ¤Î¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż"
-#: lib/signature.c:306
+#: lib/signature.c:307
#, c-format
msgid "PGP sig size: %d\n"
msgstr "PGP ˝đĚžĽľĽ¤Ľş: %s\n"
-#: lib/signature.c:321 lib/signature.c:408
+#: lib/signature.c:322 lib/signature.c:409
#, fuzzy
msgid "unable to read the signature\n"
msgstr "˝đĚž¤ňĆɤळ¤Č¤Ź¤Ç¤­¤Ţ¤ť¤ó"
-#: lib/signature.c:326
+#: lib/signature.c:327
#, c-format
msgid "Got %d bytes of PGP sig\n"
msgstr "PGP ˝đĚž¤Î %d ĽĐĽ¤ĽČ¤ňźčĆŔ\n"
-#: lib/signature.c:368 lib/signature.c:498
+#: lib/signature.c:369 lib/signature.c:499
#, fuzzy
msgid "Couldn't exec gpg\n"
msgstr "gpg ¤ňźÂšÔ¤Ç¤­¤Ţ¤ť¤ó"
-#: lib/signature.c:381
+#: lib/signature.c:382
#, fuzzy
msgid "gpg failed\n"
msgstr "gpg źşÇÔ"
#. GPG failed to write signature
#. Just in case
-#: lib/signature.c:388
+#: lib/signature.c:389
#, fuzzy
msgid "gpg failed to write signature\n"
msgstr "gpg ¤Ź˝đĚž¤ň˝ń¤­šţ¤ŕ¤Î¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż"
-#: lib/signature.c:393
+#: lib/signature.c:394
#, fuzzy, c-format
msgid "GPG sig size: %d\n"
msgstr "GPG ˝đĚžĽľĽ¤Ľş: %s\n"
-#: lib/signature.c:413
+#: lib/signature.c:414
#, fuzzy, c-format
msgid "Got %d bytes of GPG sig\n"
msgstr "GPG ˝đĚž¤Î %d ĽĐĽ¤ĽČ¤ňźčĆŔ\n"
-#: lib/signature.c:441
+#: lib/signature.c:442
#, fuzzy
msgid "Generating signature using PGP.\n"
msgstr "PGP ¤ňťČÍѤˇ¤Ć˝đĚž¤ÎŔ¸ŔŽĂć\n"
-#: lib/signature.c:447
+#: lib/signature.c:448
#, fuzzy
msgid "Generating signature using GPG.\n"
msgstr "GPG ¤ňťČÍѤˇ¤Ć˝đĚž¤ÎŔ¸ŔŽĂć\n"
-#: lib/signature.c:527
+#: lib/signature.c:528
#, fuzzy
msgid "Couldn't exec pgp\n"
msgstr "pgp ¤ňźÂšÔ¤Ç¤­¤Ţ¤ť¤ó"
#. @notreached@
#. This case should have been screened out long ago.
-#: lib/signature.c:531 lib/signature.c:584
+#: lib/signature.c:532 lib/signature.c:585
#, fuzzy, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr "ĽŢĽŻĽíĽŐĽĄĽ¤ĽëĂć¤ÎĚľ¸ú¤Ę %%_signature ĄŁ\n"
-#: lib/signature.c:564
+#: lib/signature.c:565
#, fuzzy, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr "ĽŢĽŻĽíĽŐĽĄĽ¤Ľë¤Ë \"%%_pgp_name\" ¤ňŔßÄꤡ¤Ę¤ą¤ě¤Đ¤Ę¤ę¤Ţ¤ť¤ó"
-#: lib/signature.c:576
+#: lib/signature.c:577
#, fuzzy, c-format
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr "ĽŢĽŻĽíĽŐĽĄĽ¤Ľë¤Ë \"%%_pgp_name\" ¤ňŔßÄꤡ¤Ę¤ą¤ě¤Đ¤Ę¤ę¤Ţ¤ť¤ó"
@@ -4072,68 +4072,68 @@ msgstr "ĽŐĽĄĽ¤Ľë %s: %s"
msgid "File %s is smaller than %u bytes\n"
msgstr "ĽŐĽĄĽ¤Ľë %s: ¤Ď %d ĽĐĽ¤ĽČ¤č¤ęžŽ¤ľ¤¤¤Ç¤š"
-#: rpmio/rpmio.c:644
+#: rpmio/rpmio.c:656
msgid "Success"
msgstr "ŔŽ¸ů"
-#: rpmio/rpmio.c:647
+#: rpmio/rpmio.c:659
#, fuzzy
msgid "Bad server response"
msgstr "ĽľĄźĽĐ¤Ť¤éŔľžď¤ĘąţĹú¤Ź¤˘¤ę¤Ţ¤ť¤ó"
-#: rpmio/rpmio.c:650
+#: rpmio/rpmio.c:662
#, fuzzy
msgid "Server I/O error"
msgstr "ĽľĄźĽĐ IO Ľ¨ĽéĄź"
-#: rpmio/rpmio.c:653
+#: rpmio/rpmio.c:665
#, fuzzy
msgid "Server timeout"
msgstr "ĽľĄźĽĐĽżĽ¤ĽŕĽ˘ĽŚĽČ"
-#: rpmio/rpmio.c:656
+#: rpmio/rpmio.c:668
#, fuzzy
msgid "Unable to lookup server host address"
msgstr "ĽľĄźĽĐ¤ÎĽŰĽšĽČĽ˘ĽÉĽěĽš¤ňÄ´¤Ů¤é¤ě¤Ţ¤ť¤ó"
-#: rpmio/rpmio.c:659
+#: rpmio/rpmio.c:671
#, fuzzy
msgid "Unable to lookup server host name"
msgstr "ĽľĄźĽĐ¤ÎĽŰĽšĽČĚž¤ňÄ´¤Ů¤é¤ě¤Ţ¤ť¤ó"
-#: rpmio/rpmio.c:662
+#: rpmio/rpmio.c:674
#, fuzzy
msgid "Failed to connect to server"
msgstr "ĽľĄźĽĐ¤Ř¤ÎŔÜÂł¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż"
-#: rpmio/rpmio.c:665
+#: rpmio/rpmio.c:677
#, fuzzy
msgid "Failed to establish data connection to server"
msgstr "ĽľĄźĽĐ¤Č¤ÎĽÇĄźĽżĽłĽÍĽŻĽˇĽçĽó¤ÎłÎΊ¤ËźşÇÔ¤ˇ¤Ţ¤ˇ¤ż"
-#: rpmio/rpmio.c:668
+#: rpmio/rpmio.c:680
#, fuzzy
msgid "I/O error to local file"
msgstr "ĽíĄźĽŤĽëĽŐĽĄĽ¤Ľë¤Î IO Ľ¨ĽéĄź"
-#: rpmio/rpmio.c:671
+#: rpmio/rpmio.c:683
msgid "Error setting remote server to passive mode"
msgstr "ĽęĽâĄźĽČĽľĄźĽĐ¤ÎĽŃĽĂĽˇĽÖĽâĄźĽÉŔßÄ꼨ĽéĄź"
-#: rpmio/rpmio.c:674
+#: rpmio/rpmio.c:686
msgid "File not found on server"
msgstr "ĽľĄźĽĐžĺ¤ËĽŐĽĄĽ¤Ľë¤Ź¸Ť¤Ä¤Ť¤ę¤Ţ¤ť¤ó"
-#: rpmio/rpmio.c:677
+#: rpmio/rpmio.c:689
msgid "Abort in progress"
msgstr "˝čÍýĂć¤ÎĽ˘ĽÜĄźĽČ"
-#: rpmio/rpmio.c:681
+#: rpmio/rpmio.c:693
#, fuzzy
msgid "Unknown or unexpected error"
msgstr "ÉÔĚŔ¤â¤ˇ¤Ż¤ĎÍ˝´ü¤ť¤ĚĽ¨ĽéĄź"
-#: rpmio/rpmio.c:1353
+#: rpmio/rpmio.c:1365
#, c-format
msgid "logging into %s as %s, pw %s\n"
msgstr "%s ¤Ř %s pw %s ¤Č¤ˇ¤ĆĽíĽ°Ľ¤ĽóĂć\n"
diff --git a/po/ko.po b/po/ko.po
index 309c15244..f6e88c59b 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-19 15:08-0400\n"
+"POT-Creation-Date: 2001-10-20 16:18-0400\n"
"PO-Revision-Date: 2001-09-07 22:03+0900\n"
"Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
"Language-Team: GNU Translation project <ko@li.org>\n"
@@ -2223,12 +2223,12 @@ msgstr "ˇçÇÁ(LOOP):\n"
msgid "========== continuing tsort ...\n"
msgstr "========== tsort¸Ś ÁřÇŕÇŐ´Ď´Ů...\n"
-#: lib/formats.c:28 lib/formats.c:54 lib/formats.c:85 lib/formats.c:160
-#: lib/header.c:2902 lib/header.c:2923 lib/header.c:2945
+#: lib/formats.c:33 lib/formats.c:57 lib/formats.c:88 lib/formats.c:261
+#: lib/header.c:2929 lib/header.c:2950 lib/header.c:2972
msgid "(not a number)"
msgstr "(źýŔÚ°Ą žĆ´Ő´Ď´Ů)"
-#: lib/formats.c:128
+#: lib/formats.c:129 lib/formats.c:191 lib/formats.c:236
#, fuzzy
msgid "(not a blob)"
msgstr "(źýŔÚ°Ą žĆ´Ő´Ď´Ů)"
@@ -2390,7 +2390,7 @@ msgstr "ÇĽÇö˝ÄżĄź­ ':' ľÚżĄ '{' °Ą ÇĘżäÇŐ´Ď´Ů"
msgid "| expected at end of expression"
msgstr "ÇĽÇö˝ÄŔÇ łĄşÎşĐżĄ '|' °Ą ÇĘżäÇŐ´Ď´Ů"
-#: lib/header.c:2646
+#: lib/header.c:2673
msgid "(unknown type)"
msgstr "(žË źö žř´Â ŔŻÇü)"
@@ -3098,86 +3098,86 @@ msgstr "ąâˇĎ(record) šřČŁ %u (Ŕş)´Â ŔĐŔť źö žř˝Ŕ´Ď´Ů\n"
msgid "package %s is not installed\n"
msgstr "%s ĆĐĹ°Áö´Â źłÄĄľÇžî ŔÖÁö žĘ˝Ŕ´Ď´Ů\n"
-#: lib/rpmchecksig.c:46
+#: lib/rpmchecksig.c:47
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: żŠ´ÂľĽ ˝ÇĆĐÇß˝Ŕ´Ď´Ů: %s\n"
-#: lib/rpmchecksig.c:58
+#: lib/rpmchecksig.c:59
msgid "makeTempFile failed\n"
msgstr "makeTempFileżĄ ˝ÇĆĐÇß˝Ŕ´Ď´Ů\n"
-#: lib/rpmchecksig.c:100
+#: lib/rpmchecksig.c:101
#, c-format
msgid "%s: Fwrite failed: %s\n"
msgstr "%s: FwriteżĄ ˝ÇĆĐÇß˝Ŕ´Ď´Ů: %s\n"
-#: lib/rpmchecksig.c:106 lib/rpmchecksig.c:313
+#: lib/rpmchecksig.c:107 lib/rpmchecksig.c:326
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: FreadżĄ ˝ÇĆĐÇß˝Ŕ´Ď´Ů: %s\n"
-#: lib/rpmchecksig.c:143 lib/rpmchecksig.c:368
+#: lib/rpmchecksig.c:144 lib/rpmchecksig.c:401
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: readLeadżĄ ˝ÇĆĐÇß˝Ŕ´Ď´Ů\n"
-#: lib/rpmchecksig.c:148
+#: lib/rpmchecksig.c:149
#, c-format
msgid "%s: Can't sign v1.0 RPM\n"
msgstr "%s: v1.0 RPMŔş ź­¸íÇŇ źö žř˝Ŕ´Ď´Ů\n"
-#: lib/rpmchecksig.c:152
+#: lib/rpmchecksig.c:153
#, c-format
msgid "%s: Can't re-sign v2.0 RPM\n"
msgstr "%s: v2.0 RPMŔş Ŕç-ź­¸íÇŇ źö žř˝Ŕ´Ď´Ů\n"
-#: lib/rpmchecksig.c:161 lib/rpmchecksig.c:384
+#: lib/rpmchecksig.c:162 lib/rpmchecksig.c:417
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: rpmReadSignatureżĄ ˝ÇĆĐÇß˝Ŕ´Ď´Ů\n"
-#: lib/rpmchecksig.c:165 lib/rpmchecksig.c:389
+#: lib/rpmchecksig.c:166 lib/rpmchecksig.c:422
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: ŔŻČżÇŃ ź­¸íŔĚ žř˝Ŕ´Ď´Ů\n"
-#: lib/rpmchecksig.c:198
+#: lib/rpmchecksig.c:199
#, c-format
msgid "%s: writeLead failed: %s\n"
msgstr "%s: writeLeadżĄ ˝ÇĆĐÇß˝Ŕ´Ď´Ů: %s\n"
-#: lib/rpmchecksig.c:204
+#: lib/rpmchecksig.c:205
#, c-format
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: rpmWriteSignatureżĄ ˝ÇĆĐÇß˝Ŕ´Ď´Ů: %s\n"
-#: lib/rpmchecksig.c:374
+#: lib/rpmchecksig.c:407
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr "%s: ŔŻČżÇŃ ź­¸íŔĚ žř˝Ŕ´Ď´Ů (v1.0 RPM)\n"
-#: lib/rpmchecksig.c:604
+#: lib/rpmchecksig.c:649
msgid "NOT OK"
msgstr "żĂšŮ¸ŁÁö žĘŔ˝"
-#: lib/rpmchecksig.c:605 lib/rpmchecksig.c:619
+#: lib/rpmchecksig.c:650 lib/rpmchecksig.c:664
msgid " (MISSING KEYS:"
msgstr " (Ĺ°¸Ś ĂŁŔť źö žřŔ˝:"
-#: lib/rpmchecksig.c:607 lib/rpmchecksig.c:621
+#: lib/rpmchecksig.c:652 lib/rpmchecksig.c:666
msgid ") "
msgstr ") "
-#: lib/rpmchecksig.c:608 lib/rpmchecksig.c:622
+#: lib/rpmchecksig.c:653 lib/rpmchecksig.c:667
msgid " (UNTRUSTED KEYS:"
msgstr " (Ĺ°¸Ś ˝ĹˇÚÇŇ źö žřŔ˝:"
-#: lib/rpmchecksig.c:610 lib/rpmchecksig.c:624
+#: lib/rpmchecksig.c:655 lib/rpmchecksig.c:669
msgid ")"
msgstr ")"
-#: lib/rpmchecksig.c:618
+#: lib/rpmchecksig.c:663
msgid "OK"
msgstr "ČŽŔÎ"
@@ -3373,115 +3373,115 @@ msgstr "%s (Ŕť)¸Ś ŔĐŔť źö žř˝Ŕ´Ď´Ů, HOMEŔĚ łĘšŤ ĹŽ´Ď´Ů.\n"
msgid "Unable to open %s for reading: %s.\n"
msgstr "%s (Ŕť)¸Ś ż­ źö žřŔ˝: %s.\n"
-#: lib/signature.c:111
+#: lib/signature.c:112
msgid "file is not regular -- skipping size check\n"
msgstr "ĆÄŔĎŔĚ żĂšŮ¸ŁÁö(regular) žĘ˝Ŕ´Ď´Ů -- żëˇŽ °Ëťç¸Ś ťýˇŤÇŐ´Ď´Ů\n"
-#: lib/signature.c:120
+#: lib/signature.c:121
#, c-format
msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
msgstr "żšťó(Expected) żëˇŽ: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
-#: lib/signature.c:125
+#: lib/signature.c:126
#, c-format
msgid " Actual size: %12d\n"
msgstr " ˝ÇÁŚ żëˇŽ: %12d\n"
-#: lib/signature.c:145
+#: lib/signature.c:146
msgid "No signature\n"
msgstr "ź­¸íŔĚ žř˝Ŕ´Ď´Ů\n"
-#: lib/signature.c:149
+#: lib/signature.c:150
msgid "Old PGP signature\n"
msgstr "ŔĚŔü PGP ź­¸í\n"
-#: lib/signature.c:162
+#: lib/signature.c:163
msgid "Old (internal-only) signature! How did you get that!?\n"
msgstr "ŔĚŔü (łťşÎ-żë) ź­¸í! žîśť°Ô žňŔ¸źĚ˝Ŕ´Ďąî!?\n"
-#: lib/signature.c:218
+#: lib/signature.c:219
#, c-format
msgid "Signature: size(%d)+pad(%d)\n"
msgstr "ź­¸í: size(%d)+pad(%d)\n"
-#: lib/signature.c:281
+#: lib/signature.c:282
#, c-format
msgid "Couldn't exec pgp (%s)\n"
msgstr "pgp (%s) (Ŕť)¸Ś ˝ÇÇŕÇŇ źö žř˝Ŕ´Ď´Ů\n"
-#: lib/signature.c:294
+#: lib/signature.c:295
msgid "pgp failed\n"
msgstr "pgpżĄ ˝ÇĆĐÇÔ\n"
#. PGP failed to write signature
#. Just in case
-#: lib/signature.c:301
+#: lib/signature.c:302
msgid "pgp failed to write signature\n"
msgstr "pgp ź­¸íŔť ŔŰźşÇĎ´ÂľĽ ˝ÇĆĐÇß˝Ŕ´Ď´Ů\n"
-#: lib/signature.c:306
+#: lib/signature.c:307
#, c-format
msgid "PGP sig size: %d\n"
msgstr "PGP ź­¸í żëˇŽ: %d\n"
-#: lib/signature.c:321 lib/signature.c:408
+#: lib/signature.c:322 lib/signature.c:409
msgid "unable to read the signature\n"
msgstr "ź­¸íŔť ŔĐŔť źö žř˝Ŕ´Ď´Ů\n"
-#: lib/signature.c:326
+#: lib/signature.c:327
#, c-format
msgid "Got %d bytes of PGP sig\n"
msgstr "%d šŮŔĚĆŽŔÇ PGP ź­¸íŔť žňžú˝Ŕ´Ď´Ů\n"
-#: lib/signature.c:368 lib/signature.c:498
+#: lib/signature.c:369 lib/signature.c:499
msgid "Couldn't exec gpg\n"
msgstr "gpg¸Ś ˝ÇÇŕÇŇ źö žř˝Ŕ´Ď´Ů\n"
-#: lib/signature.c:381
+#: lib/signature.c:382
msgid "gpg failed\n"
msgstr "gpgżĄ ˝ÇĆĐÇÔ\n"
#. GPG failed to write signature
#. Just in case
-#: lib/signature.c:388
+#: lib/signature.c:389
msgid "gpg failed to write signature\n"
msgstr "gpg ź­¸íŔť ŔŰźşÇĎ´ÂľĽ ˝ÇĆĐÇß˝Ŕ´Ď´Ů\n"
-#: lib/signature.c:393
+#: lib/signature.c:394
#, c-format
msgid "GPG sig size: %d\n"
msgstr "GPG ź­¸í żëˇŽ: %d\n"
-#: lib/signature.c:413
+#: lib/signature.c:414
#, c-format
msgid "Got %d bytes of GPG sig\n"
msgstr "%d šŮŔĚĆŽŔÇ GPG ź­¸íŔť žňžú˝Ŕ´Ď´Ů\n"
-#: lib/signature.c:441
+#: lib/signature.c:442
msgid "Generating signature using PGP.\n"
msgstr "PGP¸Ś ťçżëÇĎżŠ ź­¸íŔť ťýźşÇŐ´Ď´Ů.\n"
-#: lib/signature.c:447
+#: lib/signature.c:448
msgid "Generating signature using GPG.\n"
msgstr "GPG¸Ś ťçżëÇĎżŠ ź­¸íŔť ťýźşÇŐ´Ď´Ů.\n"
-#: lib/signature.c:527
+#: lib/signature.c:528
msgid "Couldn't exec pgp\n"
msgstr "pgp¸Ś ˝ÇÇŕÇŇ źö žř˝Ŕ´Ď´Ů\n"
#. @notreached@
#. This case should have been screened out long ago.
-#: lib/signature.c:531 lib/signature.c:584
+#: lib/signature.c:532 lib/signature.c:585
#, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr "¸ĹĹŠˇÎ ĆÄŔĎżĄ şÎŔűÇŐÇŃ %%_signatureŔÇ łťżëŔĚ ŔÖ˝Ŕ´Ď´Ů\n"
-#: lib/signature.c:564
+#: lib/signature.c:565
#, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr "¸ĹĹŠˇÎ ĆÄŔĎżĄ \"%%_gpg_name\" Ŕť źłÁ¤ÇŘ ÁÖźĹžß ÇŐ´Ď´Ů\n"
-#: lib/signature.c:576
+#: lib/signature.c:577
#, c-format
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr "¸ĹĹŠˇÎ ĆÄŔĎżĄ \"%%_pgp_name\" Ŕť źłÁ¤ÇŘ ÁÖźĹžß ÇŐ´Ď´Ů\n"
@@ -3920,60 +3920,60 @@ msgstr "%s ĆÄŔĎ: %s\n"
msgid "File %s is smaller than %u bytes\n"
msgstr "%s ĆÄŔĎŔĚ %u šŮŔĚĆŽ żëˇŽş¸´Ů Ŕű˝Ŕ´Ď´Ů\n"
-#: rpmio/rpmio.c:644
+#: rpmio/rpmio.c:656
msgid "Success"
msgstr "źş°ř"
-#: rpmio/rpmio.c:647
+#: rpmio/rpmio.c:659
msgid "Bad server response"
msgstr "ź­šö ŔŔ´äŔĚ Ŕ߸řľÇžú˝Ŕ´Ď´Ů"
-#: rpmio/rpmio.c:650
+#: rpmio/rpmio.c:662
msgid "Server I/O error"
msgstr "ź­šö ŔÔ/ĂâˇÂ żŔˇůŔÔ´Ď´Ů"
-#: rpmio/rpmio.c:653
+#: rpmio/rpmio.c:665
msgid "Server timeout"
msgstr "ź­šö ´ëąâ˝Ă°ŁŔĚ ĂĘ°úľÇžú˝Ŕ´Ď´Ů"
-#: rpmio/rpmio.c:656
+#: rpmio/rpmio.c:668
msgid "Unable to lookup server host address"
msgstr "ź­šö ČŁ˝şĆŽ Á֟ҸŚ ĂŁŔť źö žř˝Ŕ´Ď´Ů"
-#: rpmio/rpmio.c:659
+#: rpmio/rpmio.c:671
msgid "Unable to lookup server host name"
msgstr "ź­šö ČŁ˝şĆŽ Ŕ̸§Ŕť ĂŁŔť źö žř˝Ŕ´Ď´Ů"
-#: rpmio/rpmio.c:662
+#: rpmio/rpmio.c:674
msgid "Failed to connect to server"
msgstr "ź­šöżĄ Á˘źÓÇĎ´ÂľĽ ˝ÇĆĐÇß˝Ŕ´Ď´Ů"
-#: rpmio/rpmio.c:665
+#: rpmio/rpmio.c:677
msgid "Failed to establish data connection to server"
msgstr "ź­šöˇÎ ŔÚˇá Á˘źÓŔť ˝ĂľľÇĎ´ÂľĽ ˝ÇĆĐÇß˝Ŕ´Ď´Ů"
-#: rpmio/rpmio.c:668
+#: rpmio/rpmio.c:680
msgid "I/O error to local file"
msgstr "ˇÎÄĂ ĆÄŔĎżĄ ŔÔ/ĂâˇÂ żŔˇů°Ą šßťýÇß˝Ŕ´Ď´Ů"
-#: rpmio/rpmio.c:671
+#: rpmio/rpmio.c:683
msgid "Error setting remote server to passive mode"
msgstr ""
"żř°Ý ź­šö¸Ś źöľż ¸đľĺ(passive mode)ˇÎ źłÁ¤ÇĎ´Â ľľÁß żŔˇů°Ą šßťýÇß˝Ŕ´Ď´Ů"
-#: rpmio/rpmio.c:674
+#: rpmio/rpmio.c:686
msgid "File not found on server"
msgstr "ź­šöżĄź­ ĆÄŔĎŔť ĂŁŔť źö žř˝Ŕ´Ď´Ů"
-#: rpmio/rpmio.c:677
+#: rpmio/rpmio.c:689
msgid "Abort in progress"
msgstr "ÁřÇŕŔĚ ÁߴܾǞú˝Ŕ´Ď´Ů"
-#: rpmio/rpmio.c:681
+#: rpmio/rpmio.c:693
msgid "Unknown or unexpected error"
msgstr "žË źö žř´Â ȤŔş żšťóÄĄ ¸řÇŃ żŔˇů°Ą šßťýÇß˝Ŕ´Ď´Ů"
-#: rpmio/rpmio.c:1353
+#: rpmio/rpmio.c:1365
#, c-format
msgid "logging into %s as %s, pw %s\n"
msgstr "%s żĄ %s (Ŕ¸)ˇÎ ąâˇĎ(logging)ÇŐ´Ď´Ů, pw %s\n"
diff --git a/po/no.po b/po/no.po
index 0cd136c9f..64fde0df7 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-19 15:08-0400\n"
+"POT-Creation-Date: 2001-10-20 16:18-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"
@@ -2218,12 +2218,12 @@ msgstr ""
msgid "========== continuing tsort ...\n"
msgstr ""
-#: lib/formats.c:28 lib/formats.c:54 lib/formats.c:85 lib/formats.c:160
-#: lib/header.c:2902 lib/header.c:2923 lib/header.c:2945
+#: lib/formats.c:33 lib/formats.c:57 lib/formats.c:88 lib/formats.c:261
+#: lib/header.c:2929 lib/header.c:2950 lib/header.c:2972
msgid "(not a number)"
msgstr ""
-#: lib/formats.c:128
+#: lib/formats.c:129 lib/formats.c:191 lib/formats.c:236
msgid "(not a blob)"
msgstr ""
@@ -2383,7 +2383,7 @@ msgstr ""
msgid "| expected at end of expression"
msgstr ""
-#: lib/header.c:2646
+#: lib/header.c:2673
msgid "(unknown type)"
msgstr "(ukjent type)"
@@ -3077,86 +3077,86 @@ msgstr ""
msgid "package %s is not installed\n"
msgstr "pakke %s er ikke installert\n"
-#: lib/rpmchecksig.c:46
+#: lib/rpmchecksig.c:47
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: ĺpne feilet: %s\n"
-#: lib/rpmchecksig.c:58
+#: lib/rpmchecksig.c:59
msgid "makeTempFile failed\n"
msgstr "makeTempFile feilet\n"
-#: lib/rpmchecksig.c:100
+#: lib/rpmchecksig.c:101
#, c-format
msgid "%s: Fwrite failed: %s\n"
msgstr "%s: Fwrite feilet: %s\n"
-#: lib/rpmchecksig.c:106 lib/rpmchecksig.c:313
+#: lib/rpmchecksig.c:107 lib/rpmchecksig.c:326
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: Fread feilet: %s\n"
-#: lib/rpmchecksig.c:143 lib/rpmchecksig.c:368
+#: lib/rpmchecksig.c:144 lib/rpmchecksig.c:401
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: readLead feilet\n"
-#: lib/rpmchecksig.c:148
+#: lib/rpmchecksig.c:149
#, c-format
msgid "%s: Can't sign v1.0 RPM\n"
msgstr "%s: kan ikke signere v1.0 RPM\n"
-#: lib/rpmchecksig.c:152
+#: lib/rpmchecksig.c:153
#, c-format
msgid "%s: Can't re-sign v2.0 RPM\n"
msgstr "%s: Kan ikke signere v2.0 RPM pĺ nytt\n"
-#: lib/rpmchecksig.c:161 lib/rpmchecksig.c:384
+#: lib/rpmchecksig.c:162 lib/rpmchecksig.c:417
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: rpmReadSignature feilet\n"
-#: lib/rpmchecksig.c:165 lib/rpmchecksig.c:389
+#: lib/rpmchecksig.c:166 lib/rpmchecksig.c:422
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Ingen signatur tilgjengelig\n"
-#: lib/rpmchecksig.c:198
+#: lib/rpmchecksig.c:199
#, c-format
msgid "%s: writeLead failed: %s\n"
msgstr "%s: writeLead feilet: %s\n"
-#: lib/rpmchecksig.c:204
+#: lib/rpmchecksig.c:205
#, c-format
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: rpmWriteSignature feilet: %s\n"
-#: lib/rpmchecksig.c:374
+#: lib/rpmchecksig.c:407
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr "%s: Ingen signatur tilgjengelig (v1.0 RPM)\n"
-#: lib/rpmchecksig.c:604
+#: lib/rpmchecksig.c:649
msgid "NOT OK"
msgstr "IKKE OK"
-#: lib/rpmchecksig.c:605 lib/rpmchecksig.c:619
+#: lib/rpmchecksig.c:650 lib/rpmchecksig.c:664
msgid " (MISSING KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:607 lib/rpmchecksig.c:621
+#: lib/rpmchecksig.c:652 lib/rpmchecksig.c:666
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:608 lib/rpmchecksig.c:622
+#: lib/rpmchecksig.c:653 lib/rpmchecksig.c:667
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:610 lib/rpmchecksig.c:624
+#: lib/rpmchecksig.c:655 lib/rpmchecksig.c:669
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:618
+#: lib/rpmchecksig.c:663
msgid "OK"
msgstr "OK"
@@ -3352,115 +3352,115 @@ msgstr ""
msgid "Unable to open %s for reading: %s.\n"
msgstr "Kunne ikke ĺpne spec fil %s: %s\n"
-#: lib/signature.c:111
+#: lib/signature.c:112
msgid "file is not regular -- skipping size check\n"
msgstr ""
-#: lib/signature.c:120
+#: lib/signature.c:121
#, c-format
msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
msgstr ""
-#: lib/signature.c:125
+#: lib/signature.c:126
#, c-format
msgid " Actual size: %12d\n"
msgstr ""
-#: lib/signature.c:145
+#: lib/signature.c:146
msgid "No signature\n"
msgstr ""
-#: lib/signature.c:149
+#: lib/signature.c:150
msgid "Old PGP signature\n"
msgstr ""
-#: lib/signature.c:162
+#: lib/signature.c:163
msgid "Old (internal-only) signature! How did you get that!?\n"
msgstr ""
-#: lib/signature.c:218
+#: lib/signature.c:219
#, c-format
msgid "Signature: size(%d)+pad(%d)\n"
msgstr ""
-#: lib/signature.c:281
+#: lib/signature.c:282
#, c-format
msgid "Couldn't exec pgp (%s)\n"
msgstr ""
-#: lib/signature.c:294
+#: lib/signature.c:295
msgid "pgp failed\n"
msgstr ""
#. PGP failed to write signature
#. Just in case
-#: lib/signature.c:301
+#: lib/signature.c:302
msgid "pgp failed to write signature\n"
msgstr ""
-#: lib/signature.c:306
+#: lib/signature.c:307
#, c-format
msgid "PGP sig size: %d\n"
msgstr ""
-#: lib/signature.c:321 lib/signature.c:408
+#: lib/signature.c:322 lib/signature.c:409
msgid "unable to read the signature\n"
msgstr ""
-#: lib/signature.c:326
+#: lib/signature.c:327
#, c-format
msgid "Got %d bytes of PGP sig\n"
msgstr ""
-#: lib/signature.c:368 lib/signature.c:498
+#: lib/signature.c:369 lib/signature.c:499
msgid "Couldn't exec gpg\n"
msgstr ""
-#: lib/signature.c:381
+#: lib/signature.c:382
msgid "gpg failed\n"
msgstr ""
#. GPG failed to write signature
#. Just in case
-#: lib/signature.c:388
+#: lib/signature.c:389
msgid "gpg failed to write signature\n"
msgstr ""
-#: lib/signature.c:393
+#: lib/signature.c:394
#, c-format
msgid "GPG sig size: %d\n"
msgstr ""
-#: lib/signature.c:413
+#: lib/signature.c:414
#, c-format
msgid "Got %d bytes of GPG sig\n"
msgstr ""
-#: lib/signature.c:441
+#: lib/signature.c:442
msgid "Generating signature using PGP.\n"
msgstr ""
-#: lib/signature.c:447
+#: lib/signature.c:448
msgid "Generating signature using GPG.\n"
msgstr ""
-#: lib/signature.c:527
+#: lib/signature.c:528
msgid "Couldn't exec pgp\n"
msgstr ""
#. @notreached@
#. This case should have been screened out long ago.
-#: lib/signature.c:531 lib/signature.c:584
+#: lib/signature.c:532 lib/signature.c:585
#, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr ""
-#: lib/signature.c:564
+#: lib/signature.c:565
#, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr ""
-#: lib/signature.c:576
+#: lib/signature.c:577
#, c-format
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr ""
@@ -3882,59 +3882,59 @@ msgstr "Fil %s: %s\n"
msgid "File %s is smaller than %u bytes\n"
msgstr "Fil %s er mindre enn %u bytes\n"
-#: rpmio/rpmio.c:644
+#: rpmio/rpmio.c:656
msgid "Success"
msgstr ""
-#: rpmio/rpmio.c:647
+#: rpmio/rpmio.c:659
msgid "Bad server response"
msgstr ""
-#: rpmio/rpmio.c:650
+#: rpmio/rpmio.c:662
msgid "Server I/O error"
msgstr ""
-#: rpmio/rpmio.c:653
+#: rpmio/rpmio.c:665
msgid "Server timeout"
msgstr ""
-#: rpmio/rpmio.c:656
+#: rpmio/rpmio.c:668
msgid "Unable to lookup server host address"
msgstr ""
-#: rpmio/rpmio.c:659
+#: rpmio/rpmio.c:671
msgid "Unable to lookup server host name"
msgstr ""
-#: rpmio/rpmio.c:662
+#: rpmio/rpmio.c:674
msgid "Failed to connect to server"
msgstr ""
-#: rpmio/rpmio.c:665
+#: rpmio/rpmio.c:677
msgid "Failed to establish data connection to server"
msgstr ""
-#: rpmio/rpmio.c:668
+#: rpmio/rpmio.c:680
msgid "I/O error to local file"
msgstr ""
-#: rpmio/rpmio.c:671
+#: rpmio/rpmio.c:683
msgid "Error setting remote server to passive mode"
msgstr ""
-#: rpmio/rpmio.c:674
+#: rpmio/rpmio.c:686
msgid "File not found on server"
msgstr ""
-#: rpmio/rpmio.c:677
+#: rpmio/rpmio.c:689
msgid "Abort in progress"
msgstr ""
-#: rpmio/rpmio.c:681
+#: rpmio/rpmio.c:693
msgid "Unknown or unexpected error"
msgstr ""
-#: rpmio/rpmio.c:1353
+#: rpmio/rpmio.c:1365
#, c-format
msgid "logging into %s as %s, pw %s\n"
msgstr ""
diff --git a/po/pl.po b/po/pl.po
index d88354109..3798e4779 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-19 15:08-0400\n"
+"POT-Creation-Date: 2001-10-20 16:18-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"
@@ -2279,12 +2279,12 @@ msgstr ""
msgid "========== continuing tsort ...\n"
msgstr ""
-#: lib/formats.c:28 lib/formats.c:54 lib/formats.c:85 lib/formats.c:160
-#: lib/header.c:2902 lib/header.c:2923 lib/header.c:2945
+#: lib/formats.c:33 lib/formats.c:57 lib/formats.c:88 lib/formats.c:261
+#: lib/header.c:2929 lib/header.c:2950 lib/header.c:2972
msgid "(not a number)"
msgstr "(nie jest liczbą)"
-#: lib/formats.c:128
+#: lib/formats.c:129 lib/formats.c:191 lib/formats.c:236
#, fuzzy
msgid "(not a blob)"
msgstr "(nie jest liczbą)"
@@ -2446,7 +2446,7 @@ msgstr "spodziewany { po : w wyrażeniu"
msgid "| expected at end of expression"
msgstr "spodziewany | na końcu wyrażenia"
-#: lib/header.c:2646
+#: lib/header.c:2673
msgid "(unknown type)"
msgstr "(nieznany typ)"
@@ -3190,87 +3190,87 @@ msgstr "nie można odczytać rekordu %d\n"
msgid "package %s is not installed\n"
msgstr "pakiet %s nie jest zainstalowany\n"
-#: lib/rpmchecksig.c:46
+#: lib/rpmchecksig.c:47
#, fuzzy, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: Open nie powiodło się\n"
-#: lib/rpmchecksig.c:58
+#: lib/rpmchecksig.c:59
#, fuzzy
msgid "makeTempFile failed\n"
msgstr "wykonanie nie powiodło się\n"
-#: lib/rpmchecksig.c:100
+#: lib/rpmchecksig.c:101
#, fuzzy, c-format
msgid "%s: Fwrite failed: %s\n"
msgstr "%s: readLead nie powiodło się\n"
-#: lib/rpmchecksig.c:106 lib/rpmchecksig.c:313
+#: lib/rpmchecksig.c:107 lib/rpmchecksig.c:326
#, fuzzy, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: readLead nie powiodło się\n"
-#: lib/rpmchecksig.c:143 lib/rpmchecksig.c:368
+#: lib/rpmchecksig.c:144 lib/rpmchecksig.c:401
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: readLead nie powiodło się\n"
-#: lib/rpmchecksig.c:148
+#: lib/rpmchecksig.c:149
#, c-format
msgid "%s: Can't sign v1.0 RPM\n"
msgstr "%s: Nie można podpisać v1.0 RPM\n"
-#: lib/rpmchecksig.c:152
+#: lib/rpmchecksig.c:153
#, c-format
msgid "%s: Can't re-sign v2.0 RPM\n"
msgstr "%s: Nie można ponownie podpisać v2.0 RPM\n"
-#: lib/rpmchecksig.c:161 lib/rpmchecksig.c:384
+#: lib/rpmchecksig.c:162 lib/rpmchecksig.c:417
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: rpmReadSignature nie powiodło się\n"
-#: lib/rpmchecksig.c:165 lib/rpmchecksig.c:389
+#: lib/rpmchecksig.c:166 lib/rpmchecksig.c:422
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Sygnatura nie jest dostępna\n"
-#: lib/rpmchecksig.c:198
+#: lib/rpmchecksig.c:199
#, fuzzy, c-format
msgid "%s: writeLead failed: %s\n"
msgstr "%s: readLead nie powiodło się\n"
-#: lib/rpmchecksig.c:204
+#: lib/rpmchecksig.c:205
#, fuzzy, c-format
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: rpmReadSignature nie powiodło się\n"
-#: lib/rpmchecksig.c:374
+#: lib/rpmchecksig.c:407
#, 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:604
+#: lib/rpmchecksig.c:649
msgid "NOT OK"
msgstr "NIE DOBRZE"
-#: lib/rpmchecksig.c:605 lib/rpmchecksig.c:619
+#: lib/rpmchecksig.c:650 lib/rpmchecksig.c:664
msgid " (MISSING KEYS:"
msgstr " (BRAK KLUCZY:"
-#: lib/rpmchecksig.c:607 lib/rpmchecksig.c:621
+#: lib/rpmchecksig.c:652 lib/rpmchecksig.c:666
msgid ") "
msgstr ") "
-#: lib/rpmchecksig.c:608 lib/rpmchecksig.c:622
+#: lib/rpmchecksig.c:653 lib/rpmchecksig.c:667
msgid " (UNTRUSTED KEYS:"
msgstr "(NIEWIARYGODNE KLUCZE:"
-#: lib/rpmchecksig.c:610 lib/rpmchecksig.c:624
+#: lib/rpmchecksig.c:655 lib/rpmchecksig.c:669
msgid ")"
msgstr ")"
-#: lib/rpmchecksig.c:618
+#: lib/rpmchecksig.c:663
msgid "OK"
msgstr "OK"
@@ -3467,125 +3467,125 @@ msgstr ""
msgid "Unable to open %s for reading: %s.\n"
msgstr "Nie można otworzyć %s do odczytu: %s."
-#: lib/signature.c:111
+#: lib/signature.c:112
msgid "file is not regular -- skipping size check\n"
msgstr "plik nieregularny -- sprawdzanie rozmiaru pominięte\n"
-#: lib/signature.c:120
+#: lib/signature.c:121
#, c-format
msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
msgstr ""
-#: lib/signature.c:125
+#: lib/signature.c:126
#, fuzzy, c-format
msgid " Actual size: %12d\n"
msgstr "Rozmiar sygnatury: %d\n"
-#: lib/signature.c:145
+#: lib/signature.c:146
msgid "No signature\n"
msgstr "Brak sygnatury\n"
-#: lib/signature.c:149
+#: lib/signature.c:150
msgid "Old PGP signature\n"
msgstr "Stara sygnatura PGP\n"
-#: lib/signature.c:162
+#: lib/signature.c:163
#, fuzzy
msgid "Old (internal-only) signature! How did you get that!?\n"
msgstr "Stara (tylko wewnętrzna) sygnatura! Skąd Ty to wziąłeś!?"
-#: lib/signature.c:218
+#: lib/signature.c:219
#, fuzzy, c-format
msgid "Signature: size(%d)+pad(%d)\n"
msgstr "Rozmiar sygnatury: %d\n"
-#: lib/signature.c:281
+#: lib/signature.c:282
#, fuzzy, c-format
msgid "Couldn't exec pgp (%s)\n"
msgstr "Nie można uruchomić pgp"
-#: lib/signature.c:294
+#: lib/signature.c:295
#, fuzzy
msgid "pgp failed\n"
msgstr "pgp nie powiodło się"
#. PGP failed to write signature
#. Just in case
-#: lib/signature.c:301
+#: lib/signature.c:302
#, fuzzy
msgid "pgp failed to write signature\n"
msgstr "zapisanie sygnatury przez pgp nie powiodło się"
-#: lib/signature.c:306
+#: lib/signature.c:307
#, c-format
msgid "PGP sig size: %d\n"
msgstr "rozmiar sygnatury PGP: %d\n"
-#: lib/signature.c:321 lib/signature.c:408
+#: lib/signature.c:322 lib/signature.c:409
#, fuzzy
msgid "unable to read the signature\n"
msgstr "nie można odczytać sygnatury"
-#: lib/signature.c:326
+#: lib/signature.c:327
#, c-format
msgid "Got %d bytes of PGP sig\n"
msgstr "Mam %d bajtów sygnatury PGP\n"
-#: lib/signature.c:368 lib/signature.c:498
+#: lib/signature.c:369 lib/signature.c:499
#, fuzzy
msgid "Couldn't exec gpg\n"
msgstr "Nie można uruchomić gpg"
-#: lib/signature.c:381
+#: lib/signature.c:382
#, fuzzy
msgid "gpg failed\n"
msgstr "gpg nie powiodło się"
#. GPG failed to write signature
#. Just in case
-#: lib/signature.c:388
+#: lib/signature.c:389
#, fuzzy
msgid "gpg failed to write signature\n"
msgstr "zapisanie sygnatury przez gpg nie powiodło się"
-#: lib/signature.c:393
+#: lib/signature.c:394
#, c-format
msgid "GPG sig size: %d\n"
msgstr "rozmiar sygnatury GPG: %d\n"
-#: lib/signature.c:413
+#: lib/signature.c:414
#, c-format
msgid "Got %d bytes of GPG sig\n"
msgstr "Mam %d bajtów sygnatury GPG\n"
-#: lib/signature.c:441
+#: lib/signature.c:442
#, fuzzy
msgid "Generating signature using PGP.\n"
msgstr "Generowanie sygnatury: %d\n"
-#: lib/signature.c:447
+#: lib/signature.c:448
#, fuzzy
msgid "Generating signature using GPG.\n"
msgstr "Generowanie sygnatury: %d\n"
-#: lib/signature.c:527
+#: lib/signature.c:528
#, fuzzy
msgid "Couldn't exec pgp\n"
msgstr "Nie można uruchomić pgp"
#. @notreached@
#. This case should have been screened out long ago.
-#: lib/signature.c:531 lib/signature.c:584
+#: lib/signature.c:532 lib/signature.c:585
#, fuzzy, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr "Błędny %%_signature spec w pliku makra.\n"
-#: lib/signature.c:564
+#: lib/signature.c:565
#, fuzzy, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr "Musisz ustawić \"%%_gpg_name\" w pliku swego makra"
-#: lib/signature.c:576
+#: lib/signature.c:577
#, fuzzy, c-format
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr "Musisz ustawić \"%%_pgp_name\" w pliku swego makra"
@@ -4020,61 +4020,61 @@ msgstr "Plik %s: %s"
msgid "File %s is smaller than %u bytes\n"
msgstr "Plik %s jest mniejszy niż %d bajtów"
-#: rpmio/rpmio.c:644
+#: rpmio/rpmio.c:656
msgid "Success"
msgstr "Sukces"
-#: rpmio/rpmio.c:647
+#: rpmio/rpmio.c:659
msgid "Bad server response"
msgstr "Błędna odpowiedź serwera"
-#: rpmio/rpmio.c:650
+#: rpmio/rpmio.c:662
#, fuzzy
msgid "Server I/O error"
msgstr "Błąd WE/WY(IO) serwera"
-#: rpmio/rpmio.c:653
+#: rpmio/rpmio.c:665
msgid "Server timeout"
msgstr "Przekroczony limit czasu serwera"
-#: rpmio/rpmio.c:656
+#: rpmio/rpmio.c:668
msgid "Unable to lookup server host address"
msgstr "Nie można znaleźć adresu serwera"
-#: rpmio/rpmio.c:659
+#: rpmio/rpmio.c:671
msgid "Unable to lookup server host name"
msgstr "Nie można znaleźć nazwy serwera"
-#: rpmio/rpmio.c:662
+#: rpmio/rpmio.c:674
msgid "Failed to connect to server"
msgstr "Połączenie z serwerem nie powiodło się"
-#: rpmio/rpmio.c:665
+#: rpmio/rpmio.c:677
msgid "Failed to establish data connection to server"
msgstr "Otwarcie transmisji danych z serwera nie powiodło się"
-#: rpmio/rpmio.c:668
+#: rpmio/rpmio.c:680
#, fuzzy
msgid "I/O error to local file"
msgstr "Błąd WE/WY(IO) na lokalnym pliku"
-#: rpmio/rpmio.c:671
+#: rpmio/rpmio.c:683
msgid "Error setting remote server to passive mode"
msgstr "Błąd: ustawienie zdalnego serwera w tryb pasywny nie powiodło się"
-#: rpmio/rpmio.c:674
+#: rpmio/rpmio.c:686
msgid "File not found on server"
msgstr "Plik nie został znaleziony na serwerze"
-#: rpmio/rpmio.c:677
+#: rpmio/rpmio.c:689
msgid "Abort in progress"
msgstr "Przerywanie ..."
-#: rpmio/rpmio.c:681
+#: rpmio/rpmio.c:693
msgid "Unknown or unexpected error"
msgstr "Nieznany lub nieoczekiwany błąd"
-#: rpmio/rpmio.c:1353
+#: rpmio/rpmio.c:1365
#, c-format
msgid "logging into %s as %s, pw %s\n"
msgstr "logowanie do %s jako %s, hasło %s\n"
diff --git a/po/pt.po b/po/pt.po
index 3484abb9c..55754f4eb 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-19 15:08-0400\n"
+"POT-Creation-Date: 2001-10-20 16:18-0400\n"
"PO-Revision-Date: 2000-06-22 01:13+01:00\n"
"Last-Translator: José Nuno Coelho Sanarra Pires\n"
"Language-Team: pt <kde@poli.org>\n"
@@ -2209,12 +2209,12 @@ msgstr "CICLO:\n"
msgid "========== continuing tsort ...\n"
msgstr "========== a prosseguir o tsort ...\n"
-#: lib/formats.c:28 lib/formats.c:54 lib/formats.c:85 lib/formats.c:160
-#: lib/header.c:2902 lib/header.c:2923 lib/header.c:2945
+#: lib/formats.c:33 lib/formats.c:57 lib/formats.c:88 lib/formats.c:261
+#: lib/header.c:2929 lib/header.c:2950 lib/header.c:2972
msgid "(not a number)"
msgstr "(năo é um número)"
-#: lib/formats.c:128
+#: lib/formats.c:129 lib/formats.c:191 lib/formats.c:236
#, fuzzy
msgid "(not a blob)"
msgstr "(năo é um número)"
@@ -2375,7 +2375,7 @@ msgstr "esperado um { a seguir ao : na expressăo"
msgid "| expected at end of expression"
msgstr "esperado um | no fim da expressăo"
-#: lib/header.c:2646
+#: lib/header.c:2673
msgid "(unknown type)"
msgstr "(tipo desconhecido)"
@@ -3083,86 +3083,86 @@ msgstr "o registo %d năo pôde ser lido\n"
msgid "package %s is not installed\n"
msgstr "o pacote %s năo está instalado\n"
-#: lib/rpmchecksig.c:46
+#: lib/rpmchecksig.c:47
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: o acesso falhou: %s\n"
-#: lib/rpmchecksig.c:58
+#: lib/rpmchecksig.c:59
msgid "makeTempFile failed\n"
msgstr "o makeTempFile falhou\n"
-#: lib/rpmchecksig.c:100
+#: lib/rpmchecksig.c:101
#, c-format
msgid "%s: Fwrite failed: %s\n"
msgstr "%s: O fwrite falhou: %s\n"
-#: lib/rpmchecksig.c:106 lib/rpmchecksig.c:313
+#: lib/rpmchecksig.c:107 lib/rpmchecksig.c:326
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: O fread falhou: %s\n"
-#: lib/rpmchecksig.c:143 lib/rpmchecksig.c:368
+#: lib/rpmchecksig.c:144 lib/rpmchecksig.c:401
#, c-format
msgid "%s: readLead failed\n"
msgstr ":%s: o readLead falhou\n"
-#: lib/rpmchecksig.c:148
+#: lib/rpmchecksig.c:149
#, c-format
msgid "%s: Can't sign v1.0 RPM\n"
msgstr "%s: Năo consigo assinar o RPM v1.0\n"
-#: lib/rpmchecksig.c:152
+#: lib/rpmchecksig.c:153
#, c-format
msgid "%s: Can't re-sign v2.0 RPM\n"
msgstr "%s: năo consigo assinar de novo o RPM v2.0\n"
-#: lib/rpmchecksig.c:161 lib/rpmchecksig.c:384
+#: lib/rpmchecksig.c:162 lib/rpmchecksig.c:417
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: o rpmReadSignature falhou\n"
-#: lib/rpmchecksig.c:165 lib/rpmchecksig.c:389
+#: lib/rpmchecksig.c:166 lib/rpmchecksig.c:422
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Nenhuma assinatura disponível\n"
-#: lib/rpmchecksig.c:198
+#: lib/rpmchecksig.c:199
#, c-format
msgid "%s: writeLead failed: %s\n"
msgstr "%s: o writeLead falhou: %s\n"
-#: lib/rpmchecksig.c:204
+#: lib/rpmchecksig.c:205
#, c-format
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: o rpmWriteSignature falhou: %s\n"
-#: lib/rpmchecksig.c:374
+#: lib/rpmchecksig.c:407
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr "%s: Nenhuma assinatura disponível (RPM v1.0)\n"
-#: lib/rpmchecksig.c:604
+#: lib/rpmchecksig.c:649
msgid "NOT OK"
msgstr "NĂO-OK"
-#: lib/rpmchecksig.c:605 lib/rpmchecksig.c:619
+#: lib/rpmchecksig.c:650 lib/rpmchecksig.c:664
msgid " (MISSING KEYS:"
msgstr " (FALTAM AS CHAVES:"
-#: lib/rpmchecksig.c:607 lib/rpmchecksig.c:621
+#: lib/rpmchecksig.c:652 lib/rpmchecksig.c:666
msgid ") "
msgstr ") "
-#: lib/rpmchecksig.c:608 lib/rpmchecksig.c:622
+#: lib/rpmchecksig.c:653 lib/rpmchecksig.c:667
msgid " (UNTRUSTED KEYS:"
msgstr " (CHAVES SUSPEITAS:"
-#: lib/rpmchecksig.c:610 lib/rpmchecksig.c:624
+#: lib/rpmchecksig.c:655 lib/rpmchecksig.c:669
msgid ")"
msgstr ")"
-#: lib/rpmchecksig.c:618
+#: lib/rpmchecksig.c:663
msgid "OK"
msgstr "OK"
@@ -3358,115 +3358,115 @@ msgstr "Năo consigo ler o %s, a HOME é demasiado grande.\n"
msgid "Unable to open %s for reading: %s.\n"
msgstr "Năo consegui abrir o %s para leitura: %s.\n"
-#: lib/signature.c:111
+#: lib/signature.c:112
msgid "file is not regular -- skipping size check\n"
msgstr "o ficheiro năo é normal -- a ignorar a verificaçăo do tamanho\n"
-#: lib/signature.c:120
+#: lib/signature.c:121
#, c-format
msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
msgstr "Esperado um tamanho: %12d = início(%d)+assin.(%d)+'pad'(%d)+dados(%d)\n"
-#: lib/signature.c:125
+#: lib/signature.c:126
#, c-format
msgid " Actual size: %12d\n"
msgstr " Tamanho real: %12d\n"
-#: lib/signature.c:145
+#: lib/signature.c:146
msgid "No signature\n"
msgstr "Sem assinatura\n"
-#: lib/signature.c:149
+#: lib/signature.c:150
msgid "Old PGP signature\n"
msgstr "Assinatura PGP antiga\n"
-#: lib/signature.c:162
+#: lib/signature.c:163
msgid "Old (internal-only) signature! How did you get that!?\n"
msgstr "Assinatura (só interna) antiga! Como é que obteve isto!?\n"
-#: lib/signature.c:218
+#: lib/signature.c:219
#, fuzzy, c-format
msgid "Signature: size(%d)+pad(%d)\n"
msgstr "Tamanho da assinatura: %d\n"
-#: lib/signature.c:281
+#: lib/signature.c:282
#, c-format
msgid "Couldn't exec pgp (%s)\n"
msgstr "Năo consigo executar o pgp (%s)\n"
-#: lib/signature.c:294
+#: lib/signature.c:295
msgid "pgp failed\n"
msgstr "o pgp falhou\n"
#. PGP failed to write signature
#. Just in case
-#: lib/signature.c:301
+#: lib/signature.c:302
msgid "pgp failed to write signature\n"
msgstr "o pgp năo conseguiu gravar a assinatura\n"
-#: lib/signature.c:306
+#: lib/signature.c:307
#, c-format
msgid "PGP sig size: %d\n"
msgstr "tamanho da assinatura do PGP: %d\n"
-#: lib/signature.c:321 lib/signature.c:408
+#: lib/signature.c:322 lib/signature.c:409
msgid "unable to read the signature\n"
msgstr "incapaz de ler a assinatura\n"
-#: lib/signature.c:326
+#: lib/signature.c:327
#, c-format
msgid "Got %d bytes of PGP sig\n"
msgstr "Obtive %d bytes da assinatura PGP\n"
-#: lib/signature.c:368 lib/signature.c:498
+#: lib/signature.c:369 lib/signature.c:499
msgid "Couldn't exec gpg\n"
msgstr "Năo consegui executar o gpg\n"
-#: lib/signature.c:381
+#: lib/signature.c:382
msgid "gpg failed\n"
msgstr "o gpg falhou\n"
#. GPG failed to write signature
#. Just in case
-#: lib/signature.c:388
+#: lib/signature.c:389
msgid "gpg failed to write signature\n"
msgstr "o gpg năo conseguiu gravar a assinatura\n"
-#: lib/signature.c:393
+#: lib/signature.c:394
#, c-format
msgid "GPG sig size: %d\n"
msgstr "Tamanho da assinatura do GPG: %d\n"
-#: lib/signature.c:413
+#: lib/signature.c:414
#, c-format
msgid "Got %d bytes of GPG sig\n"
msgstr "Obtive %d bytes da assinatura do GPG\n"
-#: lib/signature.c:441
+#: lib/signature.c:442
msgid "Generating signature using PGP.\n"
msgstr "A gerar a assinatura usando o PGP.\n"
-#: lib/signature.c:447
+#: lib/signature.c:448
msgid "Generating signature using GPG.\n"
msgstr "A gerar a assinatura usando o PGP.\n"
-#: lib/signature.c:527
+#: lib/signature.c:528
msgid "Couldn't exec pgp\n"
msgstr "Năo consegui executar o pgp\n"
#. @notreached@
#. This case should have been screened out long ago.
-#: lib/signature.c:531 lib/signature.c:584
+#: lib/signature.c:532 lib/signature.c:585
#, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr "'Spec' %%_signature inválido no ficheiro de macros\n"
-#: lib/signature.c:564
+#: lib/signature.c:565
#, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr "Precisa definir o \"%%_gpg_name\" no seu ficheiro de macros\n"
-#: lib/signature.c:576
+#: lib/signature.c:577
#, c-format
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr "Precisa definir o \"%%_pgp_name\" no seu ficheiro de macros\n"
@@ -3893,59 +3893,59 @@ msgstr "Ficheiro %s: %s\n"
msgid "File %s is smaller than %u bytes\n"
msgstr "O ficheiro %s tem menos de %u bytes\n"
-#: rpmio/rpmio.c:644
+#: rpmio/rpmio.c:656
msgid "Success"
msgstr "Sucesso"
-#: rpmio/rpmio.c:647
+#: rpmio/rpmio.c:659
msgid "Bad server response"
msgstr "Resposta errada do servidor"
-#: rpmio/rpmio.c:650
+#: rpmio/rpmio.c:662
msgid "Server I/O error"
msgstr "Erro de E/S do servidor"
-#: rpmio/rpmio.c:653
+#: rpmio/rpmio.c:665
msgid "Server timeout"
msgstr "Tempo de espera pelo servidor expirado"
-#: rpmio/rpmio.c:656
+#: rpmio/rpmio.c:668
msgid "Unable to lookup server host address"
msgstr "Incapaz de descobrir o endereço da máquina do servidor"
-#: rpmio/rpmio.c:659
+#: rpmio/rpmio.c:671
msgid "Unable to lookup server host name"
msgstr "Incapaz de descobrir o nome da máquina do servidor"
-#: rpmio/rpmio.c:662
+#: rpmio/rpmio.c:674
msgid "Failed to connect to server"
msgstr "Năo consegui ligar ao servidor"
-#: rpmio/rpmio.c:665
+#: rpmio/rpmio.c:677
msgid "Failed to establish data connection to server"
msgstr "Năo consigo estabelecer uma ligaçăo de dados ao servidor"
-#: rpmio/rpmio.c:668
+#: rpmio/rpmio.c:680
msgid "I/O error to local file"
msgstr "Erro de E/S no ficheiro local"
-#: rpmio/rpmio.c:671
+#: rpmio/rpmio.c:683
msgid "Error setting remote server to passive mode"
msgstr "Erro ao configurar o servidor remoto para o modo passivo"
-#: rpmio/rpmio.c:674
+#: rpmio/rpmio.c:686
msgid "File not found on server"
msgstr "Ficheiro năo encontrado no servidor"
-#: rpmio/rpmio.c:677
+#: rpmio/rpmio.c:689
msgid "Abort in progress"
msgstr "Interrupçăo em progresso"
-#: rpmio/rpmio.c:681
+#: rpmio/rpmio.c:693
msgid "Unknown or unexpected error"
msgstr "Erro desconhecido ou inesperado"
-#: rpmio/rpmio.c:1353
+#: rpmio/rpmio.c:1365
#, c-format
msgid "logging into %s as %s, pw %s\n"
msgstr "a ligar ao %s como %s com senha %s\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 194f651ba..b21cf5994 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -4,7 +4,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-19 15:08-0400\n"
+"POT-Creation-Date: 2001-10-20 16:18-0400\n"
# , c-format
#: build.c:37
@@ -2432,12 +2432,12 @@ msgstr ""
msgid "========== continuing tsort ...\n"
msgstr ""
-#: lib/formats.c:28 lib/formats.c:54 lib/formats.c:85 lib/formats.c:160
-#: lib/header.c:2902 lib/header.c:2923 lib/header.c:2945
+#: lib/formats.c:33 lib/formats.c:57 lib/formats.c:88 lib/formats.c:261
+#: lib/header.c:2929 lib/header.c:2950 lib/header.c:2972
msgid "(not a number)"
msgstr ""
-#: lib/formats.c:128
+#: lib/formats.c:129 lib/formats.c:191 lib/formats.c:236
msgid "(not a blob)"
msgstr ""
@@ -2606,7 +2606,7 @@ msgstr ""
msgid "| expected at end of expression"
msgstr ""
-#: lib/header.c:2646
+#: lib/header.c:2673
msgid "(unknown type)"
msgstr ""
@@ -3387,90 +3387,90 @@ msgid "package %s is not installed\n"
msgstr "no foi passado pacote para instalao"
# , c-format
-#: lib/rpmchecksig.c:46
+#: lib/rpmchecksig.c:47
#, fuzzy, c-format
msgid "%s: open failed: %s\n"
msgstr "No consegui abrir: %s\n"
-#: lib/rpmchecksig.c:58
+#: lib/rpmchecksig.c:59
#, fuzzy
msgid "makeTempFile failed\n"
msgstr "Construo falhou.\n"
# , c-format
-#: lib/rpmchecksig.c:100
+#: lib/rpmchecksig.c:101
#, fuzzy, c-format
msgid "%s: Fwrite failed: %s\n"
msgstr "No consegui abrir: %s\n"
# , c-format
-#: lib/rpmchecksig.c:106 lib/rpmchecksig.c:313
+#: lib/rpmchecksig.c:107 lib/rpmchecksig.c:326
#, fuzzy, c-format
msgid "%s: Fread failed: %s\n"
msgstr "No consegui abrir: %s\n"
-#: lib/rpmchecksig.c:143 lib/rpmchecksig.c:368
+#: lib/rpmchecksig.c:144 lib/rpmchecksig.c:401
#, c-format
msgid "%s: readLead failed\n"
msgstr ""
-#: lib/rpmchecksig.c:148
+#: lib/rpmchecksig.c:149
#, c-format
msgid "%s: Can't sign v1.0 RPM\n"
msgstr ""
-#: lib/rpmchecksig.c:152
+#: lib/rpmchecksig.c:153
#, c-format
msgid "%s: Can't re-sign v2.0 RPM\n"
msgstr ""
-#: lib/rpmchecksig.c:161 lib/rpmchecksig.c:384
+#: lib/rpmchecksig.c:162 lib/rpmchecksig.c:417
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/rpmchecksig.c:165 lib/rpmchecksig.c:389
+#: lib/rpmchecksig.c:166 lib/rpmchecksig.c:422
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/rpmchecksig.c:198
+#: lib/rpmchecksig.c:199
#, c-format
msgid "%s: writeLead failed: %s\n"
msgstr ""
# , c-format
-#: lib/rpmchecksig.c:204
+#: lib/rpmchecksig.c:205
#, fuzzy, c-format
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "No consegui abrir: %s\n"
-#: lib/rpmchecksig.c:374
+#: lib/rpmchecksig.c:407
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr ""
-#: lib/rpmchecksig.c:604
+#: lib/rpmchecksig.c:649
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:605 lib/rpmchecksig.c:619
+#: lib/rpmchecksig.c:650 lib/rpmchecksig.c:664
msgid " (MISSING KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:607 lib/rpmchecksig.c:621
+#: lib/rpmchecksig.c:652 lib/rpmchecksig.c:666
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:608 lib/rpmchecksig.c:622
+#: lib/rpmchecksig.c:653 lib/rpmchecksig.c:667
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:610 lib/rpmchecksig.c:624
+#: lib/rpmchecksig.c:655 lib/rpmchecksig.c:669
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:618
+#: lib/rpmchecksig.c:663
msgid "OK"
msgstr ""
@@ -3688,128 +3688,128 @@ msgstr ""
msgid "Unable to open %s for reading: %s.\n"
msgstr "No consegui abrir: %s\n"
-#: lib/signature.c:111
+#: lib/signature.c:112
msgid "file is not regular -- skipping size check\n"
msgstr ""
-#: lib/signature.c:120
+#: lib/signature.c:121
#, c-format
msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
msgstr ""
-#: lib/signature.c:125
+#: lib/signature.c:126
#, c-format
msgid " Actual size: %12d\n"
msgstr ""
-#: lib/signature.c:145
+#: lib/signature.c:146
msgid "No signature\n"
msgstr ""
-#: lib/signature.c:149
+#: lib/signature.c:150
#, fuzzy
msgid "Old PGP signature\n"
msgstr "gere assinatura PGP"
-#: lib/signature.c:162
+#: lib/signature.c:163
msgid "Old (internal-only) signature! How did you get that!?\n"
msgstr ""
-#: lib/signature.c:218
+#: lib/signature.c:219
#, c-format
msgid "Signature: size(%d)+pad(%d)\n"
msgstr ""
# , c-format
-#: lib/signature.c:281
+#: lib/signature.c:282
#, fuzzy, c-format
msgid "Couldn't exec pgp (%s)\n"
msgstr "No consegui ler o arquivo spec de %s\n"
-#: lib/signature.c:294
+#: lib/signature.c:295
#, fuzzy
msgid "pgp failed\n"
msgstr "Construo falhou.\n"
#. PGP failed to write signature
#. Just in case
-#: lib/signature.c:301
+#: lib/signature.c:302
#, fuzzy
msgid "pgp failed to write signature\n"
msgstr "gere assinatura PGP"
-#: lib/signature.c:306
+#: lib/signature.c:307
#, c-format
msgid "PGP sig size: %d\n"
msgstr ""
-#: lib/signature.c:321 lib/signature.c:408
+#: lib/signature.c:322 lib/signature.c:409
#, fuzzy
msgid "unable to read the signature\n"
msgstr "gere assinatura PGP"
-#: lib/signature.c:326
+#: lib/signature.c:327
#, c-format
msgid "Got %d bytes of PGP sig\n"
msgstr ""
# , c-format
-#: lib/signature.c:368 lib/signature.c:498
+#: lib/signature.c:369 lib/signature.c:499
#, fuzzy
msgid "Couldn't exec gpg\n"
msgstr "No consegui ler o arquivo spec de %s\n"
-#: lib/signature.c:381
+#: lib/signature.c:382
#, fuzzy
msgid "gpg failed\n"
msgstr "Construo falhou.\n"
#. GPG failed to write signature
#. Just in case
-#: lib/signature.c:388
+#: lib/signature.c:389
#, fuzzy
msgid "gpg failed to write signature\n"
msgstr "gere assinatura PGP"
-#: lib/signature.c:393
+#: lib/signature.c:394
#, c-format
msgid "GPG sig size: %d\n"
msgstr ""
-#: lib/signature.c:413
+#: lib/signature.c:414
#, c-format
msgid "Got %d bytes of GPG sig\n"
msgstr ""
-#: lib/signature.c:441
+#: lib/signature.c:442
#, fuzzy
msgid "Generating signature using PGP.\n"
msgstr "gere assinatura PGP"
-#: lib/signature.c:447
+#: lib/signature.c:448
#, fuzzy
msgid "Generating signature using GPG.\n"
msgstr "gere assinatura PGP"
# , c-format
-#: lib/signature.c:527
+#: lib/signature.c:528
#, fuzzy
msgid "Couldn't exec pgp\n"
msgstr "No consegui ler o arquivo spec de %s\n"
#. @notreached@
#. This case should have been screened out long ago.
-#: lib/signature.c:531 lib/signature.c:584
+#: lib/signature.c:532 lib/signature.c:585
#, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr ""
-#: lib/signature.c:564
+#: lib/signature.c:565
#, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr ""
-#: lib/signature.c:576
+#: lib/signature.c:577
#, c-format
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr ""
@@ -4261,59 +4261,59 @@ msgstr "No consegui ler o arquivo spec de %s\n"
msgid "File %s is smaller than %u bytes\n"
msgstr ""
-#: rpmio/rpmio.c:644
+#: rpmio/rpmio.c:656
msgid "Success"
msgstr ""
-#: rpmio/rpmio.c:647
+#: rpmio/rpmio.c:659
msgid "Bad server response"
msgstr ""
-#: rpmio/rpmio.c:650
+#: rpmio/rpmio.c:662
msgid "Server I/O error"
msgstr ""
-#: rpmio/rpmio.c:653
+#: rpmio/rpmio.c:665
msgid "Server timeout"
msgstr ""
-#: rpmio/rpmio.c:656
+#: rpmio/rpmio.c:668
msgid "Unable to lookup server host address"
msgstr ""
-#: rpmio/rpmio.c:659
+#: rpmio/rpmio.c:671
msgid "Unable to lookup server host name"
msgstr ""
-#: rpmio/rpmio.c:662
+#: rpmio/rpmio.c:674
msgid "Failed to connect to server"
msgstr ""
-#: rpmio/rpmio.c:665
+#: rpmio/rpmio.c:677
msgid "Failed to establish data connection to server"
msgstr ""
-#: rpmio/rpmio.c:668
+#: rpmio/rpmio.c:680
msgid "I/O error to local file"
msgstr ""
-#: rpmio/rpmio.c:671
+#: rpmio/rpmio.c:683
msgid "Error setting remote server to passive mode"
msgstr ""
-#: rpmio/rpmio.c:674
+#: rpmio/rpmio.c:686
msgid "File not found on server"
msgstr ""
-#: rpmio/rpmio.c:677
+#: rpmio/rpmio.c:689
msgid "Abort in progress"
msgstr ""
-#: rpmio/rpmio.c:681
+#: rpmio/rpmio.c:693
msgid "Unknown or unexpected error"
msgstr ""
-#: rpmio/rpmio.c:1353
+#: rpmio/rpmio.c:1365
#, c-format
msgid "logging into %s as %s, pw %s\n"
msgstr ""
diff --git a/po/ro.po b/po/ro.po
index caf7be740..3ff17bdd0 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-19 15:08-0400\n"
+"POT-Creation-Date: 2001-10-20 16:18-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"
@@ -2167,12 +2167,12 @@ msgstr ""
msgid "========== continuing tsort ...\n"
msgstr ""
-#: lib/formats.c:28 lib/formats.c:54 lib/formats.c:85 lib/formats.c:160
-#: lib/header.c:2902 lib/header.c:2923 lib/header.c:2945
+#: lib/formats.c:33 lib/formats.c:57 lib/formats.c:88 lib/formats.c:261
+#: lib/header.c:2929 lib/header.c:2950 lib/header.c:2972
msgid "(not a number)"
msgstr ""
-#: lib/formats.c:128
+#: lib/formats.c:129 lib/formats.c:191 lib/formats.c:236
msgid "(not a blob)"
msgstr ""
@@ -2332,7 +2332,7 @@ msgstr ""
msgid "| expected at end of expression"
msgstr ""
-#: lib/header.c:2646
+#: lib/header.c:2673
msgid "(unknown type)"
msgstr ""
@@ -3022,86 +3022,86 @@ msgstr ""
msgid "package %s is not installed\n"
msgstr ""
-#: lib/rpmchecksig.c:46
+#: lib/rpmchecksig.c:47
#, c-format
msgid "%s: open failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:58
+#: lib/rpmchecksig.c:59
msgid "makeTempFile failed\n"
msgstr ""
-#: lib/rpmchecksig.c:100
+#: lib/rpmchecksig.c:101
#, c-format
msgid "%s: Fwrite failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:106 lib/rpmchecksig.c:313
+#: lib/rpmchecksig.c:107 lib/rpmchecksig.c:326
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:143 lib/rpmchecksig.c:368
+#: lib/rpmchecksig.c:144 lib/rpmchecksig.c:401
#, c-format
msgid "%s: readLead failed\n"
msgstr ""
-#: lib/rpmchecksig.c:148
+#: lib/rpmchecksig.c:149
#, c-format
msgid "%s: Can't sign v1.0 RPM\n"
msgstr ""
-#: lib/rpmchecksig.c:152
+#: lib/rpmchecksig.c:153
#, c-format
msgid "%s: Can't re-sign v2.0 RPM\n"
msgstr ""
-#: lib/rpmchecksig.c:161 lib/rpmchecksig.c:384
+#: lib/rpmchecksig.c:162 lib/rpmchecksig.c:417
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/rpmchecksig.c:165 lib/rpmchecksig.c:389
+#: lib/rpmchecksig.c:166 lib/rpmchecksig.c:422
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/rpmchecksig.c:198
+#: lib/rpmchecksig.c:199
#, c-format
msgid "%s: writeLead failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:204
+#: lib/rpmchecksig.c:205
#, c-format
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:374
+#: lib/rpmchecksig.c:407
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr ""
-#: lib/rpmchecksig.c:604
+#: lib/rpmchecksig.c:649
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:605 lib/rpmchecksig.c:619
+#: lib/rpmchecksig.c:650 lib/rpmchecksig.c:664
msgid " (MISSING KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:607 lib/rpmchecksig.c:621
+#: lib/rpmchecksig.c:652 lib/rpmchecksig.c:666
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:608 lib/rpmchecksig.c:622
+#: lib/rpmchecksig.c:653 lib/rpmchecksig.c:667
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:610 lib/rpmchecksig.c:624
+#: lib/rpmchecksig.c:655 lib/rpmchecksig.c:669
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:618
+#: lib/rpmchecksig.c:663
msgid "OK"
msgstr ""
@@ -3297,115 +3297,115 @@ msgstr ""
msgid "Unable to open %s for reading: %s.\n"
msgstr ""
-#: lib/signature.c:111
+#: lib/signature.c:112
msgid "file is not regular -- skipping size check\n"
msgstr ""
-#: lib/signature.c:120
+#: lib/signature.c:121
#, c-format
msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
msgstr ""
-#: lib/signature.c:125
+#: lib/signature.c:126
#, c-format
msgid " Actual size: %12d\n"
msgstr ""
-#: lib/signature.c:145
+#: lib/signature.c:146
msgid "No signature\n"
msgstr ""
-#: lib/signature.c:149
+#: lib/signature.c:150
msgid "Old PGP signature\n"
msgstr ""
-#: lib/signature.c:162
+#: lib/signature.c:163
msgid "Old (internal-only) signature! How did you get that!?\n"
msgstr ""
-#: lib/signature.c:218
+#: lib/signature.c:219
#, c-format
msgid "Signature: size(%d)+pad(%d)\n"
msgstr ""
-#: lib/signature.c:281
+#: lib/signature.c:282
#, c-format
msgid "Couldn't exec pgp (%s)\n"
msgstr ""
-#: lib/signature.c:294
+#: lib/signature.c:295
msgid "pgp failed\n"
msgstr ""
#. PGP failed to write signature
#. Just in case
-#: lib/signature.c:301
+#: lib/signature.c:302
msgid "pgp failed to write signature\n"
msgstr ""
-#: lib/signature.c:306
+#: lib/signature.c:307
#, c-format
msgid "PGP sig size: %d\n"
msgstr ""
-#: lib/signature.c:321 lib/signature.c:408
+#: lib/signature.c:322 lib/signature.c:409
msgid "unable to read the signature\n"
msgstr ""
-#: lib/signature.c:326
+#: lib/signature.c:327
#, c-format
msgid "Got %d bytes of PGP sig\n"
msgstr ""
-#: lib/signature.c:368 lib/signature.c:498
+#: lib/signature.c:369 lib/signature.c:499
msgid "Couldn't exec gpg\n"
msgstr ""
-#: lib/signature.c:381
+#: lib/signature.c:382
msgid "gpg failed\n"
msgstr ""
#. GPG failed to write signature
#. Just in case
-#: lib/signature.c:388
+#: lib/signature.c:389
msgid "gpg failed to write signature\n"
msgstr ""
-#: lib/signature.c:393
+#: lib/signature.c:394
#, c-format
msgid "GPG sig size: %d\n"
msgstr ""
-#: lib/signature.c:413
+#: lib/signature.c:414
#, c-format
msgid "Got %d bytes of GPG sig\n"
msgstr ""
-#: lib/signature.c:441
+#: lib/signature.c:442
msgid "Generating signature using PGP.\n"
msgstr ""
-#: lib/signature.c:447
+#: lib/signature.c:448
msgid "Generating signature using GPG.\n"
msgstr ""
-#: lib/signature.c:527
+#: lib/signature.c:528
msgid "Couldn't exec pgp\n"
msgstr ""
#. @notreached@
#. This case should have been screened out long ago.
-#: lib/signature.c:531 lib/signature.c:584
+#: lib/signature.c:532 lib/signature.c:585
#, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr ""
-#: lib/signature.c:564
+#: lib/signature.c:565
#, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr ""
-#: lib/signature.c:576
+#: lib/signature.c:577
#, c-format
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr ""
@@ -3827,59 +3827,59 @@ msgstr ""
msgid "File %s is smaller than %u bytes\n"
msgstr ""
-#: rpmio/rpmio.c:644
+#: rpmio/rpmio.c:656
msgid "Success"
msgstr ""
-#: rpmio/rpmio.c:647
+#: rpmio/rpmio.c:659
msgid "Bad server response"
msgstr ""
-#: rpmio/rpmio.c:650
+#: rpmio/rpmio.c:662
msgid "Server I/O error"
msgstr ""
-#: rpmio/rpmio.c:653
+#: rpmio/rpmio.c:665
msgid "Server timeout"
msgstr ""
-#: rpmio/rpmio.c:656
+#: rpmio/rpmio.c:668
msgid "Unable to lookup server host address"
msgstr ""
-#: rpmio/rpmio.c:659
+#: rpmio/rpmio.c:671
msgid "Unable to lookup server host name"
msgstr ""
-#: rpmio/rpmio.c:662
+#: rpmio/rpmio.c:674
msgid "Failed to connect to server"
msgstr ""
-#: rpmio/rpmio.c:665
+#: rpmio/rpmio.c:677
msgid "Failed to establish data connection to server"
msgstr ""
-#: rpmio/rpmio.c:668
+#: rpmio/rpmio.c:680
msgid "I/O error to local file"
msgstr ""
-#: rpmio/rpmio.c:671
+#: rpmio/rpmio.c:683
msgid "Error setting remote server to passive mode"
msgstr ""
-#: rpmio/rpmio.c:674
+#: rpmio/rpmio.c:686
msgid "File not found on server"
msgstr ""
-#: rpmio/rpmio.c:677
+#: rpmio/rpmio.c:689
msgid "Abort in progress"
msgstr ""
-#: rpmio/rpmio.c:681
+#: rpmio/rpmio.c:693
msgid "Unknown or unexpected error"
msgstr ""
-#: rpmio/rpmio.c:1353
+#: rpmio/rpmio.c:1365
#, c-format
msgid "logging into %s as %s, pw %s\n"
msgstr ""
diff --git a/po/rpm.pot b/po/rpm.pot
index 5b84c68aa..18d3eaed5 100644
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-10-19 18:20-0400\n"
+"POT-Creation-Date: 2001-10-20 16:18-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"
@@ -2172,12 +2172,12 @@ msgstr ""
msgid "========== continuing tsort ...\n"
msgstr ""
-#: lib/formats.c:28 lib/formats.c:54 lib/formats.c:85 lib/formats.c:160
-#: lib/header.c:2902 lib/header.c:2923 lib/header.c:2945
+#: lib/formats.c:33 lib/formats.c:57 lib/formats.c:88 lib/formats.c:261
+#: lib/header.c:2929 lib/header.c:2950 lib/header.c:2972
msgid "(not a number)"
msgstr ""
-#: lib/formats.c:128
+#: lib/formats.c:129 lib/formats.c:191 lib/formats.c:236
msgid "(not a blob)"
msgstr ""
@@ -2337,7 +2337,7 @@ msgstr ""
msgid "| expected at end of expression"
msgstr ""
-#: lib/header.c:2646
+#: lib/header.c:2673
msgid "(unknown type)"
msgstr ""
@@ -3041,12 +3041,12 @@ msgstr ""
msgid "%s: Fwrite failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:107 lib/rpmchecksig.c:324
+#: lib/rpmchecksig.c:107 lib/rpmchecksig.c:326
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:144 lib/rpmchecksig.c:399
+#: lib/rpmchecksig.c:144 lib/rpmchecksig.c:401
#, c-format
msgid "%s: readLead failed\n"
msgstr ""
@@ -3061,12 +3061,12 @@ msgstr ""
msgid "%s: Can't re-sign v2.0 RPM\n"
msgstr ""
-#: lib/rpmchecksig.c:162 lib/rpmchecksig.c:415
+#: lib/rpmchecksig.c:162 lib/rpmchecksig.c:417
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/rpmchecksig.c:166 lib/rpmchecksig.c:420
+#: lib/rpmchecksig.c:166 lib/rpmchecksig.c:422
#, c-format
msgid "%s: No signature available\n"
msgstr ""
@@ -3081,32 +3081,32 @@ msgstr ""
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:405
+#: lib/rpmchecksig.c:407
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr ""
-#: lib/rpmchecksig.c:639
+#: lib/rpmchecksig.c:649
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:640 lib/rpmchecksig.c:654
+#: lib/rpmchecksig.c:650 lib/rpmchecksig.c:664
msgid " (MISSING KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:642 lib/rpmchecksig.c:656
+#: lib/rpmchecksig.c:652 lib/rpmchecksig.c:666
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:643 lib/rpmchecksig.c:657
+#: lib/rpmchecksig.c:653 lib/rpmchecksig.c:667
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:645 lib/rpmchecksig.c:659
+#: lib/rpmchecksig.c:655 lib/rpmchecksig.c:669
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:653
+#: lib/rpmchecksig.c:663
msgid "OK"
msgstr ""
@@ -3302,115 +3302,115 @@ msgstr ""
msgid "Unable to open %s for reading: %s.\n"
msgstr ""
-#: lib/signature.c:111
+#: lib/signature.c:112
msgid "file is not regular -- skipping size check\n"
msgstr ""
-#: lib/signature.c:120
+#: lib/signature.c:121
#, c-format
msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
msgstr ""
-#: lib/signature.c:125
+#: lib/signature.c:126
#, c-format
msgid " Actual size: %12d\n"
msgstr ""
-#: lib/signature.c:145
+#: lib/signature.c:146
msgid "No signature\n"
msgstr ""
-#: lib/signature.c:149
+#: lib/signature.c:150
msgid "Old PGP signature\n"
msgstr ""
-#: lib/signature.c:162
+#: lib/signature.c:163
msgid "Old (internal-only) signature! How did you get that!?\n"
msgstr ""
-#: lib/signature.c:218
+#: lib/signature.c:219
#, c-format
msgid "Signature: size(%d)+pad(%d)\n"
msgstr ""
-#: lib/signature.c:281
+#: lib/signature.c:282
#, c-format
msgid "Couldn't exec pgp (%s)\n"
msgstr ""
-#: lib/signature.c:294
+#: lib/signature.c:295
msgid "pgp failed\n"
msgstr ""
#. PGP failed to write signature
#. Just in case
-#: lib/signature.c:301
+#: lib/signature.c:302
msgid "pgp failed to write signature\n"
msgstr ""
-#: lib/signature.c:306
+#: lib/signature.c:307
#, c-format
msgid "PGP sig size: %d\n"
msgstr ""
-#: lib/signature.c:321 lib/signature.c:408
+#: lib/signature.c:322 lib/signature.c:409
msgid "unable to read the signature\n"
msgstr ""
-#: lib/signature.c:326
+#: lib/signature.c:327
#, c-format
msgid "Got %d bytes of PGP sig\n"
msgstr ""
-#: lib/signature.c:368 lib/signature.c:498
+#: lib/signature.c:369 lib/signature.c:499
msgid "Couldn't exec gpg\n"
msgstr ""
-#: lib/signature.c:381
+#: lib/signature.c:382
msgid "gpg failed\n"
msgstr ""
#. GPG failed to write signature
#. Just in case
-#: lib/signature.c:388
+#: lib/signature.c:389
msgid "gpg failed to write signature\n"
msgstr ""
-#: lib/signature.c:393
+#: lib/signature.c:394
#, c-format
msgid "GPG sig size: %d\n"
msgstr ""
-#: lib/signature.c:413
+#: lib/signature.c:414
#, c-format
msgid "Got %d bytes of GPG sig\n"
msgstr ""
-#: lib/signature.c:441
+#: lib/signature.c:442
msgid "Generating signature using PGP.\n"
msgstr ""
-#: lib/signature.c:447
+#: lib/signature.c:448
msgid "Generating signature using GPG.\n"
msgstr ""
-#: lib/signature.c:527
+#: lib/signature.c:528
msgid "Couldn't exec pgp\n"
msgstr ""
#. @notreached@
#. This case should have been screened out long ago.
-#: lib/signature.c:531 lib/signature.c:584
+#: lib/signature.c:532 lib/signature.c:585
#, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr ""
-#: lib/signature.c:564
+#: lib/signature.c:565
#, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr ""
-#: lib/signature.c:576
+#: lib/signature.c:577
#, c-format
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr ""
diff --git a/po/ru.po b/po/ru.po
index 82bbe6453..1b321fc38 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-19 15:08-0400\n"
+"POT-Creation-Date: 2001-10-20 16:18-0400\n"
"PO-Revision-Date: 2001-08-29 13:55-0400\n"
"Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
"Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
@@ -2239,12 +2239,12 @@ msgstr "ăéëě:\n"
msgid "========== continuing tsort ...\n"
msgstr "========== ĐŇĎÄĎĚÖĹÎÉĹ ŐĐĎŇŃÄĎŢĹÎÉŃ ...\n"
-#: lib/formats.c:28 lib/formats.c:54 lib/formats.c:85 lib/formats.c:160
-#: lib/header.c:2902 lib/header.c:2923 lib/header.c:2945
+#: lib/formats.c:33 lib/formats.c:57 lib/formats.c:88 lib/formats.c:261
+#: lib/header.c:2929 lib/header.c:2950 lib/header.c:2972
msgid "(not a number)"
msgstr "(ÎĹ ŢÉÓĚĎ)"
-#: lib/formats.c:128
+#: lib/formats.c:129 lib/formats.c:191 lib/formats.c:236
#, fuzzy
msgid "(not a blob)"
msgstr "(ÎĹ ŢÉÓĚĎ)"
@@ -2406,7 +2406,7 @@ msgstr "× ×ŮŇÁÖĹÎÉÉ ĐĎÓĚĹ \":\" ĎÖÉÄÁĚĎÓŘ \"{\""
msgid "| expected at end of expression"
msgstr "× ËĎÎĂĹ ×ŮŇÁÖĹÎÉŃ ĎÖÉÄÁĚÓŃ \"|\""
-#: lib/header.c:2646
+#: lib/header.c:2673
msgid "(unknown type)"
msgstr "(ÎĹÉÚ×ĹÓÔÎŮĘ ÔÉĐ)"
@@ -3109,86 +3109,86 @@ msgstr "ÎĹ×ĎÚÍĎÖÎĎ ĐŇĎŢÉÔÁÔŘ ÚÁĐÉÓŘ %u\n"
msgid "package %s is not installed\n"
msgstr "ĐÁËĹÔ %s ÎĹ ŐÓÔÁÎĎ×ĚĹÎ\n"
-#: lib/rpmchecksig.c:46
+#: lib/rpmchecksig.c:47
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: ĎŰÉÂËÁ ĎÔËŇŮÔÉŃ: %s\n"
-#: lib/rpmchecksig.c:58
+#: lib/rpmchecksig.c:59
msgid "makeTempFile failed\n"
msgstr "ĎŰÉÂËÁ makeTempFile\n"
-#: lib/rpmchecksig.c:100
+#: lib/rpmchecksig.c:101
#, c-format
msgid "%s: Fwrite failed: %s\n"
msgstr "%s: ĎŰÉÂËÁ Fwrite: %s\n"
-#: lib/rpmchecksig.c:106 lib/rpmchecksig.c:313
+#: lib/rpmchecksig.c:107 lib/rpmchecksig.c:326
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: ĎŰÉÂËÁ Fread: %s\n"
-#: lib/rpmchecksig.c:143 lib/rpmchecksig.c:368
+#: lib/rpmchecksig.c:144 lib/rpmchecksig.c:401
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: ĎŰÉÂËÁ readLead\n"
-#: lib/rpmchecksig.c:148
+#: lib/rpmchecksig.c:149
#, c-format
msgid "%s: Can't sign v1.0 RPM\n"
msgstr "%s: îĹ ÍĎÇŐ ĐĎÄĐÉÓÁÔŘ RPM v1.0\n"
-#: lib/rpmchecksig.c:152
+#: lib/rpmchecksig.c:153
#, c-format
msgid "%s: Can't re-sign v2.0 RPM\n"
msgstr "%s: îĹ ÍĎÇŐ ĐĹŇĹĐĎÄĐÉÓÁÔŘ RPM v2.0\n"
-#: lib/rpmchecksig.c:161 lib/rpmchecksig.c:384
+#: lib/rpmchecksig.c:162 lib/rpmchecksig.c:417
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: ĎŰÉÂËÁ rpmReadSignature\n"
-#: lib/rpmchecksig.c:165 lib/rpmchecksig.c:389
+#: lib/rpmchecksig.c:166 lib/rpmchecksig.c:422
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: đĎÄĐÉÓŘ ÎĹÄĎÓÔŐĐÎÁ\n"
-#: lib/rpmchecksig.c:198
+#: lib/rpmchecksig.c:199
#, c-format
msgid "%s: writeLead failed: %s\n"
msgstr "%s: ĎŰÉÂËÁ writeLead: %s\n"
-#: lib/rpmchecksig.c:204
+#: lib/rpmchecksig.c:205
#, c-format
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: ĎŰÉÂËÁ rpmWriteSignature: %s\n"
-#: lib/rpmchecksig.c:374
+#: lib/rpmchecksig.c:407
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr "%s: đĎÄĐÉÓÉ ÎĹÔ (RPM v1.0)\n"
-#: lib/rpmchecksig.c:604
+#: lib/rpmchecksig.c:649
msgid "NOT OK"
msgstr "îĺ Oë"
-#: lib/rpmchecksig.c:605 lib/rpmchecksig.c:619
+#: lib/rpmchecksig.c:650 lib/rpmchecksig.c:664
msgid " (MISSING KEYS:"
msgstr " (ďôóőôóô÷őŕô ëěŕţé:"
-#: lib/rpmchecksig.c:607 lib/rpmchecksig.c:621
+#: lib/rpmchecksig.c:652 lib/rpmchecksig.c:666
msgid ") "
msgstr ") "
-#: lib/rpmchecksig.c:608 lib/rpmchecksig.c:622
+#: lib/rpmchecksig.c:653 lib/rpmchecksig.c:667
msgid " (UNTRUSTED KEYS:"
msgstr " (îĺô äď÷ĺňéń ë ëěŕţáí:"
-#: lib/rpmchecksig.c:610 lib/rpmchecksig.c:624
+#: lib/rpmchecksig.c:655 lib/rpmchecksig.c:669
msgid ")"
msgstr ")"
-#: lib/rpmchecksig.c:618
+#: lib/rpmchecksig.c:663
msgid "OK"
msgstr "Oë"
@@ -3384,116 +3384,116 @@ msgstr "îĹ×ĎÚÍĎÖÎĎ ĐŇĎŢÉÔÁÔŘ %s, ÚÎÁŢĹÎÉĹ HOME ÓĚÉŰËĎÍ ×ĹĚÉËĎ.\n"
msgid "Unable to open %s for reading: %s.\n"
msgstr "îĹ×ĎÚÍĎÖÎĎ ĎÔËŇŮÔŘ %s ÄĚŃ ŢÔĹÎÉŃ: %s.\n"
-#: lib/signature.c:111
+#: lib/signature.c:112
msgid "file is not regular -- skipping size check\n"
msgstr "ÎĹĎÂŮŢÎŮĘ ĆÁĘĚ -- ĐŇĎĐŐÓËÁŔ ĐŇĎ×ĹŇËŐ ŇÁÚÍĹŇÁ\n"
-#: lib/signature.c:120
+#: lib/signature.c:121
#, c-format
msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
msgstr "ďÖÉÄÁĹÍŮĘ ŇÁÚÍĹŇ: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
-#: lib/signature.c:125
+#: lib/signature.c:126
#, c-format
msgid " Actual size: %12d\n"
msgstr "ćÁËÔÉŢĹÓËÉĘ ŇÁÚÍĹŇ: %12d\n"
-#: lib/signature.c:145
+#: lib/signature.c:146
msgid "No signature\n"
msgstr "đĎÄĐÉÓÉ ÎĹÔ\n"
-#: lib/signature.c:149
+#: lib/signature.c:150
msgid "Old PGP signature\n"
msgstr "óÔÁŇÁŃ ĐĎÄĐÉÓŘ PGP\n"
-#: lib/signature.c:162
+#: lib/signature.c:163
msgid "Old (internal-only) signature! How did you get that!?\n"
msgstr ""
"óÔÁŇÁŃ (ÔĎĚŘËĎ ÄĚŃ ×ÎŐÔŇĹÎÎĹÇĎ ÉÓĐĎĚŘÚĎ×ÁÎÉŃ) ĐĎÄĐÉÓŘ! çÄĹ ×Ů üôď ×ÚŃĚÉ!?\n"
-#: lib/signature.c:218
+#: lib/signature.c:219
#, c-format
msgid "Signature: size(%d)+pad(%d)\n"
msgstr "đĎÄĐÉÓŘ: ŇÁÚÍĹŇ(%d)+ÚÁĐĎĚÎĹÎÉĹ(%d)\n"
-#: lib/signature.c:281
+#: lib/signature.c:282
#, c-format
msgid "Couldn't exec pgp (%s)\n"
msgstr "î×ĎÚÍĎÖÎĎ ÚÁĐŐÓÔÉÔŘ pgp (%s)\n"
-#: lib/signature.c:294
+#: lib/signature.c:295
msgid "pgp failed\n"
msgstr "ĎŰÉÂËÁ pgp\n"
#. PGP failed to write signature
#. Just in case
-#: lib/signature.c:301
+#: lib/signature.c:302
msgid "pgp failed to write signature\n"
msgstr "ĎŰÉÂËÁ pgp ĐŇÉ ÚÁĐÉÓÉ ĐĎÄĐÉÓÉ\n"
-#: lib/signature.c:306
+#: lib/signature.c:307
#, c-format
msgid "PGP sig size: %d\n"
msgstr "ňÁÚÍĹŇ ĐĎÄĐÉÓÉ PGP: %d\n"
-#: lib/signature.c:321 lib/signature.c:408
+#: lib/signature.c:322 lib/signature.c:409
msgid "unable to read the signature\n"
msgstr "ÎĹ×ĎÚÍĎÖÎĎ ĐŇĎŢĹÓÔŘ ĐĎÄĐÉÓŘ\n"
-#: lib/signature.c:326
+#: lib/signature.c:327
#, c-format
msgid "Got %d bytes of PGP sig\n"
msgstr "đĎĚŐŢĹÎĎ %d ÂÁĘÔ ĐĎÄĐÉÓÉ PGP\n"
-#: lib/signature.c:368 lib/signature.c:498
+#: lib/signature.c:369 lib/signature.c:499
msgid "Couldn't exec gpg\n"
msgstr "îĹ×ĎÚÍĎÖÎĎ ÚÁĐŐÓÔÉÔŘ gpg\n"
-#: lib/signature.c:381
+#: lib/signature.c:382
msgid "gpg failed\n"
msgstr "ĎŰÉÂËÁ gpg\n"
#. GPG failed to write signature
#. Just in case
-#: lib/signature.c:388
+#: lib/signature.c:389
msgid "gpg failed to write signature\n"
msgstr "ĎŰÉÂËÁ gpg ĐŇÉ ÚÁĐÉÓÉ ĐĎÄĐÉÓÉ\n"
-#: lib/signature.c:393
+#: lib/signature.c:394
#, c-format
msgid "GPG sig size: %d\n"
msgstr "ňÁÚÍĹŇ ĐĎÄĐÉÓÉ GPG: %d\n"
-#: lib/signature.c:413
+#: lib/signature.c:414
#, c-format
msgid "Got %d bytes of GPG sig\n"
msgstr "đĎĚŐŢĹÎĎ %d ÂÁĘÔ ĐĎÄĐÉÓÉ GPG\n"
-#: lib/signature.c:441
+#: lib/signature.c:442
msgid "Generating signature using PGP.\n"
msgstr "çĹÎĹŇÉŇŐĹÔÓŃ ĐĎÄĐÉÓŘ PGP.\n"
-#: lib/signature.c:447
+#: lib/signature.c:448
msgid "Generating signature using GPG.\n"
msgstr "çĹÎĹŇÉŇŐĹÔÓŃ ĐĎÄĐÉÓŘ GPG.\n"
-#: lib/signature.c:527
+#: lib/signature.c:528
msgid "Couldn't exec pgp\n"
msgstr "îĹ×ĎÚÍĎÖÎĎ ÚÁĐŐÓÔÉÔŘ pgp\n"
#. @notreached@
#. This case should have been screened out long ago.
-#: lib/signature.c:531 lib/signature.c:584
+#: lib/signature.c:532 lib/signature.c:585
#, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr "îĹ×ĹŇÎÁŃ ÓĐĹĂÉĆÉËÁĂÉŃ %%_signature × ÍÁËŇĎĆÁĘĚĹ\n"
-#: lib/signature.c:564
+#: lib/signature.c:565
#, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr "÷Ů ÄĎĚÖÎŮ ŐÓÔÁÎĎ×ÉÔŘ \"%%_gpg_name\" × ×ÁŰĹÍ ÍÁËŇĎĆÁĘĚĹ\n"
-#: lib/signature.c:576
+#: lib/signature.c:577
#, c-format
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr "÷Ů ÄĎĚÖÎŮ ŐÓÔÁÎĎ×ÉÔŘ \"%%_pgp_name\" × ×ÁŰĹÍ ÍÁËŇĎĆÁĘĚĹ\n"
@@ -3930,59 +3930,59 @@ msgstr "ćÁĘĚ %s: %s\n"
msgid "File %s is smaller than %u bytes\n"
msgstr "äĚÉÎÁ ĆÁĘĚÁ %s ÍĹÎŘŰĹ ŢĹÍ %u ÂÁĘÔ\n"
-#: rpmio/rpmio.c:644
+#: rpmio/rpmio.c:656
msgid "Success"
msgstr "÷ŮĐĎĚÎĹÎĎ"
-#: rpmio/rpmio.c:647
+#: rpmio/rpmio.c:659
msgid "Bad server response"
msgstr "îĹ×ĹŇÎŮĘ ĎÔ×ĹÔ ÓĹŇ×ĹŇÁ"
-#: rpmio/rpmio.c:650
+#: rpmio/rpmio.c:662
msgid "Server I/O error"
msgstr "ďŰÉÂËÁ ××ĎÄÁ/×Ů×ĎÄÁ ÓĹŇ×ĹŇÁ"
-#: rpmio/rpmio.c:653
+#: rpmio/rpmio.c:665
msgid "Server timeout"
msgstr "ôÁĘÍÁŐÔ ÓĹŇ×ĹŇÁ"
-#: rpmio/rpmio.c:656
+#: rpmio/rpmio.c:668
msgid "Unable to lookup server host address"
msgstr "îĹ ÍĎÇŐ ÎÁĘÔÉ ÁÄŇĹÓ ÓĹŇ×ĹŇÁ"
-#: rpmio/rpmio.c:659
+#: rpmio/rpmio.c:671
msgid "Unable to lookup server host name"
msgstr "îĹ ÍĎÇŐ ÎÁĘÔÉ ÉÍŃ ÓĹŇ×ĹŇÁ"
-#: rpmio/rpmio.c:662
+#: rpmio/rpmio.c:674
msgid "Failed to connect to server"
msgstr "îĹ ÍĎÇŐ ÓĎĹÄÉÎÉÔŘÓŃ Ó ÓĹŇ×ĹŇĎÍ"
-#: rpmio/rpmio.c:665
+#: rpmio/rpmio.c:677
msgid "Failed to establish data connection to server"
msgstr "îĹ ÍĎÇŐ ŐÓÔÁÎĎ×ÉÔŘ ÓĎĹÄÉÎĹÎÉĹ ÄĚŃ ÄÁÎÎŮČ Ó ÓĹŇ×ĹŇĎÍ"
-#: rpmio/rpmio.c:668
+#: rpmio/rpmio.c:680
msgid "I/O error to local file"
msgstr "ćÁĘĚĎ×ÁŃ ĎŰÉÂËÁ ××ĎÄÁ/×Ů×ĎÄÁ"
-#: rpmio/rpmio.c:671
+#: rpmio/rpmio.c:683
msgid "Error setting remote server to passive mode"
msgstr "ďŰÉÂËÁ ĐŇÉ ĐĹŇĹ×ĎÄĹ ŐÄÁĚĹÎÎĎÇĎ ÓĹŇ×ĹŇÁ × ĐÁÓÓÉ×ÎŮĘ ŇĹÖÉÍ"
-#: rpmio/rpmio.c:674
+#: rpmio/rpmio.c:686
msgid "File not found on server"
msgstr "ćÁĘĚ ÎĹ ÎÁĘÄĹÎ ÎÁ ÓĹŇ×ĹŇĹ"
-#: rpmio/rpmio.c:677
+#: rpmio/rpmio.c:689
msgid "Abort in progress"
msgstr "ďÔÍĹÎÁ × ĐŇĎĂĹÓÓĹ"
-#: rpmio/rpmio.c:681
+#: rpmio/rpmio.c:693
msgid "Unknown or unexpected error"
msgstr "îĹÉÚ×ĹÓÔÎÁŃ ÉĚÉ ÎĹĎÖÉÄÁÎÎÁŃ ĎŰÉÂËÁ"
-#: rpmio/rpmio.c:1353
+#: rpmio/rpmio.c:1365
#, c-format
msgid "logging into %s as %s, pw %s\n"
msgstr "ŇĹÇÉÓÔŇÉŇŐŔÓŘ × %s ËÁË %s, ĐÁŇĎĚŘ %s\n"
diff --git a/po/sk.po b/po/sk.po
index 526da7f37..f63c3f313 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-19 15:08-0400\n"
+"POT-Creation-Date: 2001-10-20 16:18-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"
@@ -2286,12 +2286,12 @@ msgstr ""
msgid "========== continuing tsort ...\n"
msgstr ""
-#: lib/formats.c:28 lib/formats.c:54 lib/formats.c:85 lib/formats.c:160
-#: lib/header.c:2902 lib/header.c:2923 lib/header.c:2945
+#: lib/formats.c:33 lib/formats.c:57 lib/formats.c:88 lib/formats.c:261
+#: lib/header.c:2929 lib/header.c:2950 lib/header.c:2972
msgid "(not a number)"
msgstr "(nie je číslo)"
-#: lib/formats.c:128
+#: lib/formats.c:129 lib/formats.c:191 lib/formats.c:236
#, fuzzy
msgid "(not a blob)"
msgstr "(nie je číslo)"
@@ -2453,7 +2453,7 @@ msgstr "{ očakávané po : vo výraze"
msgid "| expected at end of expression"
msgstr "| očakávené na konci výrazu"
-#: lib/header.c:2646
+#: lib/header.c:2673
msgid "(unknown type)"
msgstr "(neznámy typ)"
@@ -3196,87 +3196,87 @@ msgstr "záznam %d nie je možné prečítať\n"
msgid "package %s is not installed\n"
msgstr "balík %s nie je nainštalovaný\n"
-#: lib/rpmchecksig.c:46
+#: lib/rpmchecksig.c:47
#, fuzzy, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: otvorenie zlyhalo\n"
-#: lib/rpmchecksig.c:58
+#: lib/rpmchecksig.c:59
#, fuzzy
msgid "makeTempFile failed\n"
msgstr "vykonanie zlyhalo\n"
-#: lib/rpmchecksig.c:100
+#: lib/rpmchecksig.c:101
#, fuzzy, c-format
msgid "%s: Fwrite failed: %s\n"
msgstr "%s: readLead zlyhalo\n"
-#: lib/rpmchecksig.c:106 lib/rpmchecksig.c:313
+#: lib/rpmchecksig.c:107 lib/rpmchecksig.c:326
#, fuzzy, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: readLead zlyhalo\n"
-#: lib/rpmchecksig.c:143 lib/rpmchecksig.c:368
+#: lib/rpmchecksig.c:144 lib/rpmchecksig.c:401
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: readLead zlyhalo\n"
-#: lib/rpmchecksig.c:148
+#: lib/rpmchecksig.c:149
#, c-format
msgid "%s: Can't sign v1.0 RPM\n"
msgstr "%s: Nie je možné podpísať v1.0 RPM\n"
-#: lib/rpmchecksig.c:152
+#: lib/rpmchecksig.c:153
#, c-format
msgid "%s: Can't re-sign v2.0 RPM\n"
msgstr "%s: Nie je možné znovu podpísať v2.0 RPM\n"
-#: lib/rpmchecksig.c:161 lib/rpmchecksig.c:384
+#: lib/rpmchecksig.c:162 lib/rpmchecksig.c:417
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: rpmReadSignature zlyhalo\n"
-#: lib/rpmchecksig.c:165 lib/rpmchecksig.c:389
+#: lib/rpmchecksig.c:166 lib/rpmchecksig.c:422
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Podpis nie je k dispozícii\n"
-#: lib/rpmchecksig.c:198
+#: lib/rpmchecksig.c:199
#, fuzzy, c-format
msgid "%s: writeLead failed: %s\n"
msgstr "%s: readLead zlyhalo\n"
-#: lib/rpmchecksig.c:204
+#: lib/rpmchecksig.c:205
#, fuzzy, c-format
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: rpmReadSignature zlyhalo\n"
-#: lib/rpmchecksig.c:374
+#: lib/rpmchecksig.c:407
#, 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:604
+#: lib/rpmchecksig.c:649
msgid "NOT OK"
msgstr "NIE JE V PORIADKU"
-#: lib/rpmchecksig.c:605 lib/rpmchecksig.c:619
+#: lib/rpmchecksig.c:650 lib/rpmchecksig.c:664
msgid " (MISSING KEYS:"
msgstr " (CHÝBAJÚCE KĽÚČE):"
-#: lib/rpmchecksig.c:607 lib/rpmchecksig.c:621
+#: lib/rpmchecksig.c:652 lib/rpmchecksig.c:666
msgid ") "
msgstr ") "
-#: lib/rpmchecksig.c:608 lib/rpmchecksig.c:622
+#: lib/rpmchecksig.c:653 lib/rpmchecksig.c:667
msgid " (UNTRUSTED KEYS:"
msgstr " (NEDÔVERUJE SA KĽÚČOM: "
-#: lib/rpmchecksig.c:610 lib/rpmchecksig.c:624
+#: lib/rpmchecksig.c:655 lib/rpmchecksig.c:669
msgid ")"
msgstr ")"
-#: lib/rpmchecksig.c:618
+#: lib/rpmchecksig.c:663
msgid "OK"
msgstr "V PORIADKU"
@@ -3473,125 +3473,125 @@ msgstr ""
msgid "Unable to open %s for reading: %s.\n"
msgstr "Nie je možné otvoriť %s pre čítanie: %s."
-#: lib/signature.c:111
+#: lib/signature.c:112
msgid "file is not regular -- skipping size check\n"
msgstr "nejde o bežný súbor - kontrola veľkosti vynechaná\n"
-#: lib/signature.c:120
+#: lib/signature.c:121
#, c-format
msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
msgstr ""
-#: lib/signature.c:125
+#: lib/signature.c:126
#, fuzzy, c-format
msgid " Actual size: %12d\n"
msgstr "Veľkosť podpisu: %d\n"
-#: lib/signature.c:145
+#: lib/signature.c:146
msgid "No signature\n"
msgstr "Podpis nie je k dispozícii\n"
-#: lib/signature.c:149
+#: lib/signature.c:150
msgid "Old PGP signature\n"
msgstr "Starý PGP podpis\n"
-#: lib/signature.c:162
+#: lib/signature.c:163
#, fuzzy
msgid "Old (internal-only) signature! How did you get that!?\n"
msgstr "Starý (iba interný) podpis! Ako ste sa k tomu dostali?!"
-#: lib/signature.c:218
+#: lib/signature.c:219
#, fuzzy, c-format
msgid "Signature: size(%d)+pad(%d)\n"
msgstr "Veľkosť podpisu: %d\n"
-#: lib/signature.c:281
+#: lib/signature.c:282
#, fuzzy, c-format
msgid "Couldn't exec pgp (%s)\n"
msgstr "Nie je možné spustiť pgp"
-#: lib/signature.c:294
+#: lib/signature.c:295
#, fuzzy
msgid "pgp failed\n"
msgstr "pgp zlyhalo"
#. PGP failed to write signature
#. Just in case
-#: lib/signature.c:301
+#: lib/signature.c:302
#, fuzzy
msgid "pgp failed to write signature\n"
msgstr "pgp sa nepodarilo zapísať podpis"
-#: lib/signature.c:306
+#: lib/signature.c:307
#, c-format
msgid "PGP sig size: %d\n"
msgstr "Veľkosť PGP podpisu: %d\n"
-#: lib/signature.c:321 lib/signature.c:408
+#: lib/signature.c:322 lib/signature.c:409
#, fuzzy
msgid "unable to read the signature\n"
msgstr "nie je možné prečítať podpis"
-#: lib/signature.c:326
+#: lib/signature.c:327
#, c-format
msgid "Got %d bytes of PGP sig\n"
msgstr "Prečítaný PGP podpis obsahuje %d bajtov\n"
-#: lib/signature.c:368 lib/signature.c:498
+#: lib/signature.c:369 lib/signature.c:499
#, fuzzy
msgid "Couldn't exec gpg\n"
msgstr "Nie je možné spustiť gpg"
-#: lib/signature.c:381
+#: lib/signature.c:382
#, fuzzy
msgid "gpg failed\n"
msgstr "gpg zlyhalo"
#. GPG failed to write signature
#. Just in case
-#: lib/signature.c:388
+#: lib/signature.c:389
#, fuzzy
msgid "gpg failed to write signature\n"
msgstr "gpg sa nepodarilo zapísať podpis"
-#: lib/signature.c:393
+#: lib/signature.c:394
#, c-format
msgid "GPG sig size: %d\n"
msgstr "Veľkosť GPG podpisu: %d\n"
-#: lib/signature.c:413
+#: lib/signature.c:414
#, c-format
msgid "Got %d bytes of GPG sig\n"
msgstr "Prečítaný GPG podpis obsahuje %d bajtov\n"
-#: lib/signature.c:441
+#: lib/signature.c:442
#, fuzzy
msgid "Generating signature using PGP.\n"
msgstr "Vytvára sa PGP podpis: %d\n"
-#: lib/signature.c:447
+#: lib/signature.c:448
#, fuzzy
msgid "Generating signature using GPG.\n"
msgstr "Vytvára sa PGP podpis: %d\n"
-#: lib/signature.c:527
+#: lib/signature.c:528
#, fuzzy
msgid "Couldn't exec pgp\n"
msgstr "Nie je možné spustiť pgp"
#. @notreached@
#. This case should have been screened out long ago.
-#: lib/signature.c:531 lib/signature.c:584
+#: lib/signature.c:532 lib/signature.c:585
#, fuzzy, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr "Chybná špecifikácia %%_signature v makro-súbore.\n"
-#: lib/signature.c:564
+#: lib/signature.c:565
#, fuzzy, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr "Musíte nastaviť \"%%gpg_name\" vo vašom makro-súbore"
-#: lib/signature.c:576
+#: lib/signature.c:577
#, fuzzy, c-format
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr "Musíte nastaviť \"%%pgp_name\" vo vašom makro-súbore"
@@ -4026,61 +4026,61 @@ msgstr "Súbor %s: %s"
msgid "File %s is smaller than %u bytes\n"
msgstr "Súbor %s je menší ako %d bajtov"
-#: rpmio/rpmio.c:644
+#: rpmio/rpmio.c:656
msgid "Success"
msgstr "Úspech"
-#: rpmio/rpmio.c:647
+#: rpmio/rpmio.c:659
msgid "Bad server response"
msgstr "Chybná odpoveď servera"
-#: rpmio/rpmio.c:650
+#: rpmio/rpmio.c:662
#, fuzzy
msgid "Server I/O error"
msgstr "Chyba vstupu/výstupu servera"
-#: rpmio/rpmio.c:653
+#: rpmio/rpmio.c:665
msgid "Server timeout"
msgstr "Prekročenie časového limitu servera"
-#: rpmio/rpmio.c:656
+#: rpmio/rpmio.c:668
msgid "Unable to lookup server host address"
msgstr "Nie je možné vyhľadať adresu servera"
-#: rpmio/rpmio.c:659
+#: rpmio/rpmio.c:671
msgid "Unable to lookup server host name"
msgstr "Nie je možné vyhľadať názov servera"
-#: rpmio/rpmio.c:662
+#: rpmio/rpmio.c:674
msgid "Failed to connect to server"
msgstr "Pripojenie k serveru zlyhalo"
-#: rpmio/rpmio.c:665
+#: rpmio/rpmio.c:677
msgid "Failed to establish data connection to server"
msgstr "Vytvorenie dátového spojenia k serveru zlyhalo"
-#: rpmio/rpmio.c:668
+#: rpmio/rpmio.c:680
#, fuzzy
msgid "I/O error to local file"
msgstr "Chyba vstupu/výstupu lokálneho súboru"
-#: rpmio/rpmio.c:671
+#: rpmio/rpmio.c:683
msgid "Error setting remote server to passive mode"
msgstr "Chyba pri nastavení vzdialeného servera do pasívneho režimu"
-#: rpmio/rpmio.c:674
+#: rpmio/rpmio.c:686
msgid "File not found on server"
msgstr "Súbor sa na serveri nenachádza"
-#: rpmio/rpmio.c:677
+#: rpmio/rpmio.c:689
msgid "Abort in progress"
msgstr "Zrušenie prebieha"
-#: rpmio/rpmio.c:681
+#: rpmio/rpmio.c:693
msgid "Unknown or unexpected error"
msgstr "Neznáma alebo neočakávaná chyba"
-#: rpmio/rpmio.c:1353
+#: rpmio/rpmio.c:1365
#, c-format
msgid "logging into %s as %s, pw %s\n"
msgstr "prihlasuje sa na %s ako %s, heslo %s\n"
diff --git a/po/sl.po b/po/sl.po
index cff2dc902..5744648b2 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.166 2001/10/19 19:51:24 jbj Exp $
+# $Id: sl.po,v 1.167 2001/10/20 20:29:05 jbj Exp $
#
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-19 15:08-0400\n"
+"POT-Creation-Date: 2001-10-20 16:18-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"
@@ -2274,12 +2274,12 @@ msgstr ""
msgid "========== continuing tsort ...\n"
msgstr ""
-#: lib/formats.c:28 lib/formats.c:54 lib/formats.c:85 lib/formats.c:160
-#: lib/header.c:2902 lib/header.c:2923 lib/header.c:2945
+#: lib/formats.c:33 lib/formats.c:57 lib/formats.c:88 lib/formats.c:261
+#: lib/header.c:2929 lib/header.c:2950 lib/header.c:2972
msgid "(not a number)"
msgstr "(ni število)"
-#: lib/formats.c:128
+#: lib/formats.c:129 lib/formats.c:191 lib/formats.c:236
#, fuzzy
msgid "(not a blob)"
msgstr "(ni število)"
@@ -2441,7 +2441,7 @@ msgstr "v izrazu je za : pričakovan {"
msgid "| expected at end of expression"
msgstr "na koncu izraza je pričakovan |"
-#: lib/header.c:2646
+#: lib/header.c:2673
msgid "(unknown type)"
msgstr "(neznan tip)"
@@ -3185,86 +3185,86 @@ msgstr "zapisa %d ni možno prebrati\n"
msgid "package %s is not installed\n"
msgstr "paket %s ni nameščen\n"
-#: lib/rpmchecksig.c:46
+#: lib/rpmchecksig.c:47
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: odpiranje je bilo neuspešno: %s\n"
-#: lib/rpmchecksig.c:58
+#: lib/rpmchecksig.c:59
msgid "makeTempFile failed\n"
msgstr "makeTempFile je bil neuspešen\n"
-#: lib/rpmchecksig.c:100
+#: lib/rpmchecksig.c:101
#, c-format
msgid "%s: Fwrite failed: %s\n"
msgstr "%s: pisanje Fwrite je bilo neuspešno: %s\n"
-#: lib/rpmchecksig.c:106 lib/rpmchecksig.c:313
+#: lib/rpmchecksig.c:107 lib/rpmchecksig.c:326
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: branje Fread je bilo neuspešno: %s\n"
-#: lib/rpmchecksig.c:143 lib/rpmchecksig.c:368
+#: lib/rpmchecksig.c:144 lib/rpmchecksig.c:401
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: readLead je bil neuspešen\n"
-#: lib/rpmchecksig.c:148
+#: lib/rpmchecksig.c:149
#, c-format
msgid "%s: Can't sign v1.0 RPM\n"
msgstr "%s: Podpis RPM v1.0 ni možen\n"
-#: lib/rpmchecksig.c:152
+#: lib/rpmchecksig.c:153
#, c-format
msgid "%s: Can't re-sign v2.0 RPM\n"
msgstr "%s: Sprememba podpisa RPM v2.0 ni možna\n"
-#: lib/rpmchecksig.c:161 lib/rpmchecksig.c:384
+#: lib/rpmchecksig.c:162 lib/rpmchecksig.c:417
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: rpmReadSignature je bil neuspešen\n"
-#: lib/rpmchecksig.c:165 lib/rpmchecksig.c:389
+#: lib/rpmchecksig.c:166 lib/rpmchecksig.c:422
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Podpis ni na voljo\n"
-#: lib/rpmchecksig.c:198
+#: lib/rpmchecksig.c:199
#, c-format
msgid "%s: writeLead failed: %s\n"
msgstr "%s: writeLead je bil neuspešen: %s\n"
-#: lib/rpmchecksig.c:204
+#: lib/rpmchecksig.c:205
#, c-format
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: rpmWriteSignature je bilo neuspešno: %s\n"
-#: lib/rpmchecksig.c:374
+#: lib/rpmchecksig.c:407
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr "%s: Podpis ni na voljo (RPM v1.0)\n"
-#: lib/rpmchecksig.c:604
+#: lib/rpmchecksig.c:649
msgid "NOT OK"
msgstr "NI DOBRO"
-#: lib/rpmchecksig.c:605 lib/rpmchecksig.c:619
+#: lib/rpmchecksig.c:650 lib/rpmchecksig.c:664
msgid " (MISSING KEYS:"
msgstr " (MANJKAJOČI KLJUČI:"
-#: lib/rpmchecksig.c:607 lib/rpmchecksig.c:621
+#: lib/rpmchecksig.c:652 lib/rpmchecksig.c:666
msgid ") "
msgstr ") "
-#: lib/rpmchecksig.c:608 lib/rpmchecksig.c:622
+#: lib/rpmchecksig.c:653 lib/rpmchecksig.c:667
msgid " (UNTRUSTED KEYS:"
msgstr " (NEPREVERJENI KLJUČI:"
-#: lib/rpmchecksig.c:610 lib/rpmchecksig.c:624
+#: lib/rpmchecksig.c:655 lib/rpmchecksig.c:669
msgid ")"
msgstr ")"
-#: lib/rpmchecksig.c:618
+#: lib/rpmchecksig.c:663
msgid "OK"
msgstr "V REDU"
@@ -3461,123 +3461,123 @@ msgstr "Ni možno prebrati %s, HOME je prevelik."
msgid "Unable to open %s for reading: %s.\n"
msgstr "%s ni možno odpreti za branje: %s."
-#: lib/signature.c:111
+#: lib/signature.c:112
msgid "file is not regular -- skipping size check\n"
msgstr "datoteka ni navadna datoteka -- preskakujemo preverjanje velikosti\n"
-#: lib/signature.c:120
+#: lib/signature.c:121
#, c-format
msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
msgstr ""
-#: lib/signature.c:125
+#: lib/signature.c:126
#, fuzzy, c-format
msgid " Actual size: %12d\n"
msgstr "Dolž. podpisa : %d\n"
-#: lib/signature.c:145
+#: lib/signature.c:146
msgid "No signature\n"
msgstr "Podpis manjka\n"
-#: lib/signature.c:149
+#: lib/signature.c:150
msgid "Old PGP signature\n"
msgstr "Stari podpis PGP\n"
-#: lib/signature.c:162
+#: lib/signature.c:163
#, fuzzy
msgid "Old (internal-only) signature! How did you get that!?\n"
msgstr "Podpis v (interni) stari obliki! Kje ste ga dobili?"
-#: lib/signature.c:218
+#: lib/signature.c:219
#, fuzzy, c-format
msgid "Signature: size(%d)+pad(%d)\n"
msgstr "Dolž. podpisa : %d\n"
-#: lib/signature.c:281
+#: lib/signature.c:282
#, fuzzy, c-format
msgid "Couldn't exec pgp (%s)\n"
msgstr "Ni možno pognati pgp (%s)"
-#: lib/signature.c:294
+#: lib/signature.c:295
#, fuzzy
msgid "pgp failed\n"
msgstr "pgp je bil neuspešen"
#. PGP failed to write signature
#. Just in case
-#: lib/signature.c:301
+#: lib/signature.c:302
#, fuzzy
msgid "pgp failed to write signature\n"
msgstr "pgp je bil neuspešen pri zapisu podpisa"
-#: lib/signature.c:306
+#: lib/signature.c:307
#, c-format
msgid "PGP sig size: %d\n"
msgstr "Dolž. podpisa PGP: %d\n"
-#: lib/signature.c:321 lib/signature.c:408
+#: lib/signature.c:322 lib/signature.c:409
#, fuzzy
msgid "unable to read the signature\n"
msgstr "branje podpisa je bilo neuspešno"
-#: lib/signature.c:326
+#: lib/signature.c:327
#, c-format
msgid "Got %d bytes of PGP sig\n"
msgstr "Prebrano %d bajtov podpisa PGP\n"
-#: lib/signature.c:368 lib/signature.c:498
+#: lib/signature.c:369 lib/signature.c:499
#, fuzzy
msgid "Couldn't exec gpg\n"
msgstr "Ni možno pognati gpg"
-#: lib/signature.c:381
+#: lib/signature.c:382
#, fuzzy
msgid "gpg failed\n"
msgstr "gpg je bil neuspešen"
#. GPG failed to write signature
#. Just in case
-#: lib/signature.c:388
+#: lib/signature.c:389
#, fuzzy
msgid "gpg failed to write signature\n"
msgstr "gpg je boil neuspešen pri zapisu podpisa"
-#: lib/signature.c:393
+#: lib/signature.c:394
#, c-format
msgid "GPG sig size: %d\n"
msgstr "Dolž. podpisa GnuPG: %d\n"
-#: lib/signature.c:413
+#: lib/signature.c:414
#, c-format
msgid "Got %d bytes of GPG sig\n"
msgstr "Prebrano %d bajtov podpisa GnuPG\n"
-#: lib/signature.c:441
+#: lib/signature.c:442
msgid "Generating signature using PGP.\n"
msgstr "Ustvarjanje podpisa s PGP.\n"
-#: lib/signature.c:447
+#: lib/signature.c:448
msgid "Generating signature using GPG.\n"
msgstr "Ustvarjanje podpisa z GnuPG.\n"
-#: lib/signature.c:527
+#: lib/signature.c:528
#, fuzzy
msgid "Couldn't exec pgp\n"
msgstr "Ni možno pognati pgp"
#. @notreached@
#. This case should have been screened out long ago.
-#: lib/signature.c:531 lib/signature.c:584
+#: lib/signature.c:532 lib/signature.c:585
#, fuzzy, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr "Neveljaven %%_signature v makro-datoteki.\n"
-#: lib/signature.c:564
+#: lib/signature.c:565
#, fuzzy, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr "V makrodatoteki morate nastaviti \"%%_pgp_name\""
-#: lib/signature.c:576
+#: lib/signature.c:577
#, fuzzy, c-format
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr "V makrodatoteki morate nastaviti \"%%_pgp_name\""
@@ -4017,61 +4017,61 @@ msgstr "Datoteka %s: %s"
msgid "File %s is smaller than %u bytes\n"
msgstr "Datoteka %s je krajša od %d bajtov"
-#: rpmio/rpmio.c:644
+#: rpmio/rpmio.c:656
msgid "Success"
msgstr "Uspeh"
-#: rpmio/rpmio.c:647
+#: rpmio/rpmio.c:659
msgid "Bad server response"
msgstr "Nepravilen odziv strežnika"
-#: rpmio/rpmio.c:650
+#: rpmio/rpmio.c:662
#, fuzzy
msgid "Server I/O error"
msgstr "V/I napaka na strežniku"
-#: rpmio/rpmio.c:653
+#: rpmio/rpmio.c:665
msgid "Server timeout"
msgstr "Čas odziva strežnika je potekel"
-#: rpmio/rpmio.c:656
+#: rpmio/rpmio.c:668
msgid "Unable to lookup server host address"
msgstr "Naslov strežnika ni ugotovljiv"
-#: rpmio/rpmio.c:659
+#: rpmio/rpmio.c:671
msgid "Unable to lookup server host name"
msgstr "Ime strežnika ni bilo ugotovljivo"
-#: rpmio/rpmio.c:662
+#: rpmio/rpmio.c:674
msgid "Failed to connect to server"
msgstr "Neuspešen poskus priključitve na strežnik"
-#: rpmio/rpmio.c:665
+#: rpmio/rpmio.c:677
msgid "Failed to establish data connection to server"
msgstr "Neuspešna vzpostavitev podatkovne povezave s strežnikom"
-#: rpmio/rpmio.c:668
+#: rpmio/rpmio.c:680
#, fuzzy
msgid "I/O error to local file"
msgstr "V/I napaka na lokalni datoteki"
-#: rpmio/rpmio.c:671
+#: rpmio/rpmio.c:683
msgid "Error setting remote server to passive mode"
msgstr "Napaka pri nastavitvi oddaljenega strežnika v pasivni način"
-#: rpmio/rpmio.c:674
+#: rpmio/rpmio.c:686
msgid "File not found on server"
msgstr "Datoteke ni možno najti na strežniku"
-#: rpmio/rpmio.c:677
+#: rpmio/rpmio.c:689
msgid "Abort in progress"
msgstr "Prekinitev v teku"
-#: rpmio/rpmio.c:681
+#: rpmio/rpmio.c:693
msgid "Unknown or unexpected error"
msgstr "Neznana ali nepričakovana napaka"
-#: rpmio/rpmio.c:1353
+#: rpmio/rpmio.c:1365
#, c-format
msgid "logging into %s as %s, pw %s\n"
msgstr "prijava na %s kot %s, geslo %s\n"
diff --git a/po/sr.po b/po/sr.po
index 09e0b4233..333d73bba 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-19 15:08-0400\n"
+"POT-Creation-Date: 2001-10-20 16:18-0400\n"
"Content-Type: text/plain; charset=\n"
"Date: 1998-05-02 21:41:47-0400\n"
@@ -2256,12 +2256,12 @@ msgstr ""
msgid "========== continuing tsort ...\n"
msgstr ""
-#: lib/formats.c:28 lib/formats.c:54 lib/formats.c:85 lib/formats.c:160
-#: lib/header.c:2902 lib/header.c:2923 lib/header.c:2945
+#: lib/formats.c:33 lib/formats.c:57 lib/formats.c:88 lib/formats.c:261
+#: lib/header.c:2929 lib/header.c:2950 lib/header.c:2972
msgid "(not a number)"
msgstr "(nije broj)"
-#: lib/formats.c:128
+#: lib/formats.c:129 lib/formats.c:191 lib/formats.c:236
#, fuzzy
msgid "(not a blob)"
msgstr "(nije broj)"
@@ -2424,7 +2424,7 @@ msgstr "{ očekivano posle : u izrazu"
msgid "| expected at end of expression"
msgstr "| očekivano na kraju izraza"
-#: lib/header.c:2646
+#: lib/header.c:2673
msgid "(unknown type)"
msgstr "(nepoznat tip)"
@@ -3172,88 +3172,88 @@ msgstr "ne mogu da pročitam slog %d\n"
msgid "package %s is not installed\n"
msgstr "paket %s nije instaliran\n"
-#: lib/rpmchecksig.c:46
+#: lib/rpmchecksig.c:47
#, fuzzy, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: Neuspelo otvaranje\n"
-#: lib/rpmchecksig.c:58
+#: lib/rpmchecksig.c:59
#, fuzzy
msgid "makeTempFile failed\n"
msgstr "%s: Neuspelo otvaranje\n"
-#: lib/rpmchecksig.c:100
+#: lib/rpmchecksig.c:101
#, fuzzy, c-format
msgid "%s: Fwrite failed: %s\n"
msgstr "%s: Neuspeo 'readLead'\n"
-#: lib/rpmchecksig.c:106 lib/rpmchecksig.c:313
+#: lib/rpmchecksig.c:107 lib/rpmchecksig.c:326
#, fuzzy, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: Neuspeo 'readLead'\n"
-#: lib/rpmchecksig.c:143 lib/rpmchecksig.c:368
+#: lib/rpmchecksig.c:144 lib/rpmchecksig.c:401
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: Neuspeo 'readLead'\n"
-#: lib/rpmchecksig.c:148
+#: lib/rpmchecksig.c:149
#, c-format
msgid "%s: Can't sign v1.0 RPM\n"
msgstr "%s: Ne mogu da potpišem v1.0 RPM\n"
-#: lib/rpmchecksig.c:152
+#: lib/rpmchecksig.c:153
#, c-format
msgid "%s: Can't re-sign v2.0 RPM\n"
msgstr "%s: Ne mogu da ponovo potpišem v2.0 RPM\n"
-#: lib/rpmchecksig.c:161 lib/rpmchecksig.c:384
+#: lib/rpmchecksig.c:162 lib/rpmchecksig.c:417
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: Neuspelo 'rpmReadSignature'\n"
-#: lib/rpmchecksig.c:165 lib/rpmchecksig.c:389
+#: lib/rpmchecksig.c:166 lib/rpmchecksig.c:422
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Potpis nije na raspolaganju\n"
-#: lib/rpmchecksig.c:198
+#: lib/rpmchecksig.c:199
#, fuzzy, c-format
msgid "%s: writeLead failed: %s\n"
msgstr "%s: Neuspeo 'readLead'\n"
-#: lib/rpmchecksig.c:204
+#: lib/rpmchecksig.c:205
#, fuzzy, c-format
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: Neuspelo 'rpmReadSignature'\n"
-#: lib/rpmchecksig.c:374
+#: lib/rpmchecksig.c:407
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr "%s: Potpis nije na raspolaganju (RPM v1.0)\n"
-#: lib/rpmchecksig.c:604
+#: lib/rpmchecksig.c:649
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:605 lib/rpmchecksig.c:619
+#: lib/rpmchecksig.c:650 lib/rpmchecksig.c:664
#, fuzzy
msgid " (MISSING KEYS:"
msgstr " (NEDOSTAJUĆI KLJUČEVI)"
-#: lib/rpmchecksig.c:607 lib/rpmchecksig.c:621
+#: lib/rpmchecksig.c:652 lib/rpmchecksig.c:666
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:608 lib/rpmchecksig.c:622
+#: lib/rpmchecksig.c:653 lib/rpmchecksig.c:667
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:610 lib/rpmchecksig.c:624
+#: lib/rpmchecksig.c:655 lib/rpmchecksig.c:669
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:618
+#: lib/rpmchecksig.c:663
msgid "OK"
msgstr ""
@@ -3451,127 +3451,127 @@ msgstr ""
msgid "Unable to open %s for reading: %s.\n"
msgstr "Ne mogu da otvorim %s za čitanje: %s"
-#: lib/signature.c:111
+#: lib/signature.c:112
msgid "file is not regular -- skipping size check\n"
msgstr ""
-#: lib/signature.c:120
+#: lib/signature.c:121
#, c-format
msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
msgstr ""
-#: lib/signature.c:125
+#: lib/signature.c:126
#, c-format
msgid " Actual size: %12d\n"
msgstr ""
-#: lib/signature.c:145
+#: lib/signature.c:146
#, fuzzy
msgid "No signature\n"
msgstr "%s: Potpis nije na raspolaganju\n"
-#: lib/signature.c:149
+#: lib/signature.c:150
#, fuzzy
msgid "Old PGP signature\n"
msgstr "napravi PGP potpis"
-#: lib/signature.c:162
+#: lib/signature.c:163
#, fuzzy
msgid "Old (internal-only) signature! How did you get that!?\n"
msgstr "Stari (interni) potpis! Odakle vam!?"
-#: lib/signature.c:218
+#: lib/signature.c:219
#, c-format
msgid "Signature: size(%d)+pad(%d)\n"
msgstr ""
-#: lib/signature.c:281
+#: lib/signature.c:282
#, fuzzy, c-format
msgid "Couldn't exec pgp (%s)\n"
msgstr "Ne mogu da izvršim PGP"
-#: lib/signature.c:294
+#: lib/signature.c:295
#, fuzzy
msgid "pgp failed\n"
msgstr "PGP omanuo"
#. PGP failed to write signature
#. Just in case
-#: lib/signature.c:301
+#: lib/signature.c:302
#, fuzzy
msgid "pgp failed to write signature\n"
msgstr "PGP nije uspeo da zapiše potpis"
-#: lib/signature.c:306
+#: lib/signature.c:307
#, c-format
msgid "PGP sig size: %d\n"
msgstr ""
-#: lib/signature.c:321 lib/signature.c:408
+#: lib/signature.c:322 lib/signature.c:409
#, fuzzy
msgid "unable to read the signature\n"
msgstr "ne mogu da pročitam potpis"
-#: lib/signature.c:326
+#: lib/signature.c:327
#, c-format
msgid "Got %d bytes of PGP sig\n"
msgstr ""
-#: lib/signature.c:368 lib/signature.c:498
+#: lib/signature.c:369 lib/signature.c:499
#, fuzzy
msgid "Couldn't exec gpg\n"
msgstr "Ne mogu da izvršim PGP"
-#: lib/signature.c:381
+#: lib/signature.c:382
#, fuzzy
msgid "gpg failed\n"
msgstr "PGP omanuo"
#. GPG failed to write signature
#. Just in case
-#: lib/signature.c:388
+#: lib/signature.c:389
#, fuzzy
msgid "gpg failed to write signature\n"
msgstr "PGP nije uspeo da zapiše potpis"
-#: lib/signature.c:393
+#: lib/signature.c:394
#, c-format
msgid "GPG sig size: %d\n"
msgstr ""
-#: lib/signature.c:413
+#: lib/signature.c:414
#, c-format
msgid "Got %d bytes of GPG sig\n"
msgstr ""
-#: lib/signature.c:441
+#: lib/signature.c:442
#, fuzzy
msgid "Generating signature using PGP.\n"
msgstr "napravi PGP potpis"
-#: lib/signature.c:447
+#: lib/signature.c:448
#, fuzzy
msgid "Generating signature using GPG.\n"
msgstr "napravi PGP potpis"
-#: lib/signature.c:527
+#: lib/signature.c:528
#, fuzzy
msgid "Couldn't exec pgp\n"
msgstr "Ne mogu da izvršim PGP"
#. @notreached@
#. This case should have been screened out long ago.
-#: lib/signature.c:531 lib/signature.c:584
+#: lib/signature.c:532 lib/signature.c:585
#, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr ""
-#: lib/signature.c:564
+#: lib/signature.c:565
#, fuzzy, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr "Morate podesiti \"pgp_name:\" u vašoj rpmrc datoteci"
-#: lib/signature.c:576
+#: lib/signature.c:577
#, fuzzy, c-format
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr "Morate podesiti \"pgp_name:\" u vašoj rpmrc datoteci"
@@ -3995,68 +3995,68 @@ msgstr "neuspelo otvaranje %s: %s"
msgid "File %s is smaller than %u bytes\n"
msgstr ""
-#: rpmio/rpmio.c:644
+#: rpmio/rpmio.c:656
msgid "Success"
msgstr ""
-#: rpmio/rpmio.c:647
+#: rpmio/rpmio.c:659
#, fuzzy
msgid "Bad server response"
msgstr "Loš odgovor FTP servera"
-#: rpmio/rpmio.c:650
+#: rpmio/rpmio.c:662
#, fuzzy
msgid "Server I/O error"
msgstr "Ulazno/izlazna FTP greška"
-#: rpmio/rpmio.c:653
+#: rpmio/rpmio.c:665
#, fuzzy
msgid "Server timeout"
msgstr "Tajm-aut FTP servera"
-#: rpmio/rpmio.c:656
+#: rpmio/rpmio.c:668
#, fuzzy
msgid "Unable to lookup server host address"
msgstr "Ne mogu da odredim host adresu FTP servera"
-#: rpmio/rpmio.c:659
+#: rpmio/rpmio.c:671
#, fuzzy
msgid "Unable to lookup server host name"
msgstr "Ne mogu da odredim ime FTP hosta"
-#: rpmio/rpmio.c:662
+#: rpmio/rpmio.c:674
#, fuzzy
msgid "Failed to connect to server"
msgstr "Ne mogu da se povežem sa FTP serverom"
-#: rpmio/rpmio.c:665
+#: rpmio/rpmio.c:677
#, fuzzy
msgid "Failed to establish data connection to server"
msgstr "Ne mogu da uspostavim vezu podataka sa FTP serverom"
-#: rpmio/rpmio.c:668
+#: rpmio/rpmio.c:680
#, fuzzy
msgid "I/O error to local file"
msgstr "Ulazno/izlazna greška kod lokalne datoteke"
-#: rpmio/rpmio.c:671
+#: rpmio/rpmio.c:683
msgid "Error setting remote server to passive mode"
msgstr "Greška kod stavljanja udaljenog servera u pasivni režim"
-#: rpmio/rpmio.c:674
+#: rpmio/rpmio.c:686
msgid "File not found on server"
msgstr "Datoteka nije pronađena na serveru"
-#: rpmio/rpmio.c:677
+#: rpmio/rpmio.c:689
msgid "Abort in progress"
msgstr ""
-#: rpmio/rpmio.c:681
+#: rpmio/rpmio.c:693
#, fuzzy
msgid "Unknown or unexpected error"
msgstr "Neočekivana ili nepoznata FTP greška"
-#: rpmio/rpmio.c:1353
+#: rpmio/rpmio.c:1365
#, c-format
msgid "logging into %s as %s, pw %s\n"
msgstr ""
diff --git a/po/sv.po b/po/sv.po
index eac59aba5..26fd6c85f 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-19 15:08-0400\n"
+"POT-Creation-Date: 2001-10-20 16:18-0400\n"
"PO-Revision-Date: 2001-09-12 14:18+0200\n"
"Last-Translator: Göran Uddeborg <goeran@uddeborg.pp.se>\n"
"Language-Team: Swedish <sv@li.org>\n"
@@ -2213,12 +2213,12 @@ msgstr "LOOP:\n"
msgid "========== continuing tsort ...\n"
msgstr "========== fortsätter med tsort ...\n"
-#: lib/formats.c:28 lib/formats.c:54 lib/formats.c:85 lib/formats.c:160
-#: lib/header.c:2902 lib/header.c:2923 lib/header.c:2945
+#: lib/formats.c:33 lib/formats.c:57 lib/formats.c:88 lib/formats.c:261
+#: lib/header.c:2929 lib/header.c:2950 lib/header.c:2972
msgid "(not a number)"
msgstr "(inte ett tal)"
-#: lib/formats.c:128
+#: lib/formats.c:129 lib/formats.c:191 lib/formats.c:236
#, fuzzy
msgid "(not a blob)"
msgstr "(inte ett tal)"
@@ -2380,7 +2380,7 @@ msgstr "{ förväntades efter : i uttryck"
msgid "| expected at end of expression"
msgstr "| förväntades vid slutet pĺ uttryck"
-#: lib/header.c:2646
+#: lib/header.c:2673
msgid "(unknown type)"
msgstr "(okänd typ)"
@@ -3078,86 +3078,86 @@ msgstr "post %u kunde inte läsas\n"
msgid "package %s is not installed\n"
msgstr "paket %s är inte installerat\n"
-#: lib/rpmchecksig.c:46
+#: lib/rpmchecksig.c:47
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: open misslyckades: %s\n"
-#: lib/rpmchecksig.c:58
+#: lib/rpmchecksig.c:59
msgid "makeTempFile failed\n"
msgstr "makeTempFile misslyckades\n"
-#: lib/rpmchecksig.c:100
+#: lib/rpmchecksig.c:101
#, c-format
msgid "%s: Fwrite failed: %s\n"
msgstr "%s: Fwrite misslyckades: %s\n"
-#: lib/rpmchecksig.c:106 lib/rpmchecksig.c:313
+#: lib/rpmchecksig.c:107 lib/rpmchecksig.c:326
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: Fread misslyckades: %s\n"
-#: lib/rpmchecksig.c:143 lib/rpmchecksig.c:368
+#: lib/rpmchecksig.c:144 lib/rpmchecksig.c:401
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: readLead misslyckades\n"
-#: lib/rpmchecksig.c:148
+#: lib/rpmchecksig.c:149
#, c-format
msgid "%s: Can't sign v1.0 RPM\n"
msgstr "%s: Kan inte signera v1.0 RPM\n"
-#: lib/rpmchecksig.c:152
+#: lib/rpmchecksig.c:153
#, c-format
msgid "%s: Can't re-sign v2.0 RPM\n"
msgstr "%s: Kan inte signera om v2.0 RPM\n"
-#: lib/rpmchecksig.c:161 lib/rpmchecksig.c:384
+#: lib/rpmchecksig.c:162 lib/rpmchecksig.c:417
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: rpmReadSignature misslyckades\n"
-#: lib/rpmchecksig.c:165 lib/rpmchecksig.c:389
+#: lib/rpmchecksig.c:166 lib/rpmchecksig.c:422
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Ingen signatur tillgänglig\n"
-#: lib/rpmchecksig.c:198
+#: lib/rpmchecksig.c:199
#, c-format
msgid "%s: writeLead failed: %s\n"
msgstr "%s: writeLead misslyckades: %s\n"
-#: lib/rpmchecksig.c:204
+#: lib/rpmchecksig.c:205
#, c-format
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: rpmWriteSignature misslyckades: %s\n"
-#: lib/rpmchecksig.c:374
+#: lib/rpmchecksig.c:407
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr "%s: Ingen signatur tillgänglig (v1.0 RPM)\n"
-#: lib/rpmchecksig.c:604
+#: lib/rpmchecksig.c:649
msgid "NOT OK"
msgstr "EJ OK"
-#: lib/rpmchecksig.c:605 lib/rpmchecksig.c:619
+#: lib/rpmchecksig.c:650 lib/rpmchecksig.c:664
msgid " (MISSING KEYS:"
msgstr " (SAKNADE NYCKLAR:"
-#: lib/rpmchecksig.c:607 lib/rpmchecksig.c:621
+#: lib/rpmchecksig.c:652 lib/rpmchecksig.c:666
msgid ") "
msgstr ") "
-#: lib/rpmchecksig.c:608 lib/rpmchecksig.c:622
+#: lib/rpmchecksig.c:653 lib/rpmchecksig.c:667
msgid " (UNTRUSTED KEYS:"
msgstr " (EJ BETRODDA NYCKLAR:"
-#: lib/rpmchecksig.c:610 lib/rpmchecksig.c:624
+#: lib/rpmchecksig.c:655 lib/rpmchecksig.c:669
msgid ")"
msgstr ")"
-#: lib/rpmchecksig.c:618
+#: lib/rpmchecksig.c:663
msgid "OK"
msgstr "OK"
@@ -3353,117 +3353,117 @@ msgstr "Kan inte läsa %s, HOME är för stor.\n"
msgid "Unable to open %s for reading: %s.\n"
msgstr "Kan inte öppna %s för läsning: %s.\n"
-#: lib/signature.c:111
+#: lib/signature.c:112
msgid "file is not regular -- skipping size check\n"
msgstr "filen är inte en vanlig fil -- hoppar över storlekskontroll\n"
-#: lib/signature.c:120
+#: lib/signature.c:121
#, c-format
msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
msgstr ""
"Förväntad storlek: %12d = inledning(%d)+signaturer(%d)+utfyllnad(%d)+data(%"
"d)\n"
-#: lib/signature.c:125
+#: lib/signature.c:126
#, c-format
msgid " Actual size: %12d\n"
msgstr " Faktisk storlek: %12d\n"
-#: lib/signature.c:145
+#: lib/signature.c:146
msgid "No signature\n"
msgstr "Ingen signatur\n"
-#: lib/signature.c:149
+#: lib/signature.c:150
msgid "Old PGP signature\n"
msgstr "Gammal PGP-signatur\n"
-#: lib/signature.c:162
+#: lib/signature.c:163
msgid "Old (internal-only) signature! How did you get that!?\n"
msgstr "Gammal (endast intern) signatur! Hur fick du tag i den!?\n"
-#: lib/signature.c:218
+#: lib/signature.c:219
#, c-format
msgid "Signature: size(%d)+pad(%d)\n"
msgstr "Signatur: storlek(%d)+utfyllnad(%d)\n"
-#: lib/signature.c:281
+#: lib/signature.c:282
#, c-format
msgid "Couldn't exec pgp (%s)\n"
msgstr "Kunde inte köra pgp (%s)\n"
-#: lib/signature.c:294
+#: lib/signature.c:295
msgid "pgp failed\n"
msgstr "pgp misslyckades\n"
#. PGP failed to write signature
#. Just in case
-#: lib/signature.c:301
+#: lib/signature.c:302
msgid "pgp failed to write signature\n"
msgstr "pgp misslyckades att skriva en signatur\n"
-#: lib/signature.c:306
+#: lib/signature.c:307
#, c-format
msgid "PGP sig size: %d\n"
msgstr "PGP signaturstorlek: %d\n"
-#: lib/signature.c:321 lib/signature.c:408
+#: lib/signature.c:322 lib/signature.c:409
msgid "unable to read the signature\n"
msgstr "kan inte läsa signaturen\n"
-#: lib/signature.c:326
+#: lib/signature.c:327
#, c-format
msgid "Got %d bytes of PGP sig\n"
msgstr "Fick %d byte PGP-signatur\n"
-#: lib/signature.c:368 lib/signature.c:498
+#: lib/signature.c:369 lib/signature.c:499
msgid "Couldn't exec gpg\n"
msgstr "Kunde inte köra gpg\n"
-#: lib/signature.c:381
+#: lib/signature.c:382
msgid "gpg failed\n"
msgstr "gpg misslyckades\n"
#. GPG failed to write signature
#. Just in case
-#: lib/signature.c:388
+#: lib/signature.c:389
msgid "gpg failed to write signature\n"
msgstr "gpg kunde inte skriva signatur\n"
-#: lib/signature.c:393
+#: lib/signature.c:394
#, c-format
msgid "GPG sig size: %d\n"
msgstr "GPG-signaturstorlek: %d\n"
-#: lib/signature.c:413
+#: lib/signature.c:414
#, c-format
msgid "Got %d bytes of GPG sig\n"
msgstr "Fick %d byte GPG-signatur\n"
-#: lib/signature.c:441
+#: lib/signature.c:442
msgid "Generating signature using PGP.\n"
msgstr "Genererar signatur med PGP.\n"
-#: lib/signature.c:447
+#: lib/signature.c:448
msgid "Generating signature using GPG.\n"
msgstr "Genererar signatur med GPG.\n"
-#: lib/signature.c:527
+#: lib/signature.c:528
msgid "Couldn't exec pgp\n"
msgstr "Kunde inte köra pgp\n"
#. @notreached@
#. This case should have been screened out long ago.
-#: lib/signature.c:531 lib/signature.c:584
+#: lib/signature.c:532 lib/signature.c:585
#, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr "Felaktig %%_signature-spec i makrofil\n"
-#: lib/signature.c:564
+#: lib/signature.c:565
#, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr "Du mĺste sätta \"%%_gpg_name\" i din makrofil\n"
-#: lib/signature.c:576
+#: lib/signature.c:577
#, c-format
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr "Du mĺste sätta \"%%_pgp_name\" i din makrofil\n"
@@ -3895,59 +3895,59 @@ msgstr "Fil %s: %s\n"
msgid "File %s is smaller than %u bytes\n"
msgstr "Filen %s är mindre än %u byte\n"
-#: rpmio/rpmio.c:644
+#: rpmio/rpmio.c:656
msgid "Success"
msgstr "Lyckades"
-#: rpmio/rpmio.c:647
+#: rpmio/rpmio.c:659
msgid "Bad server response"
msgstr "Konstigt svar frĺn server"
-#: rpmio/rpmio.c:650
+#: rpmio/rpmio.c:662
msgid "Server I/O error"
msgstr "IO-fel mot server"
-#: rpmio/rpmio.c:653
+#: rpmio/rpmio.c:665
msgid "Server timeout"
msgstr "Förbindelsen med servern dog ut (timeout)"
-#: rpmio/rpmio.c:656
+#: rpmio/rpmio.c:668
msgid "Unable to lookup server host address"
msgstr "Kunde inte slĺ upp serverns adress"
-#: rpmio/rpmio.c:659
+#: rpmio/rpmio.c:671
msgid "Unable to lookup server host name"
msgstr "Kunde inte slĺ upp serverns namn"
-#: rpmio/rpmio.c:662
+#: rpmio/rpmio.c:674
msgid "Failed to connect to server"
msgstr "Misslyckades med att kontakta servern"
-#: rpmio/rpmio.c:665
+#: rpmio/rpmio.c:677
msgid "Failed to establish data connection to server"
msgstr "Misslyckades med att etablera en dataförbindelse till servern"
-#: rpmio/rpmio.c:668
+#: rpmio/rpmio.c:680
msgid "I/O error to local file"
msgstr "I/O-fel mot lokal fil"
-#: rpmio/rpmio.c:671
+#: rpmio/rpmio.c:683
msgid "Error setting remote server to passive mode"
msgstr "Fel när fjärrservern sattes i passivt läge"
-#: rpmio/rpmio.c:674
+#: rpmio/rpmio.c:686
msgid "File not found on server"
msgstr "Filen fanns inte pĺ servern"
-#: rpmio/rpmio.c:677
+#: rpmio/rpmio.c:689
msgid "Abort in progress"
msgstr "Avbruten under gĺng"
-#: rpmio/rpmio.c:681
+#: rpmio/rpmio.c:693
msgid "Unknown or unexpected error"
msgstr "Okänt eller oväntat fel"
-#: rpmio/rpmio.c:1353
+#: rpmio/rpmio.c:1365
#, c-format
msgid "logging into %s as %s, pw %s\n"
msgstr "loggar in pĺ %s som %s, lösenord %s\n"
diff --git a/po/tr.po b/po/tr.po
index 9f95983a7..e0ca4b80e 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-19 15:08-0400\n"
+"POT-Creation-Date: 2001-10-20 16:18-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"
@@ -2238,12 +2238,12 @@ msgstr "ÇEVRÝM:\n"
msgid "========== continuing tsort ...\n"
msgstr "========== tsort sürüyor ...\n"
-#: lib/formats.c:28 lib/formats.c:54 lib/formats.c:85 lib/formats.c:160
-#: lib/header.c:2902 lib/header.c:2923 lib/header.c:2945
+#: lib/formats.c:33 lib/formats.c:57 lib/formats.c:88 lib/formats.c:261
+#: lib/header.c:2929 lib/header.c:2950 lib/header.c:2972
msgid "(not a number)"
msgstr "(bir sayý deđil)"
-#: lib/formats.c:128
+#: lib/formats.c:129 lib/formats.c:191 lib/formats.c:236
#, fuzzy
msgid "(not a blob)"
msgstr "(bir sayý deđil)"
@@ -2405,7 +2405,7 @@ msgstr "ifade içersinde : den sonra { gerekli"
msgid "| expected at end of expression"
msgstr "ifadenin sonunda | gerekli"
-#: lib/header.c:2646
+#: lib/header.c:2673
msgid "(unknown type)"
msgstr "(bilinmeyen tür)"
@@ -3116,86 +3116,86 @@ msgstr "%u. kayýt okunamadý\n"
msgid "package %s is not installed\n"
msgstr "%s paketi kurulu deđil\n"
-#: lib/rpmchecksig.c:46
+#: lib/rpmchecksig.c:47
#, c-format
msgid "%s: open failed: %s\n"
msgstr "%s: açýlamadý: %s\n"
-#: lib/rpmchecksig.c:58
+#: lib/rpmchecksig.c:59
msgid "makeTempFile failed\n"
msgstr "makeTempFile baţarýsýz\n"
-#: lib/rpmchecksig.c:100
+#: lib/rpmchecksig.c:101
#, c-format
msgid "%s: Fwrite failed: %s\n"
msgstr "%s: Fwrite baţarýsýz: %s\n"
-#: lib/rpmchecksig.c:106 lib/rpmchecksig.c:313
+#: lib/rpmchecksig.c:107 lib/rpmchecksig.c:326
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr "%s: Fread baţarýsýz: %s\n"
-#: lib/rpmchecksig.c:143 lib/rpmchecksig.c:368
+#: lib/rpmchecksig.c:144 lib/rpmchecksig.c:401
#, c-format
msgid "%s: readLead failed\n"
msgstr "%s: readLead baţarýsýz\n"
-#: lib/rpmchecksig.c:148
+#: lib/rpmchecksig.c:149
#, c-format
msgid "%s: Can't sign v1.0 RPM\n"
msgstr "%s: v1.0 RPM (eski sürüm) imzalanamaz\n"
-#: lib/rpmchecksig.c:152
+#: lib/rpmchecksig.c:153
#, c-format
msgid "%s: Can't re-sign v2.0 RPM\n"
msgstr "%s: v2.0 RPM (eski sürüm) yeniden imzalanamaz\n"
-#: lib/rpmchecksig.c:161 lib/rpmchecksig.c:384
+#: lib/rpmchecksig.c:162 lib/rpmchecksig.c:417
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr "%s: rpmReadSignature baţarýsýz\n"
-#: lib/rpmchecksig.c:165 lib/rpmchecksig.c:389
+#: lib/rpmchecksig.c:166 lib/rpmchecksig.c:422
#, c-format
msgid "%s: No signature available\n"
msgstr "%s: Ýmza bulundurmuyor\n"
-#: lib/rpmchecksig.c:198
+#: lib/rpmchecksig.c:199
#, c-format
msgid "%s: writeLead failed: %s\n"
msgstr "%s: writeLead baţarýsýz: %s\n"
-#: lib/rpmchecksig.c:204
+#: lib/rpmchecksig.c:205
#, c-format
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr "%s: rpmWriteSignature baţarýsýz: %s\n"
-#: lib/rpmchecksig.c:374
+#: lib/rpmchecksig.c:407
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr "%s: Ýmza bulundurmuyor (v1.0 RPM)\n"
-#: lib/rpmchecksig.c:604
+#: lib/rpmchecksig.c:649
msgid "NOT OK"
msgstr "TAMAM DEĐÝL"
-#: lib/rpmchecksig.c:605 lib/rpmchecksig.c:619
+#: lib/rpmchecksig.c:650 lib/rpmchecksig.c:664
msgid " (MISSING KEYS:"
msgstr " (EKSÝK ANAHTARLAR:"
-#: lib/rpmchecksig.c:607 lib/rpmchecksig.c:621
+#: lib/rpmchecksig.c:652 lib/rpmchecksig.c:666
msgid ") "
msgstr ") "
-#: lib/rpmchecksig.c:608 lib/rpmchecksig.c:622
+#: lib/rpmchecksig.c:653 lib/rpmchecksig.c:667
msgid " (UNTRUSTED KEYS:"
msgstr " (GÜVENCESÝZ ANAHTARLAR:"
-#: lib/rpmchecksig.c:610 lib/rpmchecksig.c:624
+#: lib/rpmchecksig.c:655 lib/rpmchecksig.c:669
msgid ")"
msgstr ")"
-#: lib/rpmchecksig.c:618
+#: lib/rpmchecksig.c:663
msgid "OK"
msgstr "Tamam"
@@ -3391,115 +3391,115 @@ msgstr "%s okunamýyor, EV çok büyük\n"
msgid "Unable to open %s for reading: %s.\n"
msgstr "%s okuma eriţimi için açýlamadý: %s.\n"
-#: lib/signature.c:111
+#: lib/signature.c:112
msgid "file is not regular -- skipping size check\n"
msgstr "dosya normal deđil -- uzunluk denetimi atlanýyor\n"
-#: lib/signature.c:120
+#: lib/signature.c:121
#, c-format
msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
msgstr "gereken boyut: %12d = (%d)uç+(%d)imza+(%d)iz+(%d)veri\n"
-#: lib/signature.c:125
+#: lib/signature.c:126
#, c-format
msgid " Actual size: %12d\n"
msgstr " Gerçek boyut: %12d\n"
-#: lib/signature.c:145
+#: lib/signature.c:146
msgid "No signature\n"
msgstr "Ýmza yok\n"
-#: lib/signature.c:149
+#: lib/signature.c:150
msgid "Old PGP signature\n"
msgstr "Eski PGP imzasý\n"
-#: lib/signature.c:162
+#: lib/signature.c:163
msgid "Old (internal-only) signature! How did you get that!?\n"
msgstr "Eski imza !!! Bunu nasýl aldýn!?\n"
-#: lib/signature.c:218
+#: lib/signature.c:219
#, c-format
msgid "Signature: size(%d)+pad(%d)\n"
msgstr "Ýmza: boyut(%d)+iz(%d)\n"
-#: lib/signature.c:281
+#: lib/signature.c:282
#, c-format
msgid "Couldn't exec pgp (%s)\n"
msgstr "pgp çalýţtýrýlamadý (%s)\n"
-#: lib/signature.c:294
+#: lib/signature.c:295
msgid "pgp failed\n"
msgstr "pgp hata verdi\n"
#. PGP failed to write signature
#. Just in case
-#: lib/signature.c:301
+#: lib/signature.c:302
msgid "pgp failed to write signature\n"
msgstr "pgp imzasýnýn yazýlmasý baţarýsýz\n"
-#: lib/signature.c:306
+#: lib/signature.c:307
#, c-format
msgid "PGP sig size: %d\n"
msgstr "PGP imza uzunluđu: %d\n"
-#: lib/signature.c:321 lib/signature.c:408
+#: lib/signature.c:322 lib/signature.c:409
msgid "unable to read the signature\n"
msgstr "imza okunamadý\n"
-#: lib/signature.c:326
+#: lib/signature.c:327
#, c-format
msgid "Got %d bytes of PGP sig\n"
msgstr "GPG imzasýnýn %d baytý alýndý\n"
-#: lib/signature.c:368 lib/signature.c:498
+#: lib/signature.c:369 lib/signature.c:499
msgid "Couldn't exec gpg\n"
msgstr "gpg çalýţtýrýlamadý\n"
-#: lib/signature.c:381
+#: lib/signature.c:382
msgid "gpg failed\n"
msgstr "gpg hata verdi\n"
#. GPG failed to write signature
#. Just in case
-#: lib/signature.c:388
+#: lib/signature.c:389
msgid "gpg failed to write signature\n"
msgstr "imzanýn yazýlmasý sýrasýnda gpg hata verdi\n"
-#: lib/signature.c:393
+#: lib/signature.c:394
#, c-format
msgid "GPG sig size: %d\n"
msgstr "GPG imza uzunluđu: %d\n"
-#: lib/signature.c:413
+#: lib/signature.c:414
#, c-format
msgid "Got %d bytes of GPG sig\n"
msgstr "GPG imzasýnýn %d baytý alýndý\n"
-#: lib/signature.c:441
+#: lib/signature.c:442
msgid "Generating signature using PGP.\n"
msgstr "PGP kullanarak imza üretiliyor.\n"
-#: lib/signature.c:447
+#: lib/signature.c:448
msgid "Generating signature using GPG.\n"
msgstr "GPG kullanýlarak imza üretiliyor.\n"
-#: lib/signature.c:527
+#: lib/signature.c:528
msgid "Couldn't exec pgp\n"
msgstr "pgp çalýţtýrýlamadý\n"
#. @notreached@
#. This case should have been screened out long ago.
-#: lib/signature.c:531 lib/signature.c:584
+#: lib/signature.c:532 lib/signature.c:585
#, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr "Makro dosyasýnda %%_signature spec geçersiz\n"
-#: lib/signature.c:564
+#: lib/signature.c:565
#, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr "Makro dosyanýzda \"%%_pgp_name\" tanýmlanmýţ olmalý\n"
-#: lib/signature.c:576
+#: lib/signature.c:577
#, c-format
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr "Makro dosyanýzda \"%%_pgp_name\" belirtmelisiniz\n"
@@ -3934,59 +3934,59 @@ msgstr "%s dosyasý: %s\n"
msgid "File %s is smaller than %u bytes\n"
msgstr "%s dosyasý %u bayttan küçük\n"
-#: rpmio/rpmio.c:644
+#: rpmio/rpmio.c:656
msgid "Success"
msgstr "Baţarýlý"
-#: rpmio/rpmio.c:647
+#: rpmio/rpmio.c:659
msgid "Bad server response"
msgstr "Sunucudan kötü yanýt"
-#: rpmio/rpmio.c:650
+#: rpmio/rpmio.c:662
msgid "Server I/O error"
msgstr "Sunucu G/Ç hatasý"
-#: rpmio/rpmio.c:653
+#: rpmio/rpmio.c:665
msgid "Server timeout"
msgstr "Sunucu zaman aţýmý"
-#: rpmio/rpmio.c:656
+#: rpmio/rpmio.c:668
msgid "Unable to lookup server host address"
msgstr "Sunucu makina adresi bulunamadý"
-#: rpmio/rpmio.c:659
+#: rpmio/rpmio.c:671
msgid "Unable to lookup server host name"
msgstr "Sunucu makina ismi bulunamadý"
-#: rpmio/rpmio.c:662
+#: rpmio/rpmio.c:674
msgid "Failed to connect to server"
msgstr "Sunucuya bađlanýlamadý"
-#: rpmio/rpmio.c:665
+#: rpmio/rpmio.c:677
msgid "Failed to establish data connection to server"
msgstr "Sunucuya veri bađlantýsý kurulamadý"
-#: rpmio/rpmio.c:668
+#: rpmio/rpmio.c:680
msgid "I/O error to local file"
msgstr "Yerel dosyaya G/Ç hatasý"
-#: rpmio/rpmio.c:671
+#: rpmio/rpmio.c:683
msgid "Error setting remote server to passive mode"
msgstr "Karţý sunucuyu pasif kipe sokma ayarlarýnda hata"
-#: rpmio/rpmio.c:674
+#: rpmio/rpmio.c:686
msgid "File not found on server"
msgstr "Dosya sunucuda bulunamadý"
-#: rpmio/rpmio.c:677
+#: rpmio/rpmio.c:689
msgid "Abort in progress"
msgstr "Kesme iţlemi sürüyor"
-#: rpmio/rpmio.c:681
+#: rpmio/rpmio.c:693
msgid "Unknown or unexpected error"
msgstr "Bilinmeyen ya da beklenmeyen hata"
-#: rpmio/rpmio.c:1353
+#: rpmio/rpmio.c:1365
#, c-format
msgid "logging into %s as %s, pw %s\n"
msgstr "%s sunucusuna %s olarak giriliyor, parola %s\n"
diff --git a/po/uk.po b/po/uk.po
index bd7c3685f..c17a7f548 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-19 15:08-0400\n"
+"POT-Creation-Date: 2001-10-20 16:18-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"
@@ -2172,12 +2172,12 @@ msgstr ""
msgid "========== continuing tsort ...\n"
msgstr ""
-#: lib/formats.c:28 lib/formats.c:54 lib/formats.c:85 lib/formats.c:160
-#: lib/header.c:2902 lib/header.c:2923 lib/header.c:2945
+#: lib/formats.c:33 lib/formats.c:57 lib/formats.c:88 lib/formats.c:261
+#: lib/header.c:2929 lib/header.c:2950 lib/header.c:2972
msgid "(not a number)"
msgstr ""
-#: lib/formats.c:128
+#: lib/formats.c:129 lib/formats.c:191 lib/formats.c:236
msgid "(not a blob)"
msgstr ""
@@ -2337,7 +2337,7 @@ msgstr ""
msgid "| expected at end of expression"
msgstr ""
-#: lib/header.c:2646
+#: lib/header.c:2673
msgid "(unknown type)"
msgstr ""
@@ -3027,86 +3027,86 @@ msgstr ""
msgid "package %s is not installed\n"
msgstr ""
-#: lib/rpmchecksig.c:46
+#: lib/rpmchecksig.c:47
#, c-format
msgid "%s: open failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:58
+#: lib/rpmchecksig.c:59
msgid "makeTempFile failed\n"
msgstr ""
-#: lib/rpmchecksig.c:100
+#: lib/rpmchecksig.c:101
#, c-format
msgid "%s: Fwrite failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:106 lib/rpmchecksig.c:313
+#: lib/rpmchecksig.c:107 lib/rpmchecksig.c:326
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:143 lib/rpmchecksig.c:368
+#: lib/rpmchecksig.c:144 lib/rpmchecksig.c:401
#, c-format
msgid "%s: readLead failed\n"
msgstr ""
-#: lib/rpmchecksig.c:148
+#: lib/rpmchecksig.c:149
#, c-format
msgid "%s: Can't sign v1.0 RPM\n"
msgstr ""
-#: lib/rpmchecksig.c:152
+#: lib/rpmchecksig.c:153
#, c-format
msgid "%s: Can't re-sign v2.0 RPM\n"
msgstr ""
-#: lib/rpmchecksig.c:161 lib/rpmchecksig.c:384
+#: lib/rpmchecksig.c:162 lib/rpmchecksig.c:417
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/rpmchecksig.c:165 lib/rpmchecksig.c:389
+#: lib/rpmchecksig.c:166 lib/rpmchecksig.c:422
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/rpmchecksig.c:198
+#: lib/rpmchecksig.c:199
#, c-format
msgid "%s: writeLead failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:204
+#: lib/rpmchecksig.c:205
#, c-format
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:374
+#: lib/rpmchecksig.c:407
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr ""
-#: lib/rpmchecksig.c:604
+#: lib/rpmchecksig.c:649
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:605 lib/rpmchecksig.c:619
+#: lib/rpmchecksig.c:650 lib/rpmchecksig.c:664
msgid " (MISSING KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:607 lib/rpmchecksig.c:621
+#: lib/rpmchecksig.c:652 lib/rpmchecksig.c:666
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:608 lib/rpmchecksig.c:622
+#: lib/rpmchecksig.c:653 lib/rpmchecksig.c:667
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:610 lib/rpmchecksig.c:624
+#: lib/rpmchecksig.c:655 lib/rpmchecksig.c:669
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:618
+#: lib/rpmchecksig.c:663
msgid "OK"
msgstr ""
@@ -3302,115 +3302,115 @@ msgstr ""
msgid "Unable to open %s for reading: %s.\n"
msgstr ""
-#: lib/signature.c:111
+#: lib/signature.c:112
msgid "file is not regular -- skipping size check\n"
msgstr ""
-#: lib/signature.c:120
+#: lib/signature.c:121
#, c-format
msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
msgstr ""
-#: lib/signature.c:125
+#: lib/signature.c:126
#, c-format
msgid " Actual size: %12d\n"
msgstr ""
-#: lib/signature.c:145
+#: lib/signature.c:146
msgid "No signature\n"
msgstr ""
-#: lib/signature.c:149
+#: lib/signature.c:150
msgid "Old PGP signature\n"
msgstr ""
-#: lib/signature.c:162
+#: lib/signature.c:163
msgid "Old (internal-only) signature! How did you get that!?\n"
msgstr ""
-#: lib/signature.c:218
+#: lib/signature.c:219
#, c-format
msgid "Signature: size(%d)+pad(%d)\n"
msgstr ""
-#: lib/signature.c:281
+#: lib/signature.c:282
#, c-format
msgid "Couldn't exec pgp (%s)\n"
msgstr ""
-#: lib/signature.c:294
+#: lib/signature.c:295
msgid "pgp failed\n"
msgstr ""
#. PGP failed to write signature
#. Just in case
-#: lib/signature.c:301
+#: lib/signature.c:302
msgid "pgp failed to write signature\n"
msgstr ""
-#: lib/signature.c:306
+#: lib/signature.c:307
#, c-format
msgid "PGP sig size: %d\n"
msgstr ""
-#: lib/signature.c:321 lib/signature.c:408
+#: lib/signature.c:322 lib/signature.c:409
msgid "unable to read the signature\n"
msgstr ""
-#: lib/signature.c:326
+#: lib/signature.c:327
#, c-format
msgid "Got %d bytes of PGP sig\n"
msgstr ""
-#: lib/signature.c:368 lib/signature.c:498
+#: lib/signature.c:369 lib/signature.c:499
msgid "Couldn't exec gpg\n"
msgstr ""
-#: lib/signature.c:381
+#: lib/signature.c:382
msgid "gpg failed\n"
msgstr ""
#. GPG failed to write signature
#. Just in case
-#: lib/signature.c:388
+#: lib/signature.c:389
msgid "gpg failed to write signature\n"
msgstr ""
-#: lib/signature.c:393
+#: lib/signature.c:394
#, c-format
msgid "GPG sig size: %d\n"
msgstr ""
-#: lib/signature.c:413
+#: lib/signature.c:414
#, c-format
msgid "Got %d bytes of GPG sig\n"
msgstr ""
-#: lib/signature.c:441
+#: lib/signature.c:442
msgid "Generating signature using PGP.\n"
msgstr ""
-#: lib/signature.c:447
+#: lib/signature.c:448
msgid "Generating signature using GPG.\n"
msgstr ""
-#: lib/signature.c:527
+#: lib/signature.c:528
msgid "Couldn't exec pgp\n"
msgstr ""
#. @notreached@
#. This case should have been screened out long ago.
-#: lib/signature.c:531 lib/signature.c:584
+#: lib/signature.c:532 lib/signature.c:585
#, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr ""
-#: lib/signature.c:564
+#: lib/signature.c:565
#, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr ""
-#: lib/signature.c:576
+#: lib/signature.c:577
#, c-format
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr ""
@@ -3832,59 +3832,59 @@ msgstr ""
msgid "File %s is smaller than %u bytes\n"
msgstr ""
-#: rpmio/rpmio.c:644
+#: rpmio/rpmio.c:656
msgid "Success"
msgstr ""
-#: rpmio/rpmio.c:647
+#: rpmio/rpmio.c:659
msgid "Bad server response"
msgstr ""
-#: rpmio/rpmio.c:650
+#: rpmio/rpmio.c:662
msgid "Server I/O error"
msgstr ""
-#: rpmio/rpmio.c:653
+#: rpmio/rpmio.c:665
msgid "Server timeout"
msgstr ""
-#: rpmio/rpmio.c:656
+#: rpmio/rpmio.c:668
msgid "Unable to lookup server host address"
msgstr ""
-#: rpmio/rpmio.c:659
+#: rpmio/rpmio.c:671
msgid "Unable to lookup server host name"
msgstr ""
-#: rpmio/rpmio.c:662
+#: rpmio/rpmio.c:674
msgid "Failed to connect to server"
msgstr ""
-#: rpmio/rpmio.c:665
+#: rpmio/rpmio.c:677
msgid "Failed to establish data connection to server"
msgstr ""
-#: rpmio/rpmio.c:668
+#: rpmio/rpmio.c:680
msgid "I/O error to local file"
msgstr ""
-#: rpmio/rpmio.c:671
+#: rpmio/rpmio.c:683
msgid "Error setting remote server to passive mode"
msgstr ""
-#: rpmio/rpmio.c:674
+#: rpmio/rpmio.c:686
msgid "File not found on server"
msgstr ""
-#: rpmio/rpmio.c:677
+#: rpmio/rpmio.c:689
msgid "Abort in progress"
msgstr ""
-#: rpmio/rpmio.c:681
+#: rpmio/rpmio.c:693
msgid "Unknown or unexpected error"
msgstr ""
-#: rpmio/rpmio.c:1353
+#: rpmio/rpmio.c:1365
#, c-format
msgid "logging into %s as %s, pw %s\n"
msgstr ""
diff --git a/po/wa.po b/po/wa.po
index bd7c3685f..c17a7f548 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-19 15:08-0400\n"
+"POT-Creation-Date: 2001-10-20 16:18-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"
@@ -2172,12 +2172,12 @@ msgstr ""
msgid "========== continuing tsort ...\n"
msgstr ""
-#: lib/formats.c:28 lib/formats.c:54 lib/formats.c:85 lib/formats.c:160
-#: lib/header.c:2902 lib/header.c:2923 lib/header.c:2945
+#: lib/formats.c:33 lib/formats.c:57 lib/formats.c:88 lib/formats.c:261
+#: lib/header.c:2929 lib/header.c:2950 lib/header.c:2972
msgid "(not a number)"
msgstr ""
-#: lib/formats.c:128
+#: lib/formats.c:129 lib/formats.c:191 lib/formats.c:236
msgid "(not a blob)"
msgstr ""
@@ -2337,7 +2337,7 @@ msgstr ""
msgid "| expected at end of expression"
msgstr ""
-#: lib/header.c:2646
+#: lib/header.c:2673
msgid "(unknown type)"
msgstr ""
@@ -3027,86 +3027,86 @@ msgstr ""
msgid "package %s is not installed\n"
msgstr ""
-#: lib/rpmchecksig.c:46
+#: lib/rpmchecksig.c:47
#, c-format
msgid "%s: open failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:58
+#: lib/rpmchecksig.c:59
msgid "makeTempFile failed\n"
msgstr ""
-#: lib/rpmchecksig.c:100
+#: lib/rpmchecksig.c:101
#, c-format
msgid "%s: Fwrite failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:106 lib/rpmchecksig.c:313
+#: lib/rpmchecksig.c:107 lib/rpmchecksig.c:326
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:143 lib/rpmchecksig.c:368
+#: lib/rpmchecksig.c:144 lib/rpmchecksig.c:401
#, c-format
msgid "%s: readLead failed\n"
msgstr ""
-#: lib/rpmchecksig.c:148
+#: lib/rpmchecksig.c:149
#, c-format
msgid "%s: Can't sign v1.0 RPM\n"
msgstr ""
-#: lib/rpmchecksig.c:152
+#: lib/rpmchecksig.c:153
#, c-format
msgid "%s: Can't re-sign v2.0 RPM\n"
msgstr ""
-#: lib/rpmchecksig.c:161 lib/rpmchecksig.c:384
+#: lib/rpmchecksig.c:162 lib/rpmchecksig.c:417
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/rpmchecksig.c:165 lib/rpmchecksig.c:389
+#: lib/rpmchecksig.c:166 lib/rpmchecksig.c:422
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/rpmchecksig.c:198
+#: lib/rpmchecksig.c:199
#, c-format
msgid "%s: writeLead failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:204
+#: lib/rpmchecksig.c:205
#, c-format
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:374
+#: lib/rpmchecksig.c:407
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr ""
-#: lib/rpmchecksig.c:604
+#: lib/rpmchecksig.c:649
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:605 lib/rpmchecksig.c:619
+#: lib/rpmchecksig.c:650 lib/rpmchecksig.c:664
msgid " (MISSING KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:607 lib/rpmchecksig.c:621
+#: lib/rpmchecksig.c:652 lib/rpmchecksig.c:666
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:608 lib/rpmchecksig.c:622
+#: lib/rpmchecksig.c:653 lib/rpmchecksig.c:667
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:610 lib/rpmchecksig.c:624
+#: lib/rpmchecksig.c:655 lib/rpmchecksig.c:669
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:618
+#: lib/rpmchecksig.c:663
msgid "OK"
msgstr ""
@@ -3302,115 +3302,115 @@ msgstr ""
msgid "Unable to open %s for reading: %s.\n"
msgstr ""
-#: lib/signature.c:111
+#: lib/signature.c:112
msgid "file is not regular -- skipping size check\n"
msgstr ""
-#: lib/signature.c:120
+#: lib/signature.c:121
#, c-format
msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
msgstr ""
-#: lib/signature.c:125
+#: lib/signature.c:126
#, c-format
msgid " Actual size: %12d\n"
msgstr ""
-#: lib/signature.c:145
+#: lib/signature.c:146
msgid "No signature\n"
msgstr ""
-#: lib/signature.c:149
+#: lib/signature.c:150
msgid "Old PGP signature\n"
msgstr ""
-#: lib/signature.c:162
+#: lib/signature.c:163
msgid "Old (internal-only) signature! How did you get that!?\n"
msgstr ""
-#: lib/signature.c:218
+#: lib/signature.c:219
#, c-format
msgid "Signature: size(%d)+pad(%d)\n"
msgstr ""
-#: lib/signature.c:281
+#: lib/signature.c:282
#, c-format
msgid "Couldn't exec pgp (%s)\n"
msgstr ""
-#: lib/signature.c:294
+#: lib/signature.c:295
msgid "pgp failed\n"
msgstr ""
#. PGP failed to write signature
#. Just in case
-#: lib/signature.c:301
+#: lib/signature.c:302
msgid "pgp failed to write signature\n"
msgstr ""
-#: lib/signature.c:306
+#: lib/signature.c:307
#, c-format
msgid "PGP sig size: %d\n"
msgstr ""
-#: lib/signature.c:321 lib/signature.c:408
+#: lib/signature.c:322 lib/signature.c:409
msgid "unable to read the signature\n"
msgstr ""
-#: lib/signature.c:326
+#: lib/signature.c:327
#, c-format
msgid "Got %d bytes of PGP sig\n"
msgstr ""
-#: lib/signature.c:368 lib/signature.c:498
+#: lib/signature.c:369 lib/signature.c:499
msgid "Couldn't exec gpg\n"
msgstr ""
-#: lib/signature.c:381
+#: lib/signature.c:382
msgid "gpg failed\n"
msgstr ""
#. GPG failed to write signature
#. Just in case
-#: lib/signature.c:388
+#: lib/signature.c:389
msgid "gpg failed to write signature\n"
msgstr ""
-#: lib/signature.c:393
+#: lib/signature.c:394
#, c-format
msgid "GPG sig size: %d\n"
msgstr ""
-#: lib/signature.c:413
+#: lib/signature.c:414
#, c-format
msgid "Got %d bytes of GPG sig\n"
msgstr ""
-#: lib/signature.c:441
+#: lib/signature.c:442
msgid "Generating signature using PGP.\n"
msgstr ""
-#: lib/signature.c:447
+#: lib/signature.c:448
msgid "Generating signature using GPG.\n"
msgstr ""
-#: lib/signature.c:527
+#: lib/signature.c:528
msgid "Couldn't exec pgp\n"
msgstr ""
#. @notreached@
#. This case should have been screened out long ago.
-#: lib/signature.c:531 lib/signature.c:584
+#: lib/signature.c:532 lib/signature.c:585
#, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr ""
-#: lib/signature.c:564
+#: lib/signature.c:565
#, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr ""
-#: lib/signature.c:576
+#: lib/signature.c:577
#, c-format
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr ""
@@ -3832,59 +3832,59 @@ msgstr ""
msgid "File %s is smaller than %u bytes\n"
msgstr ""
-#: rpmio/rpmio.c:644
+#: rpmio/rpmio.c:656
msgid "Success"
msgstr ""
-#: rpmio/rpmio.c:647
+#: rpmio/rpmio.c:659
msgid "Bad server response"
msgstr ""
-#: rpmio/rpmio.c:650
+#: rpmio/rpmio.c:662
msgid "Server I/O error"
msgstr ""
-#: rpmio/rpmio.c:653
+#: rpmio/rpmio.c:665
msgid "Server timeout"
msgstr ""
-#: rpmio/rpmio.c:656
+#: rpmio/rpmio.c:668
msgid "Unable to lookup server host address"
msgstr ""
-#: rpmio/rpmio.c:659
+#: rpmio/rpmio.c:671
msgid "Unable to lookup server host name"
msgstr ""
-#: rpmio/rpmio.c:662
+#: rpmio/rpmio.c:674
msgid "Failed to connect to server"
msgstr ""
-#: rpmio/rpmio.c:665
+#: rpmio/rpmio.c:677
msgid "Failed to establish data connection to server"
msgstr ""
-#: rpmio/rpmio.c:668
+#: rpmio/rpmio.c:680
msgid "I/O error to local file"
msgstr ""
-#: rpmio/rpmio.c:671
+#: rpmio/rpmio.c:683
msgid "Error setting remote server to passive mode"
msgstr ""
-#: rpmio/rpmio.c:674
+#: rpmio/rpmio.c:686
msgid "File not found on server"
msgstr ""
-#: rpmio/rpmio.c:677
+#: rpmio/rpmio.c:689
msgid "Abort in progress"
msgstr ""
-#: rpmio/rpmio.c:681
+#: rpmio/rpmio.c:693
msgid "Unknown or unexpected error"
msgstr ""
-#: rpmio/rpmio.c:1353
+#: rpmio/rpmio.c:1365
#, c-format
msgid "logging into %s as %s, pw %s\n"
msgstr ""
diff --git a/po/zh.po b/po/zh.po
index bd7c3685f..c17a7f548 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-19 15:08-0400\n"
+"POT-Creation-Date: 2001-10-20 16:18-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"
@@ -2172,12 +2172,12 @@ msgstr ""
msgid "========== continuing tsort ...\n"
msgstr ""
-#: lib/formats.c:28 lib/formats.c:54 lib/formats.c:85 lib/formats.c:160
-#: lib/header.c:2902 lib/header.c:2923 lib/header.c:2945
+#: lib/formats.c:33 lib/formats.c:57 lib/formats.c:88 lib/formats.c:261
+#: lib/header.c:2929 lib/header.c:2950 lib/header.c:2972
msgid "(not a number)"
msgstr ""
-#: lib/formats.c:128
+#: lib/formats.c:129 lib/formats.c:191 lib/formats.c:236
msgid "(not a blob)"
msgstr ""
@@ -2337,7 +2337,7 @@ msgstr ""
msgid "| expected at end of expression"
msgstr ""
-#: lib/header.c:2646
+#: lib/header.c:2673
msgid "(unknown type)"
msgstr ""
@@ -3027,86 +3027,86 @@ msgstr ""
msgid "package %s is not installed\n"
msgstr ""
-#: lib/rpmchecksig.c:46
+#: lib/rpmchecksig.c:47
#, c-format
msgid "%s: open failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:58
+#: lib/rpmchecksig.c:59
msgid "makeTempFile failed\n"
msgstr ""
-#: lib/rpmchecksig.c:100
+#: lib/rpmchecksig.c:101
#, c-format
msgid "%s: Fwrite failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:106 lib/rpmchecksig.c:313
+#: lib/rpmchecksig.c:107 lib/rpmchecksig.c:326
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:143 lib/rpmchecksig.c:368
+#: lib/rpmchecksig.c:144 lib/rpmchecksig.c:401
#, c-format
msgid "%s: readLead failed\n"
msgstr ""
-#: lib/rpmchecksig.c:148
+#: lib/rpmchecksig.c:149
#, c-format
msgid "%s: Can't sign v1.0 RPM\n"
msgstr ""
-#: lib/rpmchecksig.c:152
+#: lib/rpmchecksig.c:153
#, c-format
msgid "%s: Can't re-sign v2.0 RPM\n"
msgstr ""
-#: lib/rpmchecksig.c:161 lib/rpmchecksig.c:384
+#: lib/rpmchecksig.c:162 lib/rpmchecksig.c:417
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/rpmchecksig.c:165 lib/rpmchecksig.c:389
+#: lib/rpmchecksig.c:166 lib/rpmchecksig.c:422
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/rpmchecksig.c:198
+#: lib/rpmchecksig.c:199
#, c-format
msgid "%s: writeLead failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:204
+#: lib/rpmchecksig.c:205
#, c-format
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:374
+#: lib/rpmchecksig.c:407
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr ""
-#: lib/rpmchecksig.c:604
+#: lib/rpmchecksig.c:649
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:605 lib/rpmchecksig.c:619
+#: lib/rpmchecksig.c:650 lib/rpmchecksig.c:664
msgid " (MISSING KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:607 lib/rpmchecksig.c:621
+#: lib/rpmchecksig.c:652 lib/rpmchecksig.c:666
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:608 lib/rpmchecksig.c:622
+#: lib/rpmchecksig.c:653 lib/rpmchecksig.c:667
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:610 lib/rpmchecksig.c:624
+#: lib/rpmchecksig.c:655 lib/rpmchecksig.c:669
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:618
+#: lib/rpmchecksig.c:663
msgid "OK"
msgstr ""
@@ -3302,115 +3302,115 @@ msgstr ""
msgid "Unable to open %s for reading: %s.\n"
msgstr ""
-#: lib/signature.c:111
+#: lib/signature.c:112
msgid "file is not regular -- skipping size check\n"
msgstr ""
-#: lib/signature.c:120
+#: lib/signature.c:121
#, c-format
msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
msgstr ""
-#: lib/signature.c:125
+#: lib/signature.c:126
#, c-format
msgid " Actual size: %12d\n"
msgstr ""
-#: lib/signature.c:145
+#: lib/signature.c:146
msgid "No signature\n"
msgstr ""
-#: lib/signature.c:149
+#: lib/signature.c:150
msgid "Old PGP signature\n"
msgstr ""
-#: lib/signature.c:162
+#: lib/signature.c:163
msgid "Old (internal-only) signature! How did you get that!?\n"
msgstr ""
-#: lib/signature.c:218
+#: lib/signature.c:219
#, c-format
msgid "Signature: size(%d)+pad(%d)\n"
msgstr ""
-#: lib/signature.c:281
+#: lib/signature.c:282
#, c-format
msgid "Couldn't exec pgp (%s)\n"
msgstr ""
-#: lib/signature.c:294
+#: lib/signature.c:295
msgid "pgp failed\n"
msgstr ""
#. PGP failed to write signature
#. Just in case
-#: lib/signature.c:301
+#: lib/signature.c:302
msgid "pgp failed to write signature\n"
msgstr ""
-#: lib/signature.c:306
+#: lib/signature.c:307
#, c-format
msgid "PGP sig size: %d\n"
msgstr ""
-#: lib/signature.c:321 lib/signature.c:408
+#: lib/signature.c:322 lib/signature.c:409
msgid "unable to read the signature\n"
msgstr ""
-#: lib/signature.c:326
+#: lib/signature.c:327
#, c-format
msgid "Got %d bytes of PGP sig\n"
msgstr ""
-#: lib/signature.c:368 lib/signature.c:498
+#: lib/signature.c:369 lib/signature.c:499
msgid "Couldn't exec gpg\n"
msgstr ""
-#: lib/signature.c:381
+#: lib/signature.c:382
msgid "gpg failed\n"
msgstr ""
#. GPG failed to write signature
#. Just in case
-#: lib/signature.c:388
+#: lib/signature.c:389
msgid "gpg failed to write signature\n"
msgstr ""
-#: lib/signature.c:393
+#: lib/signature.c:394
#, c-format
msgid "GPG sig size: %d\n"
msgstr ""
-#: lib/signature.c:413
+#: lib/signature.c:414
#, c-format
msgid "Got %d bytes of GPG sig\n"
msgstr ""
-#: lib/signature.c:441
+#: lib/signature.c:442
msgid "Generating signature using PGP.\n"
msgstr ""
-#: lib/signature.c:447
+#: lib/signature.c:448
msgid "Generating signature using GPG.\n"
msgstr ""
-#: lib/signature.c:527
+#: lib/signature.c:528
msgid "Couldn't exec pgp\n"
msgstr ""
#. @notreached@
#. This case should have been screened out long ago.
-#: lib/signature.c:531 lib/signature.c:584
+#: lib/signature.c:532 lib/signature.c:585
#, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr ""
-#: lib/signature.c:564
+#: lib/signature.c:565
#, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr ""
-#: lib/signature.c:576
+#: lib/signature.c:577
#, c-format
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr ""
@@ -3832,59 +3832,59 @@ msgstr ""
msgid "File %s is smaller than %u bytes\n"
msgstr ""
-#: rpmio/rpmio.c:644
+#: rpmio/rpmio.c:656
msgid "Success"
msgstr ""
-#: rpmio/rpmio.c:647
+#: rpmio/rpmio.c:659
msgid "Bad server response"
msgstr ""
-#: rpmio/rpmio.c:650
+#: rpmio/rpmio.c:662
msgid "Server I/O error"
msgstr ""
-#: rpmio/rpmio.c:653
+#: rpmio/rpmio.c:665
msgid "Server timeout"
msgstr ""
-#: rpmio/rpmio.c:656
+#: rpmio/rpmio.c:668
msgid "Unable to lookup server host address"
msgstr ""
-#: rpmio/rpmio.c:659
+#: rpmio/rpmio.c:671
msgid "Unable to lookup server host name"
msgstr ""
-#: rpmio/rpmio.c:662
+#: rpmio/rpmio.c:674
msgid "Failed to connect to server"
msgstr ""
-#: rpmio/rpmio.c:665
+#: rpmio/rpmio.c:677
msgid "Failed to establish data connection to server"
msgstr ""
-#: rpmio/rpmio.c:668
+#: rpmio/rpmio.c:680
msgid "I/O error to local file"
msgstr ""
-#: rpmio/rpmio.c:671
+#: rpmio/rpmio.c:683
msgid "Error setting remote server to passive mode"
msgstr ""
-#: rpmio/rpmio.c:674
+#: rpmio/rpmio.c:686
msgid "File not found on server"
msgstr ""
-#: rpmio/rpmio.c:677
+#: rpmio/rpmio.c:689
msgid "Abort in progress"
msgstr ""
-#: rpmio/rpmio.c:681
+#: rpmio/rpmio.c:693
msgid "Unknown or unexpected error"
msgstr ""
-#: rpmio/rpmio.c:1353
+#: rpmio/rpmio.c:1365
#, c-format
msgid "logging into %s as %s, pw %s\n"
msgstr ""
diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index bd7c3685f..c17a7f548 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2001-10-19 15:08-0400\n"
+"POT-Creation-Date: 2001-10-20 16:18-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"
@@ -2172,12 +2172,12 @@ msgstr ""
msgid "========== continuing tsort ...\n"
msgstr ""
-#: lib/formats.c:28 lib/formats.c:54 lib/formats.c:85 lib/formats.c:160
-#: lib/header.c:2902 lib/header.c:2923 lib/header.c:2945
+#: lib/formats.c:33 lib/formats.c:57 lib/formats.c:88 lib/formats.c:261
+#: lib/header.c:2929 lib/header.c:2950 lib/header.c:2972
msgid "(not a number)"
msgstr ""
-#: lib/formats.c:128
+#: lib/formats.c:129 lib/formats.c:191 lib/formats.c:236
msgid "(not a blob)"
msgstr ""
@@ -2337,7 +2337,7 @@ msgstr ""
msgid "| expected at end of expression"
msgstr ""
-#: lib/header.c:2646
+#: lib/header.c:2673
msgid "(unknown type)"
msgstr ""
@@ -3027,86 +3027,86 @@ msgstr ""
msgid "package %s is not installed\n"
msgstr ""
-#: lib/rpmchecksig.c:46
+#: lib/rpmchecksig.c:47
#, c-format
msgid "%s: open failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:58
+#: lib/rpmchecksig.c:59
msgid "makeTempFile failed\n"
msgstr ""
-#: lib/rpmchecksig.c:100
+#: lib/rpmchecksig.c:101
#, c-format
msgid "%s: Fwrite failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:106 lib/rpmchecksig.c:313
+#: lib/rpmchecksig.c:107 lib/rpmchecksig.c:326
#, c-format
msgid "%s: Fread failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:143 lib/rpmchecksig.c:368
+#: lib/rpmchecksig.c:144 lib/rpmchecksig.c:401
#, c-format
msgid "%s: readLead failed\n"
msgstr ""
-#: lib/rpmchecksig.c:148
+#: lib/rpmchecksig.c:149
#, c-format
msgid "%s: Can't sign v1.0 RPM\n"
msgstr ""
-#: lib/rpmchecksig.c:152
+#: lib/rpmchecksig.c:153
#, c-format
msgid "%s: Can't re-sign v2.0 RPM\n"
msgstr ""
-#: lib/rpmchecksig.c:161 lib/rpmchecksig.c:384
+#: lib/rpmchecksig.c:162 lib/rpmchecksig.c:417
#, c-format
msgid "%s: rpmReadSignature failed\n"
msgstr ""
-#: lib/rpmchecksig.c:165 lib/rpmchecksig.c:389
+#: lib/rpmchecksig.c:166 lib/rpmchecksig.c:422
#, c-format
msgid "%s: No signature available\n"
msgstr ""
-#: lib/rpmchecksig.c:198
+#: lib/rpmchecksig.c:199
#, c-format
msgid "%s: writeLead failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:204
+#: lib/rpmchecksig.c:205
#, c-format
msgid "%s: rpmWriteSignature failed: %s\n"
msgstr ""
-#: lib/rpmchecksig.c:374
+#: lib/rpmchecksig.c:407
#, c-format
msgid "%s: No signature available (v1.0 RPM)\n"
msgstr ""
-#: lib/rpmchecksig.c:604
+#: lib/rpmchecksig.c:649
msgid "NOT OK"
msgstr ""
-#: lib/rpmchecksig.c:605 lib/rpmchecksig.c:619
+#: lib/rpmchecksig.c:650 lib/rpmchecksig.c:664
msgid " (MISSING KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:607 lib/rpmchecksig.c:621
+#: lib/rpmchecksig.c:652 lib/rpmchecksig.c:666
msgid ") "
msgstr ""
-#: lib/rpmchecksig.c:608 lib/rpmchecksig.c:622
+#: lib/rpmchecksig.c:653 lib/rpmchecksig.c:667
msgid " (UNTRUSTED KEYS:"
msgstr ""
-#: lib/rpmchecksig.c:610 lib/rpmchecksig.c:624
+#: lib/rpmchecksig.c:655 lib/rpmchecksig.c:669
msgid ")"
msgstr ""
-#: lib/rpmchecksig.c:618
+#: lib/rpmchecksig.c:663
msgid "OK"
msgstr ""
@@ -3302,115 +3302,115 @@ msgstr ""
msgid "Unable to open %s for reading: %s.\n"
msgstr ""
-#: lib/signature.c:111
+#: lib/signature.c:112
msgid "file is not regular -- skipping size check\n"
msgstr ""
-#: lib/signature.c:120
+#: lib/signature.c:121
#, c-format
msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
msgstr ""
-#: lib/signature.c:125
+#: lib/signature.c:126
#, c-format
msgid " Actual size: %12d\n"
msgstr ""
-#: lib/signature.c:145
+#: lib/signature.c:146
msgid "No signature\n"
msgstr ""
-#: lib/signature.c:149
+#: lib/signature.c:150
msgid "Old PGP signature\n"
msgstr ""
-#: lib/signature.c:162
+#: lib/signature.c:163
msgid "Old (internal-only) signature! How did you get that!?\n"
msgstr ""
-#: lib/signature.c:218
+#: lib/signature.c:219
#, c-format
msgid "Signature: size(%d)+pad(%d)\n"
msgstr ""
-#: lib/signature.c:281
+#: lib/signature.c:282
#, c-format
msgid "Couldn't exec pgp (%s)\n"
msgstr ""
-#: lib/signature.c:294
+#: lib/signature.c:295
msgid "pgp failed\n"
msgstr ""
#. PGP failed to write signature
#. Just in case
-#: lib/signature.c:301
+#: lib/signature.c:302
msgid "pgp failed to write signature\n"
msgstr ""
-#: lib/signature.c:306
+#: lib/signature.c:307
#, c-format
msgid "PGP sig size: %d\n"
msgstr ""
-#: lib/signature.c:321 lib/signature.c:408
+#: lib/signature.c:322 lib/signature.c:409
msgid "unable to read the signature\n"
msgstr ""
-#: lib/signature.c:326
+#: lib/signature.c:327
#, c-format
msgid "Got %d bytes of PGP sig\n"
msgstr ""
-#: lib/signature.c:368 lib/signature.c:498
+#: lib/signature.c:369 lib/signature.c:499
msgid "Couldn't exec gpg\n"
msgstr ""
-#: lib/signature.c:381
+#: lib/signature.c:382
msgid "gpg failed\n"
msgstr ""
#. GPG failed to write signature
#. Just in case
-#: lib/signature.c:388
+#: lib/signature.c:389
msgid "gpg failed to write signature\n"
msgstr ""
-#: lib/signature.c:393
+#: lib/signature.c:394
#, c-format
msgid "GPG sig size: %d\n"
msgstr ""
-#: lib/signature.c:413
+#: lib/signature.c:414
#, c-format
msgid "Got %d bytes of GPG sig\n"
msgstr ""
-#: lib/signature.c:441
+#: lib/signature.c:442
msgid "Generating signature using PGP.\n"
msgstr ""
-#: lib/signature.c:447
+#: lib/signature.c:448
msgid "Generating signature using GPG.\n"
msgstr ""
-#: lib/signature.c:527
+#: lib/signature.c:528
msgid "Couldn't exec pgp\n"
msgstr ""
#. @notreached@
#. This case should have been screened out long ago.
-#: lib/signature.c:531 lib/signature.c:584
+#: lib/signature.c:532 lib/signature.c:585
#, c-format
msgid "Invalid %%_signature spec in macro file\n"
msgstr ""
-#: lib/signature.c:564
+#: lib/signature.c:565
#, c-format
msgid "You must set \"%%_gpg_name\" in your macro file\n"
msgstr ""
-#: lib/signature.c:576
+#: lib/signature.c:577
#, c-format
msgid "You must set \"%%_pgp_name\" in your macro file\n"
msgstr ""
@@ -3832,59 +3832,59 @@ msgstr ""
msgid "File %s is smaller than %u bytes\n"
msgstr ""
-#: rpmio/rpmio.c:644
+#: rpmio/rpmio.c:656
msgid "Success"
msgstr ""
-#: rpmio/rpmio.c:647
+#: rpmio/rpmio.c:659
msgid "Bad server response"
msgstr ""
-#: rpmio/rpmio.c:650
+#: rpmio/rpmio.c:662
msgid "Server I/O error"
msgstr ""
-#: rpmio/rpmio.c:653
+#: rpmio/rpmio.c:665
msgid "Server timeout"
msgstr ""
-#: rpmio/rpmio.c:656
+#: rpmio/rpmio.c:668
msgid "Unable to lookup server host address"
msgstr ""
-#: rpmio/rpmio.c:659
+#: rpmio/rpmio.c:671
msgid "Unable to lookup server host name"
msgstr ""
-#: rpmio/rpmio.c:662
+#: rpmio/rpmio.c:674
msgid "Failed to connect to server"
msgstr ""
-#: rpmio/rpmio.c:665
+#: rpmio/rpmio.c:677
msgid "Failed to establish data connection to server"
msgstr ""
-#: rpmio/rpmio.c:668
+#: rpmio/rpmio.c:680
msgid "I/O error to local file"
msgstr ""
-#: rpmio/rpmio.c:671
+#: rpmio/rpmio.c:683
msgid "Error setting remote server to passive mode"
msgstr ""
-#: rpmio/rpmio.c:674
+#: rpmio/rpmio.c:686
msgid "File not found on server"
msgstr ""
-#: rpmio/rpmio.c:677
+#: rpmio/rpmio.c:689
msgid "Abort in progress"
msgstr ""
-#: rpmio/rpmio.c:681
+#: rpmio/rpmio.c:693
msgid "Unknown or unexpected error"
msgstr ""
-#: rpmio/rpmio.c:1353
+#: rpmio/rpmio.c:1365
#, c-format
msgid "logging into %s as %s, pw %s\n"
msgstr ""
diff --git a/rpm.spec b/rpm.spec
index 634550523..7876d1d47 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -524,4 +524,6 @@ fi
- ratchet up to lclint "strict" level.
- upgrade to db-4.0.7.
- use only header methods, routines are now static.
-- beecrypt is at least as good as pgp/gpg on verify, pull the plug.
+- beecrypt is at least as good as pgp/gpg on verify, pulling the plug.
+- add :base64 and :armor format extensions, dump binary tags in hex.
+- proof-of-concept pubkey retrieval from RPM-{PGP,GPG}-KEY.
diff --git a/rpm.spec.in b/rpm.spec.in
index 22d4e891a..bb8dcc211 100644
--- a/rpm.spec.in
+++ b/rpm.spec.in
@@ -524,4 +524,6 @@ fi
- ratchet up to lclint "strict" level.
- upgrade to db-4.0.7.
- use only header methods, routines are now static.
-- beecrypt is at least as good as pgp/gpg on verify, pull the plug.
+- beecrypt is at least as good as pgp/gpg on verify, pulling the plug.
+- add :base64 and :armor format extensions, dump binary tags in hex.
+- proof-of-concept pubkey retrieval from RPM-{PGP,GPG}-KEY.
diff --git a/rpmio/Makefile.am b/rpmio/Makefile.am
index fc24c9f26..2246021ab 100644
--- a/rpmio/Makefile.am
+++ b/rpmio/Makefile.am
@@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = 1.4 foreign
EXTRA_DIST = tdigest.c tficl.c tkey.c trpmio.c
-EXTRA_PROGRAMS = tdigest tkey trpmio dumpasn1
+EXTRA_PROGRAMS = tdigest tkey tring trpmio dumpasn1
INCLUDES = \
-I$(top_srcdir) \
@@ -58,6 +58,10 @@ tkey_SOURCES = tkey.c
tkey_LDFLAGS = -all-static
tkey_LDADD += librpmio.la $(top_builddir)/popt/libpopt.la
+tring_SOURCES = tring.c
+tring_LDFLAGS = -all-static
+tring_LDADD += librpmio.la $(top_builddir)/popt/libpopt.la
+
dumpasn1_SOURCES = dumpasn1.c
.PHONY: sources
diff --git a/rpmio/rpmpgp.c b/rpmio/rpmpgp.c
index 2d694133b..27b3ade69 100644
--- a/rpmio/rpmpgp.c
+++ b/rpmio/rpmpgp.c
@@ -205,7 +205,7 @@ struct pgpValTbl_s pgpPktTbl[] = {
{ PGPPKT_USER_ID, "User ID" },
{ PGPPKT_PUBLIC_SUBKEY, "Public Subkey" },
{ PGPPKT_COMMENT_OLD, "Comment (from OpenPGP draft)" },
- { PGPPKT_PHOTOID, "PGP's pgoto ID" },
+ { PGPPKT_PHOTOID, "PGP's photo ID" },
{ PGPPKT_ENCRYPTED_MDC, "Integrity protected encrypted data" },
{ PGPPKT_MDC, "Manipulaion detection code packet" },
{ PGPPKT_PRIVATE_60, "Private #60" },
@@ -215,6 +215,26 @@ struct pgpValTbl_s pgpPktTbl[] = {
{ -1, "Unknown packet tag" },
};
+struct pgpValTbl_s pgpArmorTbl[] = {
+ { PGPARMOR_MESSAGE, "MESSAGE" },
+ { PGPARMOR_PUBKEY, "PUBLIC KEY BLOCK" },
+ { PGPARMOR_SIGNATURE, "SIGNATURE" },
+ { PGPARMOR_SIGNED_MESSAGE, "SIGNED MESSAGE" },
+ { PGPARMOR_FILE, "ARMORED FILE" },
+ { PGPARMOR_PRIVKEY, "PRIVATE KEY BLOCK" },
+ { PGPARMOR_SECKEY, "SECRET KEY BLOCK" },
+ { -1, "Unknown armor block" }
+};
+
+struct pgpValTbl_s pgpArmorKeyTbl[] = {
+ { PGPARMORKEY_VERSION, "Version: " },
+ { PGPARMORKEY_COMMENT, "Comment: " },
+ { PGPARMORKEY_MESSAGEID, "MessageID: " },
+ { PGPARMORKEY_HASH, "Hash: " },
+ { PGPARMORKEY_CHARSET, "Charset: " },
+ { -1, "Unknown armor key" }
+};
+
static void pgpPrtNL(void)
/*@globals fileSystem @*/
/*@modifies fileSystem @*/
@@ -319,7 +339,9 @@ int pgpPrtPktSigV3(pgpPkt pkt, const byte *h, unsigned int hlen)
}
/*@-mods@*/
- if (_dig) memcpy(&_dig->sig.v3, v, sizeof(_dig->sig.v3));
+ if (_dig && pkt == PGPPKT_SIGNATURE &&
+ (v->sigtype == PGPSIGTYPE_BINARY || v->sigtype == PGPSIGTYPE_TEXT))
+ _dig->signature.v3 = memcpy(xmalloc(hlen), h, hlen);
/*@=mods@*/
pgpPrtVal("V3 ", pgpPktTbl, pkt);
@@ -483,7 +505,9 @@ int pgpPrtPktSigV4(pgpPkt pkt, const byte *h, unsigned int hlen)
}
/*@-mods@*/
- if (_dig) memcpy(&_dig->sig.v4, v, sizeof(_dig->sig.v4));
+ if (_dig && pkt == PGPPKT_SIGNATURE &&
+ (v->sigtype == PGPSIGTYPE_BINARY || v->sigtype == PGPSIGTYPE_TEXT))
+ _dig->signature.v4 = memcpy(xmalloc(hlen), h, hlen);
/*@=mods@*/
pgpPrtVal("V4 ", pgpPktTbl, pkt);
@@ -640,11 +664,17 @@ int pgpPrtKeyV3(pgpPkt pkt, const byte *h, unsigned int hlen)
time_t t;
int i;
- pgpPrtVal("", pgpPktTbl, pkt);
if (v->version != 3) {
fprintf(stderr, " version(%u) != 3\n", (unsigned)v->version);
return 1;
}
+
+ /*@-mods@*/
+ if (_dig && pkt == PGPPKT_PUBLIC_KEY)
+ _dig->pubkey.v3 = memcpy(xmalloc(hlen), h, hlen);
+ /*@=mods@*/
+
+ pgpPrtVal("V3 ", pgpPktTbl, pkt);
pgpPrtVal(" ", pgpPubkeyTbl, v->pubkey_algo);
t = pgpGrab(v->time, sizeof(v->time));
if (_print)
@@ -732,11 +762,17 @@ int pgpPrtKeyV4(pgpPkt pkt, const byte *h, unsigned int hlen)
time_t t;
int i;
- pgpPrtVal("", pgpPktTbl, pkt);
if (v->version != 4) {
fprintf(stderr, " version(%u) != 4\n", (unsigned)v->version);
return 1;
}
+
+ /*@-mods@*/
+ if (_dig && pkt == PGPPKT_PUBLIC_KEY)
+ _dig->pubkey.v4 = memcpy(xmalloc(hlen), h, hlen);
+ /*@=mods@*/
+
+ pgpPrtVal("V4 ", pgpPktTbl, pkt);
pgpPrtVal(" ", pgpPubkeyTbl, v->pubkey_algo);
t = pgpGrab(v->time, sizeof(v->time));
if (_print)
diff --git a/rpmio/rpmpgp.h b/rpmio/rpmpgp.h
index 7f89daaff..4c1d3722f 100644
--- a/rpmio/rpmpgp.h
+++ b/rpmio/rpmpgp.h
@@ -846,6 +846,38 @@ typedef struct pgpPktUid_s {
/**
*/
+typedef enum pgpArmor_e {
+ PGPARMOR_MESSAGE = 1, /*!< MESSAGE */
+ PGPARMOR_PUBKEY = 2, /*!< PUBLIC KEY BLOCK */
+ PGPARMOR_SIGNATURE = 3, /*!< SIGNATURE */
+ PGPARMOR_SIGNED_MESSAGE = 4, /*!< SIGNED MESSAGE */
+ PGPARMOR_FILE = 5, /*!< ARMORED FILE */
+ PGPARMOR_PRIVKEY = 6, /*!< PRIVATE KEY BLOCK */
+ PGPARMOR_SECKEY = 7, /*!< SECRET KEY BLOCK */
+} pgpArmor;
+
+/**
+ */
+/*@observer@*/ /*@unchecked@*/ /*@unused@*/
+extern struct pgpValTbl_s pgpArmorTbl[];
+
+/**
+ */
+typedef enum pgpArmorKey_e {
+ PGPARMORKEY_VERSION = 1, /*!< Version: */
+ PGPARMORKEY_COMMENT = 2, /*!< Comment: */
+ PGPARMORKEY_MESSAGEID = 3, /*!< MessageID: */
+ PGPARMORKEY_HASH = 4, /*!< Hash: */
+ PGPARMORKEY_CHARSET = 5, /*!< Charset: */
+} pgpArmorKey;
+
+/**
+ */
+/*@observer@*/ /*@unchecked@*/ /*@unused@*/
+extern struct pgpValTbl_s pgpArmorKeyTbl[];
+
+/**
+ */
/*@observer@*/ /*@unchecked@*/ /*@unused@*/
extern const char * redhatPubKeyDSA;
@@ -858,9 +890,14 @@ extern const char * redhatPubKeyRSA;
*/
typedef struct pgpSig_s {
union {
- struct pgpPktSigV3_s v3;
- struct pgpPktSigV4_s v4;
- } sig;
+ struct pgpPktSigV3_s * v3;
+ struct pgpPktSigV4_s * v4;
+ } signature;
+
+ union {
+ struct pgpPktKeyV3_s * v3;
+ struct pgpPktKeyV4_s * v4;
+ } pubkey;
size_t nbytes; /*!< No. bytes of plain text. */
@@ -1015,6 +1052,20 @@ const char * pgpValStr(pgpValTbl vs, byte val)
return vs->str;
}
+/**
+ */
+/*@unused@*/ static inline
+int pgpValTok(pgpValTbl vs, const char * s, const char * se)
+ /*@*/
+{
+ do {
+ int vlen = strlen(vs->str);
+ if (vlen <= (se-s) && !strncmp(s, vs->str, vlen))
+ break;
+ } while ((++vs)->val != -1);
+ return vs->val;
+}
+
/*@-exportlocal@*/
/**
*/
@@ -1089,6 +1140,82 @@ int pgpPrtPkts(const byte *pkts, unsigned int plen, struct pgpSig_s *dig, int pr
/*@globals fileSystem@*/
/*@modifies fileSystem @*/;
+/**
+ */
+/*@unused@*/ static inline
+int pgpIsPkt(const byte * p)
+ /*@*/
+{
+ unsigned int val = *p++;
+ pgpPkt pkt;
+ int rc;
+
+ /* XXX can't deal with these. */
+ if (!(val & 0x80))
+ return 0;
+
+ if (val & 0x40)
+ pkt = (val & 0x3f);
+ else
+ pkt = (val >> 2) & 0xf;
+
+ switch (pkt) {
+ case PGPPKT_MARKER:
+ case PGPPKT_SYMMETRIC_SESSION_KEY:
+ case PGPPKT_ONEPASS_SIGNATURE:
+ case PGPPKT_PUBLIC_KEY:
+ case PGPPKT_SECRET_KEY:
+ case PGPPKT_PUBLIC_SESSION_KEY:
+ case PGPPKT_SIGNATURE:
+ case PGPPKT_COMMENT:
+ case PGPPKT_COMMENT_OLD:
+ case PGPPKT_LITERAL_DATA:
+ case PGPPKT_COMPRESSED_DATA:
+ case PGPPKT_SYMMETRIC_DATA:
+ rc = 1;
+ break;
+ case PGPPKT_PUBLIC_SUBKEY:
+ case PGPPKT_SECRET_SUBKEY:
+ case PGPPKT_USER_ID:
+ case PGPPKT_RESERVED:
+ case PGPPKT_TRUST:
+ case PGPPKT_PHOTOID:
+ case PGPPKT_ENCRYPTED_MDC:
+ case PGPPKT_MDC:
+ case PGPPKT_PRIVATE_60:
+ case PGPPKT_PRIVATE_62:
+ case PGPPKT_CONTROL:
+ default:
+ rc = 0;
+ break;
+ }
+
+ return rc;
+}
+
+#define CRC24_INIT 0xb704ce
+#define CRC24_POLY 0x1864cfb
+
+/**
+ */
+/*@unused@*/ static inline
+uint32 pgpCRC(const byte *octets, size_t len)
+ /*@*/
+{
+ uint32 crc = CRC24_INIT;
+ int i;
+
+ while (len--) {
+ crc ^= (*octets++) << 16;
+ for (i = 0; i < 8; i++) {
+ crc <<= 1;
+ if (crc & 0x1000000)
+ crc ^= CRC24_POLY;
+ }
+ }
+ return crc & 0xffffff;
+}
+
#ifdef __cplusplus
}
#endif
diff --git a/rpmio/tring.c b/rpmio/tring.c
new file mode 100644
index 000000000..8a231d244
--- /dev/null
+++ b/rpmio/tring.c
@@ -0,0 +1,215 @@
+#include "system.h"
+#include "rpmio_internal.h"
+#include "misc.h"
+#include "popt.h"
+#include "debug.h"
+
+static int rpmSlurp(const char * fn, const byte ** bp, ssize_t * blenp)
+{
+ static ssize_t blenmax = (8 * BUFSIZ);
+ ssize_t blen = 0;
+ byte * b = NULL;
+ ssize_t size;
+ FD_t fd;
+ int rc = 0;
+
+ fd = Fopen(fn, "r.ufdio");
+ if (fd == NULL || Ferror(fd)) {
+ rc = 2;
+ goto exit;
+ }
+
+ size = fdSize(fd);
+ blen = (size >= 0 ? size : blenmax);
+ if (blen) {
+ int nb;
+ b = xmalloc(blen+1);
+ b[0] = '\0';
+ nb = Fread(b, sizeof(*b), blen, fd);
+ if (Ferror(fd) || (size > 0 && nb != blen)) {
+ rc = 1;
+ goto exit;
+ }
+ if (blen == blenmax && nb < blen) {
+ blen = nb;
+ b = xrealloc(b, blen+1);
+ }
+ b[blen] = '\0';
+ }
+
+exit:
+ if (fd) (void) Fclose(fd);
+
+ if (rc) {
+ if (b) free(b);
+ b = NULL;
+ blen = 0;
+ }
+
+ if (bp) *bp = b;
+ else if (b) free(b);
+
+ if (blenp) *blenp = blen;
+
+ return rc;
+}
+
+static int rpmReadPgpPkt(const char * fn, const byte ** pkt, size_t * pktlen)
+{
+ const byte * b = NULL;
+ ssize_t blen;
+ const char * enc = NULL;
+ const char * crcenc = NULL;
+ byte * dec;
+ byte * crcdec;
+ size_t declen;
+ size_t crclen;
+ uint32 crcpkt, crc;
+ const char * armortype = NULL;
+ char * t, * te;
+ int pstate = 0;
+ int ec = 1; /* XXX assume failure */
+ int rc;
+
+ rc = rpmSlurp(fn, &b, &blen);
+ if (rc || b == NULL || blen <= 0)
+ goto exit;
+
+ if (pgpIsPkt(b)) {
+ ec = 0;
+ goto exit;
+ }
+
+#define TOKEQ(_s, _tok) (!strncmp((_s), (_tok), sizeof(_tok)-1))
+
+ for (t = (char *)b; t && *t; t = te) {
+ if ((te = strchr(t, '\n')) == NULL)
+ te = t + strlen(t);
+ else
+ te++;
+
+ switch (pstate) {
+ case 0:
+ armortype = NULL;
+ if (!TOKEQ(t, "-----BEGIN PGP "))
+ continue;
+ t += sizeof("-----BEGIN PGP ")-1;
+
+ rc = pgpValTok(pgpArmorTbl, t, te);
+ if (rc < 0)
+ goto exit;
+ armortype = t;
+
+ t = te - (sizeof("-----\n")-1);
+ if (!TOKEQ(t, "-----\n"))
+ continue;
+ *t = '\0';
+ pstate++;
+ break;
+ case 1:
+ enc = NULL;
+ rc = pgpValTok(pgpArmorKeyTbl, t, te);
+ if (rc >= 0)
+ continue;
+ if (*t != '\n') {
+ pstate = 0;
+ continue;
+ }
+ enc = te; /* Start of encoded packets */
+ pstate++;
+ break;
+ case 2:
+ crcenc = NULL;
+ if (*t != '=')
+ continue;
+ *t++ = '\0'; /* Terminate encoded packets */
+ crcenc = t; /* Start of encoded crc */
+ pstate++;
+ break;
+ case 3:
+ pstate = 0;
+ if (!TOKEQ(t, "-----END PGP "))
+ goto exit;
+ *t = '\0'; /* Terminate encoded crc */
+ t += sizeof("-----END PGP ")-1;
+
+ if (armortype == NULL) /* XXX can't happen */
+ continue;
+ rc = strncmp(t, armortype, strlen(armortype));
+ if (rc)
+ continue;
+
+ t = te - (sizeof("-----\n")-1);
+ if (!TOKEQ(t, "-----\n"))
+ goto exit;
+
+ if (b64decode(crcenc, (void **)&crcdec, &crclen) != 0)
+ continue;
+ crcpkt = pgpGrab(crcdec, crclen);
+ free(crcdec);
+ if (b64decode(enc, (void **)&dec, &declen) != 0)
+ goto exit;
+ crc = pgpCRC(dec, declen);
+ if (crcpkt != crc)
+ goto exit;
+ free((void *)b);
+ b = dec;
+ blen = declen;
+ ec = 0;
+ goto exit;
+ /*@notreached@*/ break;
+ }
+ }
+
+exit:
+ if (ec == 0 && pkt)
+ *pkt = b;
+ else if (b != NULL)
+ free((void *)b);
+ if (pktlen)
+ *pktlen = blen;
+ return rc;
+}
+
+static int printing = 0;
+static int _debug = 0;
+
+static struct poptOption optionsTable[] = {
+ { "print", 'p', POPT_ARG_VAL, &printing, 1, NULL, NULL },
+ { "noprint", 'n', POPT_ARG_VAL, &printing, 0, NULL, NULL },
+ { "debug", 'd', POPT_ARG_VAL, &_debug, -1, NULL, NULL },
+ POPT_AUTOHELP
+ POPT_TABLEEND
+};
+
+int
+main (int argc, const char *argv[])
+{
+ poptContext optCon = poptGetContext(argv[0], argc, argv, optionsTable, 0);
+ rpmDigest dig;
+ const byte * pkt = NULL;
+ ssize_t pktlen;
+ const char ** args;
+ const char * fn;
+ int rc = 0;
+
+ while ((rc = poptGetNextOpt(optCon)) > 0)
+ ;
+
+ if ((args = poptGetArgs(optCon)) != NULL)
+ while ((fn = *args++) != NULL) {
+ rc = rpmReadPgpPkt(fn, &pkt, &pktlen);
+ if (rc || pkt == NULL || pktlen <= 0)
+ continue;
+
+fprintf(stderr, "===================== %s\n", fn);
+ dig = xcalloc(1, sizeof(*dig));
+ (void) pgpPrtPkts(pkt, pktlen, dig, printing);
+ free((void *)pkt);
+ pkt = NULL;
+ free((void *)dig);
+ dig = NULL;
+ }
+
+ return rc;
+}