- add header DSA signature.

CVS patchset: 5345
CVS date: 2002/03/06 23:17:31

41 files changed, 3502 insertions, 2780 deletions

diff --git a/CHANGES b/CHANGES
index b7a5087e7..279911bb6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -88,6 +88,7 @@
 	- add Pubkey index, using signer id as binary key.
 	- display pubkeys in hex when debugging db access.
 	- retrieve pubkey(s) from rpmdb, not from detached signature file.
+	- add header DSA signature.
 
 4.0.3 -> 4.0.4:
 	- solaris: translate i86pc to i386 (#57182).
diff --git a/acconfig.h b/acconfig.h
index 44ac591d8..a533d54b5 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -14,12 +14,6 @@
    Leave the following blank line there!!  Autoheader needs it.  */
 
 
-/* Define to the name of the distribution.  */
-#undef PACKAGE
-
-/* Define to the version of the distribution.  */
-#undef VERSION
-
 /* Define to 1 if ANSI function prototypes are usable.  */
 #undef PROTOTYPES
 
diff --git a/beecrypt/dsa.c b/beecrypt/dsa.c
index 3084c1784..3db13fb7a 100644
--- a/beecrypt/dsa.c
+++ b/beecrypt/dsa.c
@@ -54,6 +54,7 @@
 # include <malloc.h>
 #endif
 
+/*@unchecked@*/
 static int _debug = 0;
 
 int dsasign(const mp32barrett* p, const mp32barrett* q, const mp32number* g, randomGeneratorContext* rgc, const mp32number* hm, const mp32number* x, mp32number* r, mp32number* s)
@@ -160,42 +161,62 @@ int dsavrfy(const mp32barrett* p, const mp32barrett* q, const mp32number* g, con
 		register uint32* pwksp = ptemp+2*psize;
 		register uint32* qwksp = qtemp+2*qsize;
 
-if (_debug)
+if (_debug) {
+/*@-modfilesys@*/
 fprintf(stderr, "\t                q: "),  mp32println(stderr, q->size, q->modl);
+fprintf(stderr, "\t               hm: "),  mp32println(stderr, hm->size, hm->data);
+fprintf(stderr, "\t                r: "),  mp32println(stderr, r->size, r->data);
+fprintf(stderr, "\t                s: "),  mp32println(stderr, s->size, s->data);
+/*@=modfilesys@*/
+}
 		// compute w = inv(s) mod q
 		if (mp32binv_w(q, s->size, s->data, qtemp, qwksp))
 		{
+/*@-modfilesys@*/
 if (_debug)
 fprintf(stderr, "\t w = inv(s) mod q: "),  mp32println(stderr, qsize, qtemp);
+/*@=modfilesys@*/
 			// compute u1 = h(m)*w mod q
 			mp32bmulmod_w(q, hm->size, hm->data, qsize, qtemp, qtemp+qsize, qwksp);
+/*@-modfilesys@*/
 if (_debug)
 fprintf(stderr, "\tu1 = h(m)*w mod q: "),  mp32println(stderr, qsize, qtemp+qsize);
+/*@=modfilesys@*/
 
 			// compute u2 = r*w mod q
 			mp32bmulmod_w(q, r->size, r->data, qsize, qtemp, qtemp, qwksp);
+/*@-modfilesys@*/
 if (_debug)
 fprintf(stderr, "\tu2 = r*w mod q   : "),  mp32println(stderr, qsize, qtemp);
+/*@=modfilesys@*/
 
 			// compute g^u1 mod p
 			mp32bpowmod_w(p, g->size, g->data, qsize, qtemp+qsize, ptemp, pwksp);
+/*@-modfilesys@*/
 if (_debug)
 fprintf(stderr, "\t       g^u1 mod p: "),  mp32println(stderr, psize, ptemp);
+/*@=modfilesys@*/
 
 			// compute y^u2 mod p
 			mp32bpowmod_w(p, y->size, y->data, qsize, qtemp, ptemp+psize, pwksp);
+/*@-modfilesys@*/
 if (_debug)
 fprintf(stderr, "\t       y^u2 mod p: "),  mp32println(stderr, psize, ptemp+psize);
+/*@=modfilesys@*/
 
 			// multiply mod p
 			mp32bmulmod_w(p, psize, ptemp, psize, ptemp+psize, ptemp, pwksp);
+/*@-modfilesys@*/
 if (_debug)
 fprintf(stderr, "\t   multiply mod p: "),  mp32println(stderr, psize, ptemp);
+/*@=modfilesys@*/
 
 			// modulo q
 			mp32nmod(ptemp+psize, psize, ptemp, qsize, q->modl, pwksp);
+/*@-modfilesys@*/
 if (_debug)
 fprintf(stderr, "\tr' mod q         : "),  mp32println(stderr, psize, ptemp+psize);
+/*@=modfilesys@*/
 
 			rc = mp32eqx(r->size, r->data, psize, ptemp+psize);
 		}
diff --git a/beecrypt/mp32.c b/beecrypt/mp32.c
index 8a203bf9d..8b218cc65 100644
--- a/beecrypt/mp32.c
+++ b/beecrypt/mp32.c
@@ -1130,6 +1130,10 @@ void mp32unpack(uint32 size, uint8* bytes, const uint32* bits)
 #ifndef ASM_MP32PRINT
 void mp32print(register FILE * fp, register uint32 xsize, register const uint32* xdata)
 {
+	if (xdata == NULL)
+	 	return;
+	if (fp == NULL)
+		fp = stderr;
 	while (xsize--)
 		fprintf(fp, "%08x", *(xdata++));
 	(void) fflush(fp);
@@ -1139,6 +1143,10 @@ void mp32print(register FILE * fp, register uint32 xsize, register const uint32*
 #ifndef ASM_MP32PRINTLN
 void mp32println(register FILE * fp, register uint32 xsize, register const uint32* xdata)
 {
+	if (xdata == NULL)
+	 	return;
+	if (fp == NULL)
+		fp = stderr;
 	while (xsize--)
 		fprintf(fp, "%08x", *(xdata++));
 	fprintf(fp, "\n");
diff --git a/beecrypt/mp32.h b/beecrypt/mp32.h
index 25625bba2..1adb4b249 100644
--- a/beecrypt/mp32.h
+++ b/beecrypt/mp32.h
@@ -434,16 +434,16 @@ void mp32ndivmod(/*@out@*/ uint32* result, uint32 xsize, const uint32* xdata, ui
 /**
  */
 BEECRYPTAPI /*@unused@*/
-void mp32print(FILE * fp, uint32 xsize, const uint32* xdata)
+void mp32print(/*@null@*/ FILE * fp, uint32 xsize, /*@null@*/ const uint32* xdata)
 	/*@globals fileSystem @*/
-	/*@modifies fileSystem @*/;
+	/*@modifies *fp, fileSystem @*/;
 
 /**
  */
 BEECRYPTAPI /*@unused@*/
-void mp32println(FILE * fp, uint32 xsize, const uint32* xdata)
+void mp32println(/*@null@*/ FILE * fp, uint32 xsize, /*@null@*/ const uint32* xdata)
 	/*@globals fileSystem @*/
-	/*@modifies fileSystem @*/;
+	/*@modifies *fp, fileSystem @*/;
 
 #ifdef __cplusplus
 }
diff --git a/beecrypt/mp32barrett.c b/beecrypt/mp32barrett.c
index b39ed4ece..25d211fda 100644
--- a/beecrypt/mp32barrett.c
+++ b/beecrypt/mp32barrett.c
@@ -907,6 +907,7 @@ int mp32binv_w(const mp32barrett* b, uint32 xsize, const uint32* xdata, uint32*
 }
 #else
 
+/*@unchecked@*/
 static int _debug = 0;
 
 #undef	FULL_BINARY_EXTENDED_GCD
@@ -955,6 +956,7 @@ int mp32binv_w(const mp32barrett* b, uint32 xsize, const uint32* xdata, uint32*
 #endif
 
 if (_debug < 0) {
+/*@-modfilesys@*/
 fprintf(stderr, "       u: "), mp32println(stderr, ysize, u);
 fprintf(stderr, "       v: "), mp32println(stderr, ysize, v);
 fprintf(stderr, "      u1: "), mp32println(stderr, ysize, u1);
@@ -967,6 +969,7 @@ fprintf(stderr, "      v1: "), mp32println(stderr, ysize, v1);
 fprintf(stderr, "      v2: "), mp32println(stderr, ysize, v2);
 #endif
 fprintf(stderr, "      v3: "), mp32println(stderr, ysize, v3);
+/*@=modfilesys@*/
 }
 
 	if (mp32odd(ysize, u)) {
@@ -976,7 +979,7 @@ fprintf(stderr, "      v3: "), mp32println(stderr, ysize, v3);
 		mp32subw(ysize, t2, 1);
 #endif
 		mp32zero(ysize, t3);
-		mp32sub(ysize, t3, v);
+		(void) mp32sub(ysize, t3, v);
 		goto Y4;
 	} else {
 		mp32setw(ysize, t1, 1);
@@ -990,13 +993,13 @@ fprintf(stderr, "      v3: "), mp32println(stderr, ysize, v3);
 	    do {
 #ifdef	FULL_BINARY_EXTENDED_GCD
 		if (mp32odd(ysize, t1) ||  mp32odd(ysize, t2)) {
-			mp32add(ysize, t1, v);
-			mp32sub(ysize, t2, u);
+			(void) mp32add(ysize, t1, v);
+			(void) mp32sub(ysize, t2, u);
 		}
 #else
 		/* XXX this assumes v is odd, true for DSA inversion. */
 		if (mp32odd(ysize, t1))
-			mp32add(ysize, t1, v);
+			(void) mp32add(ysize, t1, v);
 #endif
 
 		mp32sdivtwo(ysize, t1);
@@ -1006,11 +1009,13 @@ fprintf(stderr, "      v3: "), mp32println(stderr, ysize, v3);
 		mp32sdivtwo(ysize, t3);
 Y4:
 if (_debug < 0) {
+/*@-modfilesys@*/
 fprintf(stderr, "-->Y4 t3: "), mp32println(stderr, ysize, t3);
 #ifdef	FULL_BINARY_EXTENDED_GCD
 fprintf(stderr, "      t2: "), mp32println(stderr, ysize, t2);
 #endif
 fprintf(stderr, "      t1: "), mp32println(stderr, ysize, t1);
+/*@=modfilesys@*/
 }
 	    } while (mp32even(ysize, t3));
 
@@ -1022,54 +1027,60 @@ fprintf(stderr, "      t1: "), mp32println(stderr, ysize, t1);
 #endif
 		mp32setx(ysize, u3, ysize, t3);
 if (_debug < 0) {
+/*@-modfilesys@*/
 fprintf(stderr, "-->Y5 u1: "), mp32println(stderr, ysize, u1);
 #ifdef	FULL_BINARY_EXTENDED_GCD
 fprintf(stderr, "      u2: "), mp32println(stderr, ysize, u2);
 #endif
 fprintf(stderr, "      u3: "), mp32println(stderr, ysize, u3);
+/*@=modfilesys@*/
 }
 	    } else {
 		mp32setx(ysize, v1, ysize, v);
-		mp32sub(ysize, v1, t1);
+		(void) mp32sub(ysize, v1, t1);
 #ifdef	FULL_BINARY_EXTENDED_GCD
 		mp32setx(ysize, v2, ysize, u);
 		mp32neg(ysize, v2);
-		mp32sub(ysize, v2, t2);
+		(void) mp32sub(ysize, v2, t2);
 #endif
 		mp32zero(ysize, v3);
-		mp32sub(ysize, v3, t3);
+		(void) mp32sub(ysize, v3, t3);
 if (_debug < 0) {
+/*@-modfilesys@*/
 fprintf(stderr, "-->Y5 v1: "), mp32println(stderr, ysize, v1);
 #ifdef	FULL_BINARY_EXTENDED_GCD
 fprintf(stderr, "      v2: "), mp32println(stderr, ysize, v2);
 #endif
 fprintf(stderr, "      v3: "), mp32println(stderr, ysize, v3);
+/*@=modfilesys@*/
 }
 	    }
 
 	    /* Y6. Subtract. */
 	    mp32setx(ysize, t1, ysize, u1);
-	    mp32sub(ysize, t1, v1);
+	    (void) mp32sub(ysize, t1, v1);
 #ifdef	FULL_BINARY_EXTENDED_GCD
 	    mp32setx(ysize, t2, ysize, u2);
-	    mp32sub(ysize, t2, v2);
+	    (void) mp32sub(ysize, t2, v2);
 #endif
 	    mp32setx(ysize, t3, ysize, u3);
-	    mp32sub(ysize, t3, v3);
+	    (void) mp32sub(ysize, t3, v3);
 
 	    if (*t1 & 0x80000000) {
-		mp32add(ysize, t1, v);
+		(void) mp32add(ysize, t1, v);
 #ifdef	FULL_BINARY_EXTENDED_GCD
-		mp32sub(ysize, t2, u);
+		(void) mp32sub(ysize, t2, u);
 #endif
 	    }
 
 if (_debug < 0) {
+/*@-modfilesys@*/
 fprintf(stderr, "-->Y6 t1: "), mp32println(stderr, ysize, t1);
 #ifdef	FULL_BINARY_EXTENDED_GCD
 fprintf(stderr, "      t2: "), mp32println(stderr, ysize, t2);
 #endif
 fprintf(stderr, "      t3: "), mp32println(stderr, ysize, t3);
+/*@=modfilesys@*/
 }
 
 	} while (mp32nz(ysize, t3));
@@ -1079,11 +1090,13 @@ fprintf(stderr, "      t3: "), mp32println(stderr, ysize, t3);
 
 	if (result) {
 		while (--k > 0)
-			mp32add(ysize, u1, u1);
+			(void) mp32add(ysize, u1, u1);
 		mp32setx(b->size, result, ysize, u1);
 	}
 
 if (_debug) {
+/*@-modfilesys@*/
+if (result)
 fprintf(stderr, "=== EXIT: "), mp32println(stderr, b->size, result);
 fprintf(stderr, "      u1: "), mp32println(stderr, ysize, u1);
 #ifdef	FULL_BINARY_EXTENDED_GCD
@@ -1100,6 +1113,7 @@ fprintf(stderr, "      t1: "), mp32println(stderr, ysize, t1);
 fprintf(stderr, "      t2: "), mp32println(stderr, ysize, t2);
 #endif
 fprintf(stderr, "      t3: "), mp32println(stderr, ysize, t3);
+/*@=modfilesys@*/
 }
 
 	return 1;
diff --git a/build/pack.c b/build/pack.c
index 33b81e9a8..8fb2f1007 100644
--- a/build/pack.c
+++ b/build/pack.c
@@ -360,10 +360,12 @@ int readRPM(const char *fileName, Spec *specp, struct rpmlead *lead,
     return 0;
 }
 
+#ifdef	DYING
 /*@unchecked@*/
 static unsigned char header_magic[8] = {
         0x8e, 0xad, 0xe8, 0x01, 0x00, 0x00, 0x00, 0x00
 };
+#endif
 
 #define	RPMPKGVERSION_MIN	30004
 #define	RPMPKGVERSION_MAX	40003
@@ -487,6 +489,7 @@ int writeRPM(Header *hdrp, const char *fileName, int type,
 	rc = RPMERR_NOSPACE;
 	rpmError(RPMERR_NOSPACE, _("Unable to write temp header\n"));
     } else { /* Write the archive and get the size */
+	(void) Fflush(fd);
 	fdFiniDigest(fd, PGPHASHALGO_SHA1, (void **)&sha1, NULL, 1);
 	if (csa->cpioList != NULL) {
 	    rc = cpio_doio(fd, h, csa, rpmio_flags);
diff --git a/lib/package.c b/lib/package.c
index 3d79c2b9a..f30c374a9 100644
--- a/lib/package.c
+++ b/lib/package.c
@@ -210,6 +210,11 @@ static rpmRC readPackageHeaders(FD_t fd,
 }
 #endif
 
+/*@unchecked@*/
+static unsigned char header_magic[8] = {
+        0x8e, 0xad, 0xe8, 0x01, 0x00, 0x00, 0x00, 0x00
+};
+
 int rpmReadPackageFile(rpmTransactionSet ts, FD_t fd,
 		const char * fn, Header * hdrp)
 {
@@ -326,6 +331,7 @@ int rpmReadPackageFile(rpmTransactionSet ts, FD_t fd,
     switch (ts->sigtag) {
     case RPMSIGTAG_DSA:
 	/* Parse the parameters from the OpenPGP packets that will be needed. */
+rpmMessage(RPMMESS_DEBUG, _("========== Header DSA signature\n"));
 	xx = pgpPrtPkts(ts->sig, ts->siglen, ts->dig, rpmIsDebug());
 	/*@fallthrough@*/
     case RPMSIGTAG_SHA1:
@@ -335,8 +341,10 @@ int rpmReadPackageFile(rpmTransactionSet ts, FD_t fd,
 
 	/*@-branchstate@*/
 	if (headerGetEntry(h, RPMTAG_HEADERIMMUTABLE, &uht, &uh, &uhc)) {
-	    ts->dig->sha1ctx = rpmDigestInit(PGPHASHALGO_SHA1, RPMDIGEST_NONE);
-	    (void) rpmDigestUpdate(ts->dig->sha1ctx, uh, uhc);
+	    ts->dig->hdrsha1ctx = rpmDigestInit(PGPHASHALGO_SHA1, RPMDIGEST_NONE);
+	    (void) rpmDigestUpdate(ts->dig->hdrsha1ctx, header_magic, sizeof(header_magic));
+	    ts->dig->nbytes += sizeof(header_magic);
+	    (void) rpmDigestUpdate(ts->dig->hdrsha1ctx, uh, uhc);
 	    ts->dig->nbytes += uhc;
 	    uh = headerFreeData(uh, uht);
 	}
@@ -346,6 +354,7 @@ int rpmReadPackageFile(rpmTransactionSet ts, FD_t fd,
     case RPMSIGTAG_PGP5:	/* XXX legacy */
     case RPMSIGTAG_PGP:
 	/* Parse the parameters from the OpenPGP packets that will be needed. */
+rpmMessage(RPMMESS_DEBUG, _("========== Package DSA/RSA signature\n"));
 	xx = pgpPrtPkts(ts->sig, ts->siglen, ts->dig, rpmIsDebug());
 	/*@fallthrough@*/
     case RPMSIGTAG_MD5:
diff --git a/lib/rpmchecksig.c b/lib/rpmchecksig.c
index 6bc10328d..2a51028bc 100644
--- a/lib/rpmchecksig.c
+++ b/lib/rpmchecksig.c
@@ -141,6 +141,8 @@ static int rpmReSign(/*@unused@*/ rpmTransactionSet ts,
     const char *sigtarget = NULL;
     char tmprpm[1024+1];
     Header sig = NULL;
+    void * uh = NULL;
+    int_32 uht, uhc;
     int res = EXIT_FAILURE;
     rpmRC rc;
     
@@ -189,20 +191,19 @@ static int rpmReSign(/*@unused@*/ rpmTransactionSet ts,
 	/* Both fd and ofd are now closed. sigtarget contains tempfile name. */
 	/* ASSERT: fd == NULL && ofd == NULL */
 
+	/* Dump the immutable region (if present). */
+	if (headerGetEntry(sig, RPMTAG_HEADERSIGNATURES, &uht, &uh, &uhc)) {
+	    Header nh = headerCopyLoad(uh);
+	    uh = headerFreeData(uh, uht);
+	    if (nh == NULL)
+		    goto exit;
+	    sig = headerFree(sig, NULL);
+	    sig = headerLink(nh, NULL);
+	    nh = headerFree(nh, NULL);
+	}
+
 	/* Toss the current signatures and recompute if not --addsign. */
 	if (qva->qva_mode != RPMSIGN_ADD_SIGNATURE) {
-	    void * uh = NULL;
-	    int_32 uht, uhc;
-
-	    /* Dump the immutable region (if present). */
-	    if (headerGetEntry(sig, RPMTAG_HEADERSIGNATURES, &uht, &uh, &uhc)) {
-		Header nh = headerCopyLoad(uh);
-		if (nh == NULL)
-		    goto exit;
-		sig = headerFree(sig, NULL);
-		sig = headerLink(nh, NULL);
-		nh = headerFree(nh, NULL);
-	    }
 
 	    (void) headerRemoveEntry(sig, RPMSIGTAG_SIZE);
 	    (void) rpmAddSignature(sig, sigtarget, RPMSIGTAG_SIZE, qva->passPhrase);
@@ -210,21 +211,20 @@ static int rpmReSign(/*@unused@*/ rpmTransactionSet ts,
 	    (void) headerRemoveEntry(sig, RPMSIGTAG_LEMD5_2);
 	    (void) headerRemoveEntry(sig, RPMSIGTAG_MD5);
 	    (void) rpmAddSignature(sig, sigtarget, RPMSIGTAG_MD5, qva->passPhrase);
-#ifdef	NOTNOW
 	    (void) headerRemoveEntry(sig, RPMSIGTAG_SHA1);
 	    (void) rpmAddSignature(sig, sigtarget, RPMSIGTAG_SHA1, qva->passPhrase);
 
-	    (void) headerRemoveEntry(sig, RPMSIGTAG_PGP5);
-	    (void) headerRemoveEntry(sig, RPMSIGTAG_PGP);
-	    (void) headerRemoveEntry(sig, RPMSIGTAG_GPG);
-#endif
 	}
 
+	/* If gpg/pgp is configured, replace the signature. */
 	if ((sigtype = rpmLookupSignatureType(RPMLOOKUPSIG_QUERY)) > 0) {
 	    (void) headerRemoveEntry(sig, sigtype);
 	    (void) rpmAddSignature(sig, sigtarget, sigtype, qva->passPhrase);
 	}
 
+	/* Reallocate the signature into one contiguous region. */
+	sig = headerReload(sig, RPMTAG_HEADERSIGNATURES);
+
 	/* Write the lead/signature of the output rpm */
 	strcpy(tmprpm, rpm);
 	strcat(tmprpm, ".XXXXXX");
@@ -435,8 +435,13 @@ bottom:
     return res;
 }
 
+/*@unchecked@*/
+static unsigned char header_magic[8] = {
+        0x8e, 0xad, 0xe8, 0x01, 0x00, 0x00, 0x00, 0x00
+};
+
 /**
- * @todo If the GPG key was known aavailable, the md5 digest could be skipped.
+ * @todo If the GPG key was known available, the md5 digest could be skipped.
  */
 static int readFile(FD_t fd, int_32 sigtag, const char * fn, pgpDig dig)
 	/*@globals fileSystem, internalState @*/
@@ -448,54 +453,59 @@ static int readFile(FD_t fd, int_32 sigtag, const char * fn, pgpDig dig)
     int rc = 1;
     int i;
 
-    switch (sigtag) {
-    case RPMSIGTAG_GPG:
-    /*@-type@*/ /* FIX: cast? */
-	fdInitDigest(fd, PGPHASHALGO_SHA1, 0);
-    /*@=type@*/
-	/*@fallthrough@*/
-    case RPMSIGTAG_PGP5:	/* XXX legacy */
-    case RPMSIGTAG_PGP:
-    case RPMSIGTAG_MD5:
-    /*@-type@*/ /* FIX: cast? */
-	fdInitDigest(fd, PGPHASHALGO_MD5, 0);
-    /*@=type@*/
-	break;
-    case RPMSIGTAG_LEMD5_2:
-    case RPMSIGTAG_LEMD5_1:
-    case RPMSIGTAG_SIZE:
-    default:
-	break;
-    }
     dig->nbytes = 0;
 
+    /* Read the header from the package. */
+    {	Header h = headerRead(fd, HEADER_MAGIC_YES);
+
+	if (h == NULL) {
+	    rpmError(RPMERR_FREAD, _("%s: headerRead failed\n"), fn);
+	    goto exit;
+	}
+
+	dig->nbytes += headerSizeof(h, HEADER_MAGIC_YES);
+
+	if (headerIsEntry(h, RPMTAG_HEADERIMMUTABLE)) {
+	    void * uh;
+	    int_32 uht, uhc;
+	
+	    if (!headerGetEntry(h, RPMTAG_HEADERIMMUTABLE, &uht, &uh, &uhc)
+	    ||   uh == NULL)
+	    {
+		h = headerFree(h, NULL);
+		rpmError(RPMERR_FREAD, _("%s: headerGetEntry failed\n"), fn);
+		goto exit;
+	    }
+	    dig->hdrsha1ctx = rpmDigestInit(PGPHASHALGO_SHA1, RPMDIGEST_NONE);
+	    (void) rpmDigestUpdate(dig->hdrsha1ctx, header_magic, sizeof(header_magic));
+	    (void) rpmDigestUpdate(dig->hdrsha1ctx, uh, uhc);
+	    uh = headerFreeData(uh, uht);
+	}
+	h = headerFree(h, NULL);
+    }
+
+    /* Read the payload from the package. */
     while ((count = Fread(buf, sizeof(buf[0]), sizeof(buf), fd)) > 0)
 	dig->nbytes += count;
-
     if (count < 0) {
 	rpmError(RPMERR_FREAD, _("%s: Fread failed: %s\n"), fn, Fstrerror(fd));
 	goto exit;
     }
 
+    /* XXX Steal the digest-in-progress from the file handle. */
     /*@-type@*/ /* FIX: cast? */
     for (i = fd->ndigests - 1; i >= 0; i--) {
 	FDDIGEST_t fddig = fd->digests + i;
 	if (fddig->hashctx == NULL)
 	    continue;
 	if (fddig->hashalgo == PGPHASHALGO_MD5) {
-	    /*@-branchstate@*/
-	    if (dig->md5ctx != NULL)
-		(void) rpmDigestFinal(dig->md5ctx, NULL, NULL, 0);
-	    /*@=branchstate@*/
+assert(dig->md5ctx == NULL);
 	    dig->md5ctx = fddig->hashctx;
 	    fddig->hashctx = NULL;
 	    continue;
 	}
 	if (fddig->hashalgo == PGPHASHALGO_SHA1) {
-	    /*@-branchstate@*/
-	    if (dig->sha1ctx != NULL)
-		(void) rpmDigestFinal(dig->sha1ctx, NULL, NULL, 0);
-	    /*@=branchstate@*/
+assert(dig->sha1ctx == NULL);
 	    dig->sha1ctx = fddig->hashctx;
 	    fddig->hashctx = NULL;
 	    continue;
@@ -563,13 +573,18 @@ int rpmVerifySignatures(QVA_t qva, rpmTransactionSet ts, FD_t fd,
 	    sigtag = RPMSIGTAG_PGP;
 	else if (headerIsEntry(sig, RPMSIGTAG_MD5))
 	    sigtag = RPMSIGTAG_MD5;
-#ifdef	NOTYET
 	else if (headerIsEntry(sig, RPMSIGTAG_SHA1))
 	    sigtag = RPMSIGTAG_SHA1;	/* XXX never happens */
-#endif
 	else
 	    sigtag = 0;			/* XXX never happens */
 
+	if (headerIsEntry(sig, RPMSIGTAG_PGP)
+	||  headerIsEntry(sig, RPMSIGTAG_PGP5)
+	||  headerIsEntry(sig, RPMSIGTAG_MD5))
+	    fdInitDigest(fd, PGPHASHALGO_MD5, 0);
+	if (headerIsEntry(sig, RPMSIGTAG_GPG))
+	    fdInitDigest(fd, PGPHASHALGO_SHA1, 0);
+
 	ts->dig = pgpNewDig();
 
 	/* Read the file, generating digest(s) on the fly. */
@@ -600,16 +615,26 @@ int rpmVerifySignatures(QVA_t qva, rpmTransactionSet ts, FD_t fd,
 	    case RPMSIGTAG_PGP:
 		if (!(qva->qva_flags & VERIFY_SIGNATURE)) 
 		     continue;
-if (rpmIsDebug())
-fprintf(stderr, "========================= Package RSA Signature\n");
+rpmMessage(RPMMESS_DEBUG, _("========== Package RSA signature\n"));
 		xx = pgpPrtPkts(ts->sig, ts->siglen, ts->dig, rpmIsDebug());
 		/*@switchbreak@*/ break;
+	    case RPMSIGTAG_SHA1:
+		if (!(qva->qva_flags & VERIFY_DIGEST)) 
+		     continue;
+		/* XXX Don't bother with header sha1 if header dsa. */
+		if (sigtag == RPMSIGTAG_DSA)
+		    continue;
+		/*@switchbreak@*/ break;
 	    case RPMSIGTAG_DSA:
+		if (!(qva->qva_flags & VERIFY_SIGNATURE)) 
+		     continue;
+rpmMessage(RPMMESS_DEBUG, _("========== Header DSA signature\n"));
+		xx = pgpPrtPkts(ts->sig, ts->siglen, ts->dig, rpmIsDebug());
+		/*@switchbreak@*/ break;
 	    case RPMSIGTAG_GPG:
 		if (!(qva->qva_flags & VERIFY_SIGNATURE)) 
 		     continue;
-if (rpmIsDebug())
-fprintf(stderr, "========================= Package DSA Signature\n");
+rpmMessage(RPMMESS_DEBUG, _("========== Package DSA signature\n"));
 		xx = pgpPrtPkts(ts->sig, ts->siglen, ts->dig, rpmIsDebug());
 		/*@switchbreak@*/ break;
 	    case RPMSIGTAG_LEMD5_2:
@@ -624,12 +649,6 @@ fprintf(stderr, "========================= Package DSA Signature\n");
 		if (sigtag == RPMSIGTAG_PGP)
 		    continue;
 		/*@switchbreak@*/ break;
-	    case RPMSIGTAG_SHA1:
-#ifdef	NOTYET
-		if (!(qva->qva_flags & VERIFY_DIGEST)) 
-		     continue;
-		/*@switchbreak@*/ break;
-#endif
 	    default:
 		continue;
 		/*@notreached@*/ /*@switchbreak@*/ break;
diff --git a/lib/signature.c b/lib/signature.c
index f9a81b2e0..1b0ffdcf3 100644
--- a/lib/signature.c
+++ b/lib/signature.c
@@ -74,19 +74,19 @@ const char * rpmDetectPGPVersion(pgpVersion * pgpVer)
 	struct stat st;
 
 	if (!(pgpbin && pgpbin[0] != '\0')) {
-	  pgpbin = _free(pgpbin);
-	  saved_pgp_version = -1;
-	  return NULL;
+	    pgpbin = _free(pgpbin);
+	    saved_pgp_version = -1;
+	    return NULL;
 	}
 	pgpvbin = (char *)alloca(strlen(pgpbin) + sizeof("v"));
 	(void)stpcpy(stpcpy(pgpvbin, pgpbin), "v");
 
 	if (stat(pgpvbin, &st) == 0)
-	  saved_pgp_version = PGP_5;
+	    saved_pgp_version = PGP_5;
 	else if (stat(pgpbin, &st) == 0)
-	  saved_pgp_version = PGP_2;
+	    saved_pgp_version = PGP_2;
 	else
-	  saved_pgp_version = PGP_NOTDETECTED;
+	    saved_pgp_version = PGP_NOTDETECTED;
     }
 
     if (pgpVer && pgpbin)
@@ -237,12 +237,18 @@ Header rpmFreeSignature(Header h)
     return headerFree(h, "FreeSignature");
 }
 
-static int makePGPSignature(const char * file, /*@out@*/ void ** sig,
-		/*@out@*/ int_32 * size, /*@null@*/ const char * passPhrase)
-	/*@globals rpmGlobalMacroContext,
-		fileSystem @*/
-	/*@modifies *sig, *size, rpmGlobalMacroContext,
-		fileSystem @*/
+/**
+ * Generate PGP (aka RSA/MD5) signature(s) for a header+payload file.
+ * @param file		header+payload file name
+ * @retval pkt		signature packet(s)
+ * @retval pktlen	signature packet(s) length
+ * @param passPhrase	private key pass phrase
+ * @return		0 on success, 1 on failure
+ */
+static int makePGPSignature(const char * file, /*@out@*/ byte ** pkt,
+		/*@out@*/ int_32 * pktlen, /*@null@*/ const char * passPhrase)
+	/*@globals rpmGlobalMacroContext, fileSystem @*/
+	/*@modifies *pkt, *pktlen, rpmGlobalMacroContext, fileSystem @*/
 {
     char * sigfile = alloca(1024);
     int pid, status;
@@ -324,9 +330,9 @@ static int makePGPSignature(const char * file, /*@out@*/ void ** sig,
 	return 1;
     }
 
-    *size = st.st_size;
-    rpmMessage(RPMMESS_DEBUG, _("PGP sig size: %d\n"), *size);
-    *sig = xmalloc(*size);
+    *pktlen = st.st_size;
+    rpmMessage(RPMMESS_DEBUG, _("PGP sig size: %d\n"), *pktlen);
+    *pkt = xmalloc(*pktlen);
 
     {	FD_t fd;
 
@@ -334,34 +340,35 @@ static int makePGPSignature(const char * file, /*@out@*/ void ** sig,
 	fd = Fopen(sigfile, "r.fdio");
 	if (fd != NULL && !Ferror(fd)) {
 	    /*@-type@*/ /* FIX: eliminate timedRead @*/
-	    rc = timedRead(fd, *sig, *size);
+	    rc = timedRead(fd, *pkt, *pktlen);
 	    /*@=type@*/
 	    if (sigfile) (void) unlink(sigfile);
 	    (void) Fclose(fd);
 	}
-	if (rc != *size) {
-	    *sig = _free(*sig);
+	if (rc != *pktlen) {
+	    *pkt = _free(*pkt);
 	    rpmError(RPMERR_SIGGEN, _("unable to read the signature\n"));
 	    return 1;
 	}
     }
 
-    rpmMessage(RPMMESS_DEBUG, _("Got %d bytes of PGP sig\n"), *size);
+    rpmMessage(RPMMESS_DEBUG, _("Got %d bytes of PGP sig\n"), *pktlen);
 
     return 0;
 }
 
-/* This is an adaptation of the makePGPSignature function to use GPG instead
- * of PGP to create signatures.  I think I've made all the changes necessary,
- * but this could be a good place to start looking if errors in GPG signature
- * creation crop up.
+/**
+ * Generate GPG (aka DSA) signature(s) for a header+payload file.
+ * @param file		header+payload file name
+ * @retval pkt		signature packet(s)
+ * @retval pktlen	signature packet(s) length
+ * @param passPhrase	private key pass phrase
+ * @return		0 on success, 1 on failure
  */
-static int makeGPGSignature(const char * file, /*@out@*/ void ** sig,
-		/*@out@*/ int_32 * size, /*@null@*/ const char * passPhrase)
-	/*@globals rpmGlobalMacroContext,
-		fileSystem @*/
-	/*@modifies *sig, *size, rpmGlobalMacroContext,
-		fileSystem @*/
+static int makeGPGSignature(const char * file, /*@out@*/ byte ** pkt,
+		/*@out@*/ int_32 * pktlen, /*@null@*/ const char * passPhrase)
+	/*@globals rpmGlobalMacroContext, fileSystem @*/
+	/*@modifies *pkt, *pktlen, rpmGlobalMacroContext, fileSystem @*/
 {
     char * sigfile = alloca(1024);
     int pid, status;
@@ -423,9 +430,9 @@ static int makeGPGSignature(const char * file, /*@out@*/ void ** sig,
 	return 1;
     }
 
-    *size = st.st_size;
-    rpmMessage(RPMMESS_DEBUG, _("GPG sig size: %d\n"), *size);
-    *sig = xmalloc(*size);
+    *pktlen = st.st_size;
+    rpmMessage(RPMMESS_DEBUG, _("GPG sig size: %d\n"), *pktlen);
+    *pkt = xmalloc(*pktlen);
 
     {	FD_t fd;
 
@@ -433,60 +440,166 @@ static int makeGPGSignature(const char * file, /*@out@*/ void ** sig,
 	fd = Fopen(sigfile, "r.fdio");
 	if (fd != NULL && !Ferror(fd)) {
 	    /*@-type@*/ /* FIX: eliminate timedRead @*/
-	    rc = timedRead(fd, *sig, *size);
+	    rc = timedRead(fd, *pkt, *pktlen);
 	    /*@=type@*/
 	    if (sigfile) (void) unlink(sigfile);
 	    (void) Fclose(fd);
 	}
-	if (rc != *size) {
-	    *sig = _free(*sig);
+	if (rc != *pktlen) {
+	    *pkt = _free(*pkt);
 	    rpmError(RPMERR_SIGGEN, _("unable to read the signature\n"));
 	    return 1;
 	}
     }
 
-    rpmMessage(RPMMESS_DEBUG, _("Got %d bytes of GPG sig\n"), *size);
+    rpmMessage(RPMMESS_DEBUG, _("Got %d bytes of GPG sig\n"), *pktlen);
 
     return 0;
 }
 
-int rpmAddSignature(Header h, const char * file, int_32 sigTag,
+/*@unchecked@*/
+static unsigned char header_magic[8] = {
+        0x8e, 0xad, 0xe8, 0x01, 0x00, 0x00, 0x00, 0x00
+};
+
+/**
+ * Generate header only signature(s) from a header+payload file.
+ * @param sig		signature header
+ * @param file		header+payload file name
+ * @param sigTag	type of signature(s) to add
+ * @param passPhrase	private key pass phrase
+ * @return		0 on success, -1 on failure
+ */
+static int makeHDRSignature(Header sig, const char * file, int_32 sigTag,
+		/*@null@*/ const char * passPhrase)
+	/*@globals rpmGlobalMacroContext, fileSystem, internalState @*/
+	/*@modifies sig, rpmGlobalMacroContext, fileSystem, internalState @*/
+{
+    Header h = NULL;
+    FD_t fd = NULL;
+    byte * pkt;
+    int_32 pktlen;
+    const char * fn = NULL;
+    const char * sha1 = NULL;
+    int ret = -1;	/* assume failure. */
+
+    switch (sigTag) {
+    case RPMSIGTAG_SIZE:
+    case RPMSIGTAG_MD5:
+    case RPMSIGTAG_PGP5:	/* XXX legacy */
+    case RPMSIGTAG_PGP:
+    case RPMSIGTAG_GPG:
+	goto exit;
+	/*@notreached@*/ break;
+    case RPMSIGTAG_SHA1:
+	fd = Fopen(file, "r.fdio");
+	if (fd == NULL || Ferror(fd))
+	    goto exit;
+	h = headerRead(fd, HEADER_MAGIC_YES);
+	if (h == NULL)
+	    goto exit;
+	(void) Fclose(fd);	fd = NULL;
+
+	if (headerIsEntry(h, RPMTAG_HEADERIMMUTABLE)) {
+	    DIGEST_CTX ctx;
+	    void * uh;
+	    int_32 uht, uhc;
+	
+	    if (!headerGetEntry(h, RPMTAG_HEADERIMMUTABLE, &uht, &uh, &uhc)
+	    ||   uh == NULL)
+	    {
+		h = headerFree(h, NULL);
+		goto exit;
+	    }
+	    ctx = rpmDigestInit(PGPHASHALGO_SHA1, RPMDIGEST_NONE);
+	    (void) rpmDigestUpdate(ctx, header_magic, sizeof(header_magic));
+	    (void) rpmDigestUpdate(ctx, uh, uhc);
+	    (void) rpmDigestFinal(ctx, (void **)&sha1, NULL, 1);
+	    uh = headerFreeData(uh, uht);
+	}
+	h = headerFree(h, NULL);
+
+	if (sha1 == NULL)
+	    goto exit;
+	if (!headerAddEntry(sig, RPMSIGTAG_SHA1, RPM_STRING_TYPE, sha1, 1))
+	    goto exit;
+	ret = 0;
+	break;
+    case RPMSIGTAG_DSA:
+	fd = Fopen(file, "r.fdio");
+	if (fd == NULL || Ferror(fd))
+	    goto exit;
+	h = headerRead(fd, HEADER_MAGIC_YES);
+	if (h == NULL)
+	    goto exit;
+	(void) Fclose(fd);	fd = NULL;
+	if (makeTempFile(NULL, &fn, &fd))
+	    goto exit;
+	if (headerWrite(fd, h, HEADER_MAGIC_YES))
+	    goto exit;
+	(void) Fclose(fd);	fd = NULL;
+        if (makeGPGSignature(fn, &pkt, &pktlen, passPhrase)
+	||  !headerAddEntry(sig, sigTag, RPM_BIN_TYPE, pkt, pktlen))
+	    goto exit;
+	ret = 0;
+	break;
+    }
+
+exit:
+    if (fn) {
+	(void) unlink(fn);
+	fn = _free(fn);
+    }
+    sha1 = _free(sha1);
+    h = headerFree(h, NULL);
+    if (fd) (void) Fclose(fd);
+    return ret;
+}
+
+int rpmAddSignature(Header sig, const char * file, int_32 sigTag,
 		const char * passPhrase)
 {
     struct stat st;
-    int_32 size;
-    byte buf[16];
-    void *sig;
-    int ret = -1;
+    byte * pkt;
+    int_32 pktlen;
+    int ret = -1;	/* assume failure. */
 
     switch (sigTag) {
     case RPMSIGTAG_SIZE:
-	(void) stat(file, &st);
-	size = st.st_size;
+	if (stat(file, &st) != 0)
+	    break;
+	pktlen = st.st_size;
+	if (!headerAddEntry(sig, sigTag, RPM_INT32_TYPE, &pktlen, 1))
+	    break;
 	ret = 0;
-	(void) headerAddEntry(h, RPMSIGTAG_SIZE, RPM_INT32_TYPE, &size, 1);
 	break;
     case RPMSIGTAG_MD5:
-	ret = mdbinfile(file, buf);
-	if (ret == 0)
-	    (void) headerAddEntry(h, sigTag, RPM_BIN_TYPE, buf, 16);
+	pktlen = 16;
+	pkt = xcalloc(1, pktlen);
+	if (mdbinfile(file, pkt)
+	||  !headerAddEntry(sig, sigTag, RPM_BIN_TYPE, pkt, pktlen))
+	    break;
+	ret = 0;
 	break;
     case RPMSIGTAG_PGP5:	/* XXX legacy */
     case RPMSIGTAG_PGP:
-	rpmMessage(RPMMESS_VERBOSE, _("Generating signature using PGP.\n"));
-	ret = makePGPSignature(file, &sig, &size, passPhrase);
-	if (ret == 0)
-	    (void) headerAddEntry(h, sigTag, RPM_BIN_TYPE, sig, size);
+	if (makePGPSignature(file, &pkt, &pktlen, passPhrase)
+	||  !headerAddEntry(sig, sigTag, RPM_BIN_TYPE, pkt, pktlen))
+	    break;
+	ret = 0;
 	break;
     case RPMSIGTAG_GPG:
-	rpmMessage(RPMMESS_VERBOSE, _("Generating signature using GPG.\n"));
-        ret = makeGPGSignature(file, &sig, &size, passPhrase);
-	if (ret == 0)
-	    (void) headerAddEntry(h, sigTag, RPM_BIN_TYPE, sig, size);
+        if (makeGPGSignature(file, &pkt, &pktlen, passPhrase)
+	||  !headerAddEntry(sig, sigTag, RPM_BIN_TYPE, pkt, pktlen))
+	    break;
+	/* XXX Piggyback a header-only DSA signature as well. */
+	ret = makeHDRSignature(sig, file, RPMSIGTAG_DSA, passPhrase);
 	break;
-    case RPMSIGTAG_DSA:		/* XXX UNIMPLEMENTED */
+    case RPMSIGTAG_DSA:
+	ret = makeHDRSignature(sig, file, sigTag, passPhrase);
 	break;
-    case RPMSIGTAG_SHA1:	/* XXX UNIMPLEMENTED */
+    case RPMSIGTAG_SHA1:
+	ret = makeHDRSignature(sig, file, sigTag, passPhrase);
 	break;
     }
 
@@ -698,7 +811,8 @@ exit:
 }
 
 static rpmVerifySignatureReturn
-verifyMD5Signature(const rpmTransactionSet ts, /*@out@*/ char * t)
+verifyMD5Signature(const rpmTransactionSet ts, /*@out@*/ char * t,
+		DIGEST_CTX md5ctx)
 	/*@modifies *t @*/
 {
     rpmVerifySignatureReturn res;
@@ -714,9 +828,15 @@ verifyMD5Signature(const rpmTransactionSet ts, /*@out@*/ char * t)
 	goto exit;
     }
 
-/*@=nullpass =nullderef@*/ /* FIX: ts->{sig,dig} can be NULL */
+if (md5ctx == NULL) {
+fprintf(stderr, "*** MD5 md5ctx %p\n", md5ctx);
+res = RPMSIG_NOKEY;
+t = stpcpy(t, rpmSigString(res));
+goto exit;
+}
+
     /*@-type@*/
-    (void) rpmDigestFinal(rpmDigestDup(ts->dig->md5ctx),
+    (void) rpmDigestFinal(rpmDigestDup(md5ctx),
 		(void **)&md5sum, &md5len, 0);
     /*@=type@*/
 
@@ -732,7 +852,6 @@ verifyMD5Signature(const rpmTransactionSet ts, /*@out@*/ char * t)
 	t = stpcpy(t, rpmSigString(res));
 	t = stpcpy(t, " (");
     }
-/*@=nullpass =nullderef@*/
     (void) pgpHexCvt(t, md5sum, md5len);
     t += strlen(t);
     t = stpcpy(t, ")");
@@ -743,15 +862,22 @@ exit:
     return res;
 }
 
+/**
+ * Verify header immutable region SHA1 digest.
+ * @param ts		transaction set
+ * @retval t		verbose success/failure text
+ * @return 		RPMSIG_OK on success
+ */
 static rpmVerifySignatureReturn
-verifySHA1Signature(const rpmTransactionSet ts, /*@out@*/ char * t)
+verifySHA1Signature(const rpmTransactionSet ts, /*@out@*/ char * t,
+		DIGEST_CTX sha1ctx)
 	/*@modifies *t @*/
 {
     rpmVerifySignatureReturn res;
     const char * sha1 = NULL;
 
     *t = '\0';
-    t = stpcpy(t, _("SHA1 header digest: "));
+    t = stpcpy(t, _("Header SHA1 digest: "));
 
     if (ts->sig == NULL || ts->dig == NULL) {
 	res = RPMSIG_NOKEY;
@@ -759,8 +885,15 @@ verifySHA1Signature(const rpmTransactionSet ts, /*@out@*/ char * t)
 	goto exit;
     }
 
+if (sha1ctx == NULL) {
+fprintf(stderr, "*** SHA1 sha1ctx %p\n", sha1ctx);
+res = RPMSIG_NOKEY;
+t = stpcpy(t, rpmSigString(res));
+goto exit;
+}
+
     /*@-type@*/
-    (void) rpmDigestFinal(rpmDigestDup(ts->dig->sha1ctx),
+    (void) rpmDigestFinal(rpmDigestDup(sha1ctx),
 		(void **)&sha1, NULL, 1);
     /*@=type@*/
 
@@ -891,8 +1024,14 @@ exit:
     return res;
 }
 
+/**
+ * Verify PGP (aka RSA/MD5) signature.
+ * @param ts		transaction set
+ * @retval t		verbose success/failure text
+ * @return 		RPMSIG_OK on success
+ */
 static rpmVerifySignatureReturn
-verifyPGPSignature(rpmTransactionSet ts, /*@out@*/ char * t)
+verifyPGPSignature(rpmTransactionSet ts, /*@out@*/ char * t, DIGEST_CTX md5ctx)
 	/*@modifies ts, *t */
 {
     struct pgpDigParams_s * sigp = NULL;
@@ -917,8 +1056,14 @@ verifyPGPSignature(rpmTransactionSet ts, /*@out@*/ char * t)
 	goto exit;
     }
 
+if (md5ctx == NULL) {
+fprintf(stderr, "*** RSA md5ctx %p\n", md5ctx);
+res = RPMSIG_NOKEY;
+goto exit;
+}
+
     /*@-type@*/ /* FIX: cast? */
-    {	DIGEST_CTX ctx = rpmDigestDup(ts->dig->md5ctx);
+    {	DIGEST_CTX ctx = rpmDigestDup(md5ctx);
 
 	if (sigp->hash != NULL)
 	    xx = rpmDigestUpdate(ctx, sigp->hash, sigp->hashlen);
@@ -971,8 +1116,14 @@ exit:
     return res;
 }
 
+/**
+ * Verify GPG (aka DSA) signature.
+ * @param ts		transaction set
+ * @retval t		verbose success/failure text
+ * @return 		RPMSIG_OK on success
+ */
 static rpmVerifySignatureReturn
-verifyGPGSignature(rpmTransactionSet ts, /*@out@*/ char * t)
+verifyGPGSignature(rpmTransactionSet ts, /*@out@*/ char * t, DIGEST_CTX sha1ctx)
 	/*@modifies ts, *t @*/
 {
     struct pgpDigParams_s * sigp = NULL;
@@ -980,6 +1131,8 @@ verifyGPGSignature(rpmTransactionSet ts, /*@out@*/ char * t)
     int xx;
 
     *t = '\0';
+    if (ts->dig != NULL && ts->dig->hdrsha1ctx == sha1ctx)
+	t = stpcpy(t, _("Header "));
     t = stpcpy(t, _("V3 DSA signature: "));
 
     if (ts->sig == NULL || ts->dig == NULL) {
@@ -997,11 +1150,29 @@ verifyGPGSignature(rpmTransactionSet ts, /*@out@*/ char * t)
 	goto exit;
     }
 
+if (sha1ctx == NULL) {
+fprintf(stderr, "*** DSA sha1ctx %p\n", sha1ctx);
+res = RPMSIG_NOKEY;
+goto exit;
+}
+
     /*@-type@*/ /* FIX: cast? */
-    {	DIGEST_CTX ctx = rpmDigestDup(ts->dig->sha1ctx);
+    {	DIGEST_CTX ctx = rpmDigestDup(sha1ctx);
 
 	if (sigp->hash != NULL)
 	    xx = rpmDigestUpdate(ctx, sigp->hash, sigp->hashlen);
+
+#ifdef	NOTYET
+	if (sigp->sigtype == 4) {
+	    int nb = ts->dig->nbytes + sigp->hashlen;
+	    byte trailer[6];
+	    nb = htonl(nb);
+	    trailer[0] = 0x4;
+	    trailer[1] = 0xff;
+	    memcpy(trailer+2, &nb, sizeof(nb));
+	    xx = rpmDigestUpdate(ctx, trailer, sizeof(trailer));
+	}
+#endif
 	xx = rpmDigestFinal(ctx, (void **)&ts->dig->sha1, &ts->dig->sha1len, 1);
 
 	/* XXX compare leading 16 bits of digest for quick check. */
@@ -1049,18 +1220,20 @@ rpmVerifySignature(const rpmTransactionSet ts, char * result)
 	res = verifySizeSignature(ts, result);
 	break;
     case RPMSIGTAG_MD5:
-	res = verifyMD5Signature(ts, result);
+	res = verifyMD5Signature(ts, result, ts->dig->md5ctx);
 	break;
     case RPMSIGTAG_SHA1:
-	res = verifySHA1Signature(ts, result);
+	res = verifySHA1Signature(ts, result, ts->dig->hdrsha1ctx);
 	break;
     case RPMSIGTAG_PGP5:	/* XXX legacy */
     case RPMSIGTAG_PGP:
-	res = verifyPGPSignature(ts, result);
+	res = verifyPGPSignature(ts, result, ts->dig->md5ctx);
 	break;
     case RPMSIGTAG_DSA:
+	res = verifyGPGSignature(ts, result, ts->dig->hdrsha1ctx);
+	break;
     case RPMSIGTAG_GPG:
-	res = verifyGPGSignature(ts, result);
+	res = verifyGPGSignature(ts, result, ts->dig->sha1ctx);
 	break;
     case RPMSIGTAG_LEMD5_1:
     case RPMSIGTAG_LEMD5_2:
diff --git a/lib/signature.h b/lib/signature.h
index fc5ee8931..ddc090300 100644
--- a/lib/signature.h
+++ b/lib/signature.h
@@ -46,7 +46,7 @@ Header rpmNewSignature(void)
 	/*@*/;
 
 /** \ingroup signature
- * Read (and verify header+archive size) signature header.
+ * Read (and verify header+payload size) signature header.
  * If an old-style signature is found, we emulate a new style one.
  * @param fd		file handle
  * @retval headerp	address of (signature) header (or NULL)
@@ -69,40 +69,51 @@ int rpmWriteSignature(FD_t fd, Header h)
 	/*@modifies fd, h, fileSystem @*/;
 
 /** \ingroup signature
- *  Generate a signature of data in file, insert in header.
+ * Generate signature(s) from a header+payload file, save in signature header.
+ * @param sig		signature header
+ * @param file		header+payload file name
+ * @param sigTag	type of signature(s) to add
+ * @param passPhrase	private key pass phrase
+ * @return		0 on success, -1 on failure
  */
-int rpmAddSignature(Header h, const char * file,
+int rpmAddSignature(Header sig, const char * file,
 		    int_32 sigTag, /*@null@*/ const char * passPhrase)
-	/*@globals rpmGlobalMacroContext,
-		fileSystem @*/
-	/*@modifies h, rpmGlobalMacroContext, fileSystem @*/;
+	/*@globals rpmGlobalMacroContext, fileSystem, internalState @*/
+	/*@modifies sig, rpmGlobalMacroContext, fileSystem, internalState @*/;
 
 /******************************************************************/
 
-/* Possible actions for rpmLookupSignatureType() */
-#define RPMLOOKUPSIG_QUERY	0	/* Lookup type in effect          */
-#define RPMLOOKUPSIG_DISABLE	1	/* Disable (--sign was not given) */
-#define RPMLOOKUPSIG_ENABLE	2	/* Re-enable %_signature          */
+/**
+ *  Possible actions for rpmLookupSignatureType()
+ */
+#define RPMLOOKUPSIG_QUERY	0	/*!< Lookup type in effect          */
+#define RPMLOOKUPSIG_DISABLE	1	/*!< Disable (--sign was not given) */
+#define RPMLOOKUPSIG_ENABLE	2	/*!< Re-enable %_signature          */
 
 /** \ingroup signature
- * Return type of signature in effect for building.
+ * Return type of signature needed for signing/building.
+ * @param action	enable/disable/query action
+ * @return		sigTag to use, 0 if none, -1 on error
  */
 int rpmLookupSignatureType(int action)
-	/*@globals rpmGlobalMacroContext,
-		internalState @*/
+	/*@globals rpmGlobalMacroContext, internalState @*/
 	/*@modifies rpmGlobalMacroContext, internalState @*/;
 
 /** \ingroup signature
- *  Read a pass phrase from the user.
+ * Read a pass phrase using getpass(3), confirm with gpg/pgp helper binaries.
+ * @param prompt	user prompt
+ * @param sigTag	signature type/tag
+ * @return		pass phrase
  */
-/*@null@*/ char * rpmGetPassPhrase(const char *prompt, const int sigTag)
-	/*@globals rpmGlobalMacroContext,
-		fileSystem @*/
-	/*@modifies rpmGlobalMacroContext,
-		fileSystem @*/;
+/*@null@*/ char * rpmGetPassPhrase(/*@null@*/ const char * prompt,
+		const int sigTag)
+	/*@globals rpmGlobalMacroContext, fileSystem @*/
+	/*@modifies rpmGlobalMacroContext, fileSystem @*/;
 
 /** \ingroup signature
- *  Return path to pgp executable of given type, or NULL when not found.
+ * Return path to pgp executable of given type, or NULL when not found.
+ * @retval pgpVer	pgp version
+ * @return		path to pgp executable
  */
 /*@-exportlocal -redecl@*/
 /*@null@*/ const char * rpmDetectPGPVersion(
diff --git a/macros.in b/macros.in
index 4a50659cf..b9ed8dcaa 100644
--- a/macros.in
+++ b/macros.in
@@ -1,7 +1,7 @@
 #/*! \page config_macros Default configuration: /usr/lib/rpm/macros
 # \verbatim
 #
-# $Id: macros.in,v 1.96 2002/02/10 21:13:52 jbj Exp $
+# $Id: macros.in,v 1.97 2002/03/06 23:17:32 jbj Exp $
 #
 # This is a global RPM configuration file. All changes made here will
 # be lost when the rpm package is upgraded. Any per-system configuration
@@ -433,7 +433,7 @@
 %{nil}
 
 # The list of tags for which indices will be built.
-%_dbi_tags	Packages:Name:Basenames:Group:Requirename:Providename:Conflictname:Triggername:Dirnames:Requireversion:Provideversion:Installtid:Sigmd5:Sha1header:Filemd5s:Depends
+%_dbi_tags	Packages:Name:Basenames:Group:Requirename:Providename:Conflictname:Triggername:Dirnames:Requireversion:Provideversion:Installtid:Sigmd5:Sha1header:Filemd5s:Depends:Pubkeys
 
 # "Packages" should have shared/exclusive fcntl(2) lock using "lockdbfd".
 %_dbi_config_Packages		%{_dbi_htconfig} lockdbfd
diff --git a/po/cs.po b/po/cs.po
index d00a97ab7..88b76f206 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-02-10 13:58-0500\n"
+"POT-Creation-Date: 2002-03-06 18:13-0500\n"
 "PO-Revision-Date: 2001-07-24 10:02+0100\n"
 "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -190,7 +190,8 @@ msgid "RPM version %s\n"
 msgstr "RPM verze %s\n"
 
 #: rpmqv.c:235
-msgid "Copyright (C) 1998-2000 - Red Hat, Inc."
+#, fuzzy
+msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
 msgstr "Copyright (c) 1998-2000 - Red Hat, Inc."
 
 #: rpmqv.c:236
@@ -437,7 +438,7 @@ msgstr "neoèekávané parametry pro --querytags "
 msgid "no arguments given"
 msgstr "k dotazu nezadány ¾ádné parametry"
 
-#: build/build.c:125 build/pack.c:479
+#: build/build.c:125 build/pack.c:483
 msgid "Unable to open temp file.\n"
 msgstr "Nelze otevøít doèasnı soubor.\n"
 
@@ -782,7 +783,7 @@ msgstr "readRPM: otevøení %s: %s\n"
 msgid "readRPM: read %s: %s\n"
 msgstr "readRPM: ètení %s: %s\n"
 
-#: build/pack.c:305 build/pack.c:521
+#: build/pack.c:305 build/pack.c:529
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: Fseek selhal: %s\n"
@@ -797,81 +798,81 @@ msgstr "readRPM: %s není RPM balíèek\n"
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: ètení hlavièky z %s\n"
 
-#: build/pack.c:467
+#: build/pack.c:471
 #, fuzzy
 msgid "Unable to create immutable header region.\n"
 msgstr "Nemohu pøeèíst hlavièku z %s: %s\n"
 
-#: build/pack.c:485
+#: build/pack.c:490
 #, fuzzy
 msgid "Unable to write temp header\n"
 msgstr "Nemohu zapsat hlavièku do %s: %s\n"
 
-#: build/pack.c:493
+#: build/pack.c:500
 msgid "Bad CSA data\n"
 msgstr "©patná CSA data\n"
 
-#: build/pack.c:528
+#: build/pack.c:536
 #, fuzzy
 msgid "Unable to write final header\n"
 msgstr "Nemohu zapsat hlavièku do %s: %s\n"
 
-#: build/pack.c:546
+#: build/pack.c:556
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "Generuji podpis: %d\n"
 
-#: build/pack.c:559
+#: build/pack.c:574
 #, fuzzy
 msgid "Unable to reload signature header.\n"
 msgstr "Nemohu pøeèíst hlavièku z %s: %s\n"
 
-#: build/pack.c:567
+#: build/pack.c:582
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr "Nemohu otevøít %s: %s\n"
 
-#: build/pack.c:603 lib/psm.c:1444
+#: build/pack.c:618 lib/psm.c:1444
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Nemohu zapsat balíèek: %s\n"
 
-#: build/pack.c:618
+#: build/pack.c:633
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "Nemohu otevøít cíl pro podepsání %s: %s\n"
 
-#: build/pack.c:628
+#: build/pack.c:644
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "Nemohu pøeèíst hlavièku z %s: %s\n"
 
-#: build/pack.c:642
+#: build/pack.c:658
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "Nemohu zapsat hlavièku do %s: %s\n"
 
-#: build/pack.c:652
+#: build/pack.c:668
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "Nemohu pøeèíst payload z %s: %s\n"
 
-#: build/pack.c:658
+#: build/pack.c:674
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Nemohu zapsat payload do %s: %s\n"
 
-#: build/pack.c:683 lib/psm.c:1725
+#: build/pack.c:699 lib/psm.c:1725
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Zapsáno: %s\n"
 
-#: build/pack.c:750
+#: build/pack.c:766
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr "Nemohu vygenerovat jméno souboru pro balíèek %s: %s\n"
 
-#: build/pack.c:767
+#: build/pack.c:783
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr "nemohu vytvoøit %s: %s\n"
@@ -1620,41 +1621,51 @@ msgstr "%s vytvoøen jako %s\n"
 msgid "error creating temporary file %s\n"
 msgstr "chyba pøi vytváøení doèasného souboru %s\n"
 
-#: lib/package.c:167 lib/package.c:238
+#: lib/package.c:179 lib/package.c:255
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr "práce s balíèky verze 1 není podporována touto verzí RPM\n"
 
-#: lib/package.c:188 lib/package.c:246
+#: lib/package.c:200 lib/package.c:263
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr "tato verze RPM podporuje práci s balíèky s verzí <= 4\n"
 
-#: lib/package.c:224 lib/rpmchecksig.c:156 lib/rpmchecksig.c:522
+#: lib/package.c:241 lib/rpmchecksig.c:161 lib/rpmchecksig.c:541
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: readLead selhalo\n"
 
-#: lib/package.c:230
+#: lib/package.c:247
 #, fuzzy, c-format
 msgid "%s: bad magic\n"
 msgstr "©patné magické èíslo"
 
-#: lib/package.c:254 lib/rpmchecksig.c:174 lib/rpmchecksig.c:538
+#: lib/package.c:272 lib/rpmchecksig.c:179 lib/rpmchecksig.c:557
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: rpmReadSignature selhalo\n"
 
-#: lib/package.c:258 lib/rpmchecksig.c:178 lib/rpmchecksig.c:543
+#: lib/package.c:276 lib/rpmchecksig.c:183 lib/rpmchecksig.c:562
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Není dostupnı ¾ádnı podpis\n"
 
-#: lib/package.c:284
+#: lib/package.c:304 lib/rpmchecksig.c:462
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: readLead selhalo\n"
 
-#: lib/package.c:303 lib/rpmchecksig.c:107 lib/rpmchecksig.c:466
+#. Parse the parameters from the OpenPGP packets that will be needed.
+#: lib/package.c:334 lib/rpmchecksig.c:631
+msgid "========== Header DSA signature\n"
+msgstr ""
+
+#. Parse the parameters from the OpenPGP packets that will be needed.
+#: lib/package.c:357
+msgid "========== Package DSA/RSA signature\n"
+msgstr ""
+
+#: lib/package.c:366 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Fread selhalo: %s\n"
@@ -2382,66 +2393,79 @@ msgstr "¹patnı db soubor %s\n"
 msgid "(added provide)"
 msgstr "%s: %-45s ANO (db poskytuje)\n"
 
-#: lib/rpmchecksig.c:49
+#: lib/rpmchecksig.c:51
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s: otevøení selhalo: %s\n"
 
-#: lib/rpmchecksig.c:61
+#: lib/rpmchecksig.c:63
 msgid "makeTempFile failed\n"
 msgstr "makeTempFile selhalo\n"
 
-#: lib/rpmchecksig.c:101
+#: lib/rpmchecksig.c:104
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: Fwrite selhalo: %s\n"
 
-#: lib/rpmchecksig.c:161
-#, c-format
-msgid "%s: Can't sign v1.0 RPM\n"
+#: lib/rpmchecksig.c:166
+#, fuzzy, c-format
+msgid "%s: Can't sign v1 packaging\n"
 msgstr "%s: RPM v1.0 nelze podepsat\n"
 
-#: lib/rpmchecksig.c:165
-#, c-format
-msgid "%s: Can't re-sign v2.0 RPM\n"
+#: lib/rpmchecksig.c:170
+#, fuzzy, c-format
+msgid "%s: Can't re-sign v2 packaging\n"
 msgstr "%s: Nemohu znovu podepsat RPM v2.0\n"
 
-#: lib/rpmchecksig.c:229
+#: lib/rpmchecksig.c:239
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: writeLead selhalo: %s\n"
 
-#: lib/rpmchecksig.c:235
+#: lib/rpmchecksig.c:245
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmWriteSignature selhalo: %s\n"
 
-#: lib/rpmchecksig.c:528
+#: lib/rpmchecksig.c:476
+#, fuzzy, c-format
+msgid "%s: headerGetEntry failed\n"
+msgstr "%s: readLead selhalo\n"
+
+#: lib/rpmchecksig.c:547
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: Není dostupnı ¾ádnı podpis (RPM v1.0)\n"
 
-#: lib/rpmchecksig.c:725
+#: lib/rpmchecksig.c:618
+msgid "========== Package RSA signature\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:637
+msgid "========== Package DSA signature\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:768
 msgid "NOT OK"
 msgstr "NENÍ OK"
 
-#: lib/rpmchecksig.c:726 lib/rpmchecksig.c:740
+#: lib/rpmchecksig.c:769 lib/rpmchecksig.c:783
 msgid " (MISSING KEYS:"
 msgstr " (CHYBÍ KLÍÈ:"
 
-#: lib/rpmchecksig.c:728 lib/rpmchecksig.c:742
+#: lib/rpmchecksig.c:771 lib/rpmchecksig.c:785
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:729 lib/rpmchecksig.c:743
+#: lib/rpmchecksig.c:772 lib/rpmchecksig.c:786
 msgid " (UNTRUSTED KEYS:"
 msgstr " (NEDÙVÌRYHODNİ KLÍÈ:"
 
-#: lib/rpmchecksig.c:731 lib/rpmchecksig.c:745
+#: lib/rpmchecksig.c:774 lib/rpmchecksig.c:788
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:739
+#: lib/rpmchecksig.c:782
 msgid "OK"
 msgstr "OK"
 
@@ -2653,141 +2677,141 @@ msgstr "Nemohu èíst %s, HOME je pøíli¹ velkı.\n"
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "Nemohu otevøít %s pro ètení: %s.\n"
 
-#: lib/signature.c:117
+#: lib/signature.c:118
 msgid "file is not regular -- skipping size check\n"
 msgstr "není obyèejnı soubor -- pøeskakuji kontrolu velikosti\n"
 
-#: lib/signature.c:126
+#: lib/signature.c:127
 #, 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:131
+#: lib/signature.c:132
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr "Aktuální délka: %12d\n"
 
-#: lib/signature.c:151
+#: lib/signature.c:152
 msgid "No signature\n"
 msgstr "Chybí podpis\n"
 
-#: lib/signature.c:155
+#: lib/signature.c:156
 msgid "Old PGP signature\n"
 msgstr "Starı PGP podpis\n"
 
-#: lib/signature.c:168
+#: lib/signature.c:169
 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:224
+#: lib/signature.c:225
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "Podpisu: velikost(%d)+vata(%d)\n"
 
-#: lib/signature.c:299 lib/signature.c:397 lib/signature.c:537
-#: lib/signature.c:569
+#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:656
+#: lib/signature.c:688
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "Nemohu spustit %s: %s\n"
 
-#: lib/signature.c:315
+#: lib/signature.c:322
 msgid "pgp failed\n"
 msgstr "pgp selhalo\n"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:322
+#: lib/signature.c:329
 msgid "pgp failed to write signature\n"
 msgstr "pgp selhalo pøi zápisu podpisu\n"
 
-#: lib/signature.c:327
+#: lib/signature.c:334
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr "Velikost podpisu PGP: %d\n"
 
-#: lib/signature.c:343 lib/signature.c:442
+#: lib/signature.c:350 lib/signature.c:450
 msgid "unable to read the signature\n"
 msgstr "nemohu èíst podpis\n"
 
-#: lib/signature.c:348
+#: lib/signature.c:355
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr "Pøeèteno %d bajtù PGP podpisu\n"
 
-#: lib/signature.c:414
+#: lib/signature.c:422
 msgid "gpg failed\n"
 msgstr "gpg selhalo\n"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:421
+#: lib/signature.c:429
 msgid "gpg failed to write signature\n"
 msgstr "gpg selhalo pøi zápisu podpisu\n"
 
-#: lib/signature.c:426
+#: lib/signature.c:434
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr "Velikost GPG podpisu: %d\n"
 
-#: lib/signature.c:447
+#: lib/signature.c:455
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr "Pøeèteno %d bajtù GPG podpisu\n"
 
-#: lib/signature.c:475
-msgid "Generating signature using PGP.\n"
-msgstr "Generuji PGP podpis.\n"
-
-#: lib/signature.c:481
-msgid "Generating signature using GPG.\n"
-msgstr "Generuji GPG podpis.\n"
-
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:574 lib/signature.c:627
+#: lib/signature.c:693 lib/signature.c:747
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "©patná %%_signature spec v souboru maker\n"
 
-#: lib/signature.c:607
+#: lib/signature.c:727
 #, 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:619
+#: lib/signature.c:739
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "Musíte nastavit \"%%_pgp_name\" ve svém makro souboru\n"
 
-#: lib/signature.c:663
+#: lib/signature.c:783
 #, fuzzy
 msgid "Header+Payload size: "
 msgstr "Velikost hlavièky je pøili¹ velká"
 
-#: lib/signature.c:692
+#: lib/signature.c:823
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:732
+#: lib/signature.c:880
+msgid "Header SHA1 digest: "
+msgstr ""
+
+#: lib/signature.c:1042
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "vynechat pøípadné MD5 souèty"
 
-#: lib/signature.c:822
+#: lib/signature.c:1135
+msgid "Header "
+msgstr ""
+
+#: lib/signature.c:1136
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "Chybí podpis\n"
 
-#: lib/signature.c:886
+#: lib/signature.c:1214
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:906
+#: lib/signature.c:1240
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:910
+#: lib/signature.c:1244
 #, fuzzy, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Podpisu: velikost(%d)+vata(%d)\n"
@@ -3062,41 +3086,41 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging"
 msgstr "generovat hlavièky kompatibilní RPM verze 2 a 3"
 
 #. @-modfilesys@
-#: rpmdb/rpmdb.c:129
+#: rpmdb/rpmdb.c:163
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr "dbiTagsInit: neznámá znaèka: \"%s\" ignorována\n"
 
-#: rpmdb/rpmdb.c:387
+#: rpmdb/rpmdb.c:440
 #, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr "nemohu otevøít index %s pøi pou¾ívání db%d - %s (%d)\n"
 
-#: rpmdb/rpmdb.c:409
+#: rpmdb/rpmdb.c:462
 #, c-format
 msgid "cannot open %s index\n"
 msgstr "nemohu otevøít index %s\n"
 
-#: rpmdb/rpmdb.c:501
+#: rpmdb/rpmdb.c:554
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "chyba(%d) pøi získávání záznamu \"%s\" z indexu %s\n"
 
-#: rpmdb/rpmdb.c:632
+#: rpmdb/rpmdb.c:685
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "chyba(%d) pøi ukládání záznamu %s do %s\n"
 
-#: rpmdb/rpmdb.c:642
+#: rpmdb/rpmdb.c:695
 #, c-format
 msgid "error(%d) removing record %s from %s\n"
 msgstr "chyba(%d) pøi odstraòování záznamu %s z %s\n"
 
-#: rpmdb/rpmdb.c:906
+#: rpmdb/rpmdb.c:959
 msgid "no dbpath has been set\n"
 msgstr "nebyla nastavena dbpath\n"
 
-#: rpmdb/rpmdb.c:1054
+#: rpmdb/rpmdb.c:1107
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database\n"
@@ -3104,115 +3128,115 @@ msgstr ""
 "databáze je ve starém formátu; pou¾ijte --rebuilddb pro pøevod do nového\n"
 
 #. error
-#: rpmdb/rpmdb.c:1319
+#: rpmdb/rpmdb.c:1372
 #, c-format
 msgid "error(%d) counting packages\n"
 msgstr "chyba(%d) pøi poèítání balíèkù\n"
 
-#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3372
+#: rpmdb/rpmdb.c:2150 rpmdb/rpmdb.c:3502
 #, c-format
 msgid "record number %u in database is bad -- skipping.\n"
 msgstr "záznam èíslo %d v databázi je chybnı -- vynechávám.\n"
 
-#: rpmdb/rpmdb.c:2150
+#: rpmdb/rpmdb.c:2203
 #, c-format
 msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
 msgstr "rpmdb: poru¹ená polo¾ka hlavièky #%u, pøeskakuji.\n"
 
-#: rpmdb/rpmdb.c:2420
+#: rpmdb/rpmdb.c:2473
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "%s: nemohu èíst hlavièku na adrese 0x%x\n"
 
-#: rpmdb/rpmdb.c:2540
+#: rpmdb/rpmdb.c:2634
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "odstraòuji \"%s\" z indexu %s.\n"
 
-#: rpmdb/rpmdb.c:2544
+#: rpmdb/rpmdb.c:2638
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "odstraòuji %d polo¾ek z indexu %s.\n"
 
-#: rpmdb/rpmdb.c:2714
+#: rpmdb/rpmdb.c:2808
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "chyba(%d) pøi alokaci nové instance balíèku\n"
 
-#: rpmdb/rpmdb.c:2873
+#: rpmdb/rpmdb.c:3003
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "pøidávám \"%s\" do indexu %s\n"
 
-#: rpmdb/rpmdb.c:2877
+#: rpmdb/rpmdb.c:3007
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "pøidávám %d polo¾ek do indexu %s.\n"
 
-#: rpmdb/rpmdb.c:3258
+#: rpmdb/rpmdb.c:3388
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr "odstraòuji %s po úspì¹ném znovusestavení db3.\n"
 
-#: rpmdb/rpmdb.c:3291
+#: rpmdb/rpmdb.c:3421
 msgid "no dbpath has been set"
 msgstr "nebyla nastavena dbpath"
 
-#: rpmdb/rpmdb.c:3318
+#: rpmdb/rpmdb.c:3448
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "databázi %s pøevádím do %s\n"
 
-#: rpmdb/rpmdb.c:3322
+#: rpmdb/rpmdb.c:3452
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr "doèasná databáze %s ji¾ existuje\n"
 
-#: rpmdb/rpmdb.c:3328
+#: rpmdb/rpmdb.c:3458
 #, c-format
 msgid "creating directory %s\n"
 msgstr "vytváøím adresáø %s\n"
 
-#: rpmdb/rpmdb.c:3330
+#: rpmdb/rpmdb.c:3460
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr "vytváøím adresáø %s: %s\n"
 
-#: rpmdb/rpmdb.c:3337
+#: rpmdb/rpmdb.c:3467
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "otevírám starou databázi s dbapi %d\n"
 
-#: rpmdb/rpmdb.c:3348
+#: rpmdb/rpmdb.c:3478
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "otevírám novou databázi s dbapi %d\n"
 
-#: rpmdb/rpmdb.c:3412
+#: rpmdb/rpmdb.c:3542
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "nemohu pøidat záznam - pùvodnì u %d\n"
 
-#: rpmdb/rpmdb.c:3430
+#: rpmdb/rpmdb.c:3560
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 "databázi nelze zvovu vytvoøit; pùvodní databáze zùstává na svém místì\n"
 
-#: rpmdb/rpmdb.c:3438
+#: rpmdb/rpmdb.c:3568
 msgid "failed to replace old database with new database!\n"
 msgstr "starou databázi nelze nahradit novou databází!\n"
 
-#: rpmdb/rpmdb.c:3440
+#: rpmdb/rpmdb.c:3570
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "pro obnovení nahraïte soubory v %s soubory z %s"
 
-#: rpmdb/rpmdb.c:3450
+#: rpmdb/rpmdb.c:3580
 #, c-format
 msgid "removing directory %s\n"
 msgstr "ma¾u adresáø %s\n"
 
-#: rpmdb/rpmdb.c:3452
+#: rpmdb/rpmdb.c:3582
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "nemohu odstranit adresáø %s: %s\n"
@@ -3424,6 +3448,12 @@ msgstr "url port musí bıt èíslo\n"
 msgid "failed to create %s: %s\n"
 msgstr "nemohu vytvoøit %s: %s\n"
 
+#~ msgid "Generating signature using PGP.\n"
+#~ msgstr "Generuji PGP podpis.\n"
+
+#~ msgid "Generating signature using GPG.\n"
+#~ msgstr "Generuji GPG podpis.\n"
+
 #~ msgid "no packages given for uninstall"
 #~ msgstr "nezadány ¾ádné balíèky pro odstranìní"
 
diff --git a/po/da.po b/po/da.po
index 04ec31068..3af7b1eb5 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-02-10 13:58-0500\n"
+"POT-Creation-Date: 2002-03-06 18:13-0500\n"
 "PO-Revision-Date: 2001-04-05 23:03GMT\n"
 "Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -190,7 +190,8 @@ msgid "RPM version %s\n"
 msgstr "RPM version %s\n"
 
 #: rpmqv.c:235
-msgid "Copyright (C) 1998-2000 - Red Hat, Inc."
+#, fuzzy
+msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
 msgstr "Copyright (C) 1998-2000 - Red Hat, Inc."
 
 #: rpmqv.c:236
@@ -432,7 +433,7 @@ msgstr "uventede parametre til --querytags "
 msgid "no arguments given"
 msgstr "ingen parametre angivet ved forespørgsel"
 
-#: build/build.c:125 build/pack.c:479
+#: build/build.c:125 build/pack.c:483
 msgid "Unable to open temp file.\n"
 msgstr "Kunne ikke åbne midlertidig fil.\n"
 
@@ -779,7 +780,7 @@ msgstr "readRPM: åbn %s: %s\n"
 msgid "readRPM: read %s: %s\n"
 msgstr "readRPM: læs %s: %s\n"
 
-#: build/pack.c:305 build/pack.c:521
+#: build/pack.c:305 build/pack.c:529
 #, fuzzy, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: Fread mislykkedes: %s\n"
@@ -794,81 +795,81 @@ msgstr "readRPM: %s er ikke nogen RPM-pakke\n"
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: læser hoved fra %s\n"
 
-#: build/pack.c:467
+#: build/pack.c:471
 #, fuzzy
 msgid "Unable to create immutable header region.\n"
 msgstr "Kunne ikke læse hoved fra %s: %s\n"
 
-#: build/pack.c:485
+#: build/pack.c:490
 #, fuzzy
 msgid "Unable to write temp header\n"
 msgstr "Kunne ikke skrive hoved til %s: %s\n"
 
-#: build/pack.c:493
+#: build/pack.c:500
 msgid "Bad CSA data\n"
 msgstr "Ugyldige CSA-data\n"
 
-#: build/pack.c:528
+#: build/pack.c:536
 #, fuzzy
 msgid "Unable to write final header\n"
 msgstr "Kunne ikke skrive hoved til %s: %s\n"
 
-#: build/pack.c:546
+#: build/pack.c:556
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "Genererer signatur: %d\n"
 
-#: build/pack.c:559
+#: build/pack.c:574
 #, fuzzy
 msgid "Unable to reload signature header.\n"
 msgstr "Kunne ikke læse hoved fra %s: %s\n"
 
-#: build/pack.c:567
+#: build/pack.c:582
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr "Kunne ikke åbne %s: %s\n"
 
-#: build/pack.c:603 lib/psm.c:1444
+#: build/pack.c:618 lib/psm.c:1444
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Kunne ikke skrive pakke: %s\n"
 
-#: build/pack.c:618
+#: build/pack.c:633
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "Kunne ikke åbne sigtarget %s: %s\n"
 
-#: build/pack.c:628
+#: build/pack.c:644
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "Kunne ikke læse hoved fra %s: %s\n"
 
-#: build/pack.c:642
+#: build/pack.c:658
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "Kunne ikke skrive hoved til %s: %s\n"
 
-#: build/pack.c:652
+#: build/pack.c:668
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "Kunne ikke læse pakkeindhold fra %s: %s\n"
 
-#: build/pack.c:658
+#: build/pack.c:674
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Kunne ikke skrive pakkeindhold til %s: %s\n"
 
-#: build/pack.c:683 lib/psm.c:1725
+#: build/pack.c:699 lib/psm.c:1725
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Skrev: %s\n"
 
-#: build/pack.c:750
+#: build/pack.c:766
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr "Kunne ikke generere filnavn til oprettelse af pakke %s: %s\n"
 
-#: build/pack.c:767
+#: build/pack.c:783
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr "kan ikke oprette %s: %s\n"
@@ -1619,42 +1620,52 @@ msgstr "%s oprettet som %s\n"
 msgid "error creating temporary file %s\n"
 msgstr "fejl ved oprettelse af midlertidig fil %s\n"
 
-#: lib/package.c:167 lib/package.c:238
+#: lib/package.c:179 lib/package.c:255
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr "indpakningsversion 1 understøttes ikke af denne udgave af RPM\n"
 
-#: lib/package.c:188 lib/package.c:246
+#: lib/package.c:200 lib/package.c:263
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 "kun indpakninger med hovedversion <= 4 understøttes af denne udgave af RPM\n"
 
-#: lib/package.c:224 lib/rpmchecksig.c:156 lib/rpmchecksig.c:522
+#: lib/package.c:241 lib/rpmchecksig.c:161 lib/rpmchecksig.c:541
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: readLead mislykkedes\n"
 
-#: lib/package.c:230
+#: lib/package.c:247
 #, fuzzy, c-format
 msgid "%s: bad magic\n"
 msgstr "Ugyldigt magisk tal"
 
-#: lib/package.c:254 lib/rpmchecksig.c:174 lib/rpmchecksig.c:538
+#: lib/package.c:272 lib/rpmchecksig.c:179 lib/rpmchecksig.c:557
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: rpmReadSignature mislykkedes\n"
 
-#: lib/package.c:258 lib/rpmchecksig.c:178 lib/rpmchecksig.c:543
+#: lib/package.c:276 lib/rpmchecksig.c:183 lib/rpmchecksig.c:562
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Ingen tilgængelig signatur\n"
 
-#: lib/package.c:284
+#: lib/package.c:304 lib/rpmchecksig.c:462
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: readLead mislykkedes\n"
 
-#: lib/package.c:303 lib/rpmchecksig.c:107 lib/rpmchecksig.c:466
+#. Parse the parameters from the OpenPGP packets that will be needed.
+#: lib/package.c:334 lib/rpmchecksig.c:631
+msgid "========== Header DSA signature\n"
+msgstr ""
+
+#. Parse the parameters from the OpenPGP packets that will be needed.
+#: lib/package.c:357
+msgid "========== Package DSA/RSA signature\n"
+msgstr ""
+
+#: lib/package.c:366 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Fread mislykkedes: %s\n"
@@ -2400,66 +2411,81 @@ msgstr "ugyldig db-fil %s\n"
 msgid "(added provide)"
 msgstr "%s: %-45s JA (db tilfører)\n"
 
-#: lib/rpmchecksig.c:49
+#: lib/rpmchecksig.c:51
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s: åbning mislykkedes: %s\n"
 
-#: lib/rpmchecksig.c:61
+#: lib/rpmchecksig.c:63
 msgid "makeTempFile failed\n"
 msgstr "makeTempFile mislykkedes\n"
 
-#: lib/rpmchecksig.c:101
+#: lib/rpmchecksig.c:104
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: Fwrite mislykkedes: %s\n"
 
-#: lib/rpmchecksig.c:161
-#, c-format
-msgid "%s: Can't sign v1.0 RPM\n"
+#: lib/rpmchecksig.c:166
+#, fuzzy, c-format
+msgid "%s: Can't sign v1 packaging\n"
 msgstr "%s: Kan ikke underskrive v1.0 RPM\n"
 
-#: lib/rpmchecksig.c:165
-#, c-format
-msgid "%s: Can't re-sign v2.0 RPM\n"
+#: lib/rpmchecksig.c:170
+#, fuzzy, c-format
+msgid "%s: Can't re-sign v2 packaging\n"
 msgstr "%s: Kan ikke genunderskrive v2.0 RPM\n"
 
-#: lib/rpmchecksig.c:229
+#: lib/rpmchecksig.c:239
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: writeLead mislykkedes: %s\n"
 
-#: lib/rpmchecksig.c:235
+#: lib/rpmchecksig.c:245
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmWriteSignature mislykkedes: %s\n"
 
-#: lib/rpmchecksig.c:528
+#: lib/rpmchecksig.c:476
+#, fuzzy, c-format
+msgid "%s: headerGetEntry failed\n"
+msgstr "%s: readLead mislykkedes\n"
+
+#: lib/rpmchecksig.c:547
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: Ingen tilgængelig signatur (v1.0 RPM)\n"
 
-#: lib/rpmchecksig.c:725
+#: lib/rpmchecksig.c:618
+#, fuzzy
+msgid "========== Package RSA signature\n"
+msgstr "========== tsort'er pakker\n"
+
+#: lib/rpmchecksig.c:637
+#, fuzzy
+msgid "========== Package DSA signature\n"
+msgstr "========== tsort'er pakker\n"
+
+#: lib/rpmchecksig.c:768
 msgid "NOT OK"
 msgstr "IKKE O.K."
 
-#: lib/rpmchecksig.c:726 lib/rpmchecksig.c:740
+#: lib/rpmchecksig.c:769 lib/rpmchecksig.c:783
 msgid " (MISSING KEYS:"
 msgstr " (MANGLENDE NØGLER:    "
 
-#: lib/rpmchecksig.c:728 lib/rpmchecksig.c:742
+#: lib/rpmchecksig.c:771 lib/rpmchecksig.c:785
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:729 lib/rpmchecksig.c:743
+#: lib/rpmchecksig.c:772 lib/rpmchecksig.c:786
 msgid " (UNTRUSTED KEYS:"
 msgstr " (IKKE-BETROEDE NØGLER:"
 
-#: lib/rpmchecksig.c:731 lib/rpmchecksig.c:745
+#: lib/rpmchecksig.c:774 lib/rpmchecksig.c:788
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:739
+#: lib/rpmchecksig.c:782
 msgid "OK"
 msgstr "O.K."
 
@@ -2673,140 +2699,140 @@ msgstr "Kunne ikke læse %s, HOME er for stor.\n"
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "Kunne ikke åbne %s for læsning: %s.\n"
 
-#: lib/signature.c:117
+#: lib/signature.c:118
 msgid "file is not regular -- skipping size check\n"
 msgstr "filen er ikke regulær -- overspringer størrelsestjek\n"
 
-#: lib/signature.c:126
+#: lib/signature.c:127
 #, 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:131
+#: lib/signature.c:132
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr "  Faktisk størrelse: %12d\n"
 
-#: lib/signature.c:151
+#: lib/signature.c:152
 msgid "No signature\n"
 msgstr "Ingen signatur\n"
 
-#: lib/signature.c:155
+#: lib/signature.c:156
 msgid "Old PGP signature\n"
 msgstr "Gammel PGP-signatur\n"
 
-#: lib/signature.c:168
+#: lib/signature.c:169
 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:224
+#: lib/signature.c:225
 #, fuzzy, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "Signaturstørrelse: %d\n"
 
-#: lib/signature.c:299 lib/signature.c:397 lib/signature.c:537
-#: lib/signature.c:569
+#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:656
+#: lib/signature.c:688
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "Kunne ikke udføre %s: %s\n"
 
-#: lib/signature.c:315
+#: lib/signature.c:322
 msgid "pgp failed\n"
 msgstr "pgp fejlede\n"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:322
+#: lib/signature.c:329
 msgid "pgp failed to write signature\n"
 msgstr "pgp kunne ikke skrive signatur\n"
 
-#: lib/signature.c:327
+#: lib/signature.c:334
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr "PGP-signaturstørrelse: %d\n"
 
-#: lib/signature.c:343 lib/signature.c:442
+#: lib/signature.c:350 lib/signature.c:450
 msgid "unable to read the signature\n"
 msgstr "kunne ikke læse signaturen\n"
 
-#: lib/signature.c:348
+#: lib/signature.c:355
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr "Fik %d byte af PGP-signatur\n"
 
-#: lib/signature.c:414
+#: lib/signature.c:422
 msgid "gpg failed\n"
 msgstr "gpg fejlede\n"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:421
+#: lib/signature.c:429
 msgid "gpg failed to write signature\n"
 msgstr "gpg kunne ikke skrive signaturen\n"
 
-#: lib/signature.c:426
+#: lib/signature.c:434
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr "GPG-signaturstørrelse: %d\n"
 
-#: lib/signature.c:447
+#: lib/signature.c:455
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr "Fik %d byte GPG-signatur\n"
 
-#: lib/signature.c:475
-msgid "Generating signature using PGP.\n"
-msgstr "Genererer signatur med pgp.\n"
-
-#: lib/signature.c:481
-msgid "Generating signature using GPG.\n"
-msgstr "Genererer signatur med gpg.\n"
-
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:574 lib/signature.c:627
+#: lib/signature.c:693 lib/signature.c:747
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "Ugyldig angivelse af '%%_signature'-spec i makrofil.\n"
 
-#: lib/signature.c:607
+#: lib/signature.c:727
 #, 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:619
+#: lib/signature.c:739
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "Du skal angive \"%%_pgp_name\" i din makrofil\n"
 
-#: lib/signature.c:663
+#: lib/signature.c:783
 #, fuzzy
 msgid "Header+Payload size: "
 msgstr "Hovedstørrelse er for stor"
 
-#: lib/signature.c:692
+#: lib/signature.c:823
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:732
+#: lib/signature.c:880
+msgid "Header SHA1 digest: "
+msgstr ""
+
+#: lib/signature.c:1042
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "overspring eventuelle MD5-signaturer"
 
-#: lib/signature.c:822
+#: lib/signature.c:1135
+msgid "Header "
+msgstr ""
+
+#: lib/signature.c:1136
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "Ingen signatur\n"
 
-#: lib/signature.c:886
+#: lib/signature.c:1214
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:906
+#: lib/signature.c:1240
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:910
+#: lib/signature.c:1244
 #, fuzzy, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Signaturfyld : %d\n"
@@ -3084,41 +3110,41 @@ msgstr ""
 "generér hoveder, der er kompatible med (gamle) rpm[23]-indpakningsversioner"
 
 #. @-modfilesys@
-#: rpmdb/rpmdb.c:129
+#: rpmdb/rpmdb.c:163
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr "dbiTagsInit: ukendt mærkenavn: \"%s\" ignoreret\n"
 
-#: rpmdb/rpmdb.c:387
+#: rpmdb/rpmdb.c:440
 #, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr "kan ikke åbne '%s'-indeks ved brug af db%d - %s (%d)\n"
 
-#: rpmdb/rpmdb.c:409
+#: rpmdb/rpmdb.c:462
 #, c-format
 msgid "cannot open %s index\n"
 msgstr "kan ikke åbne '%s'-indeks\n"
 
-#: rpmdb/rpmdb.c:501
+#: rpmdb/rpmdb.c:554
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "fejl(%d) ved hentning af \"%s\"-poster fra '%s'-indekset\n"
 
-#: rpmdb/rpmdb.c:632
+#: rpmdb/rpmdb.c:685
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "fejl(%d) ved gemning af post %s i %s\n"
 
-#: rpmdb/rpmdb.c:642
+#: rpmdb/rpmdb.c:695
 #, c-format
 msgid "error(%d) removing record %s from %s\n"
 msgstr "fejl(%d) ved fjernelse af post %s fra %s\n"
 
-#: rpmdb/rpmdb.c:906
+#: rpmdb/rpmdb.c:959
 msgid "no dbpath has been set\n"
 msgstr "der er ikke sat nogen dbpath\n"
 
-#: rpmdb/rpmdb.c:1054
+#: rpmdb/rpmdb.c:1107
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database\n"
@@ -3127,118 +3153,118 @@ msgstr ""
 "database med det nye format\n"
 
 #. error
-#: rpmdb/rpmdb.c:1319
+#: rpmdb/rpmdb.c:1372
 #, c-format
 msgid "error(%d) counting packages\n"
 msgstr "fejl(%d) ved optælling af pakker\n"
 
-#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3372
+#: rpmdb/rpmdb.c:2150 rpmdb/rpmdb.c:3502
 #, fuzzy, c-format
 msgid "record number %u in database is bad -- skipping.\n"
 msgstr "post nummer %d i databasen er fejlbehæftet -- overspringer.\n"
 
-#: rpmdb/rpmdb.c:2150
+#: rpmdb/rpmdb.c:2203
 #, c-format
 msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2420
+#: rpmdb/rpmdb.c:2473
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "%s: kan ikke læse hoved ved 0x%x\n"
 
-#: rpmdb/rpmdb.c:2540
+#: rpmdb/rpmdb.c:2634
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "fjerner \"%s\" fra %s-indekset.\n"
 
-#: rpmdb/rpmdb.c:2544
+#: rpmdb/rpmdb.c:2638
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "fjerne %d indgange fra %s-indekset.\n"
 
-#: rpmdb/rpmdb.c:2714
+#: rpmdb/rpmdb.c:2808
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "fejl(%d) under allokering af ny pakkeinstans\n"
 
-#: rpmdb/rpmdb.c:2873
+#: rpmdb/rpmdb.c:3003
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 "tilføjer \"%s\" til '%s'-indekset.\n"
 "\n"
 
-#: rpmdb/rpmdb.c:2877
+#: rpmdb/rpmdb.c:3007
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "tilføjer %d indgange til '%s'-indekset.\n"
 
-#: rpmdb/rpmdb.c:3258
+#: rpmdb/rpmdb.c:3388
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr "fjerner %s efter vellykket genopbygning af db3.\n"
 
-#: rpmdb/rpmdb.c:3291
+#: rpmdb/rpmdb.c:3421
 msgid "no dbpath has been set"
 msgstr "der ikke sat nogen dbpath"
 
-#: rpmdb/rpmdb.c:3318
+#: rpmdb/rpmdb.c:3448
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "genopbygger database %s over i %s\n"
 
-#: rpmdb/rpmdb.c:3322
+#: rpmdb/rpmdb.c:3452
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr "den midlertidige database %s eksisterer allerede\n"
 
-#: rpmdb/rpmdb.c:3328
+#: rpmdb/rpmdb.c:3458
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 "opretter kataloget %s\n"
 "\n"
 
-#: rpmdb/rpmdb.c:3330
+#: rpmdb/rpmdb.c:3460
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr "opretter kataloget %s: %s\n"
 
-#: rpmdb/rpmdb.c:3337
+#: rpmdb/rpmdb.c:3467
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "åbner gammel database med dbapi %d\n"
 
-#: rpmdb/rpmdb.c:3348
+#: rpmdb/rpmdb.c:3478
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "åbner ny database med dbapi %d\n"
 
-#: rpmdb/rpmdb.c:3412
+#: rpmdb/rpmdb.c:3542
 #, fuzzy, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "kunne ikke tilføje posten, der tidligere var ved %d\n"
 
-#: rpmdb/rpmdb.c:3430
+#: rpmdb/rpmdb.c:3560
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr "kunne ikke genopbygge database: original-databasen beholdes\n"
 
-#: rpmdb/rpmdb.c:3438
+#: rpmdb/rpmdb.c:3568
 msgid "failed to replace old database with new database!\n"
 msgstr "kunne ikke erstatte gammel database med ny database!\n"
 
-#: rpmdb/rpmdb.c:3440
+#: rpmdb/rpmdb.c:3570
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "erstat filer i %s med filer fra %s for at genoprette"
 
-#: rpmdb/rpmdb.c:3450
+#: rpmdb/rpmdb.c:3580
 #, c-format
 msgid "removing directory %s\n"
 msgstr "fjerner kataloget %s\n"
 
-#: rpmdb/rpmdb.c:3452
+#: rpmdb/rpmdb.c:3582
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "kunne ikke fjerne katalog %s: %s\n"
@@ -3450,6 +3476,12 @@ msgstr "url-port skal være et tal\n"
 msgid "failed to create %s: %s\n"
 msgstr "kunne ikke oprette %s: %s\n"
 
+#~ msgid "Generating signature using PGP.\n"
+#~ msgstr "Genererer signatur med pgp.\n"
+
+#~ msgid "Generating signature using GPG.\n"
+#~ msgstr "Genererer signatur med gpg.\n"
+
 #~ msgid "no packages given for uninstall"
 #~ msgstr "ingen pakker angivet ved afinstallation"
 
@@ -4253,9 +4285,6 @@ msgstr "kunne ikke oprette %s: %s\n"
 #~ msgid "locked  db index       %s/%s\n"
 #~ msgstr "låste   db-index  %s/%s\n"
 
-#~ msgid "========== tsorting packages\n"
-#~ msgstr "========== tsort'er pakker\n"
-
 #~ msgid ""
 #~ "--notriggers may only be specified during package installation, erasure, "
 #~ "and verification"
diff --git a/po/de.po b/po/de.po
index 654aba5a4..97d90998d 100644
--- a/po/de.po
+++ b/po/de.po
@@ -37,7 +37,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-02-10 13:58-0500\n"
+"POT-Creation-Date: 2002-03-06 18:13-0500\n"
 "PO-Revision-Date: 1998-08-03 18:02+02:00\n"
 "Last-Translator: Karl Eichwalder <ke@SuSE.DE>\n"
 "Language-Team: German <de@li.org>\n"
@@ -236,7 +236,7 @@ msgstr "RPM Version %s\n"
 
 #: rpmqv.c:235
 #, fuzzy
-msgid "Copyright (C) 1998-2000 - Red Hat, Inc."
+msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
 msgstr "Copyright © 1998 - Red Hat Software"
 
 #: rpmqv.c:236
@@ -500,7 +500,7 @@ msgid "no arguments given"
 msgstr "Es wurden keine Argumente für die Anfrage angegeben"
 
 # , c-format
-#: build/build.c:125 build/pack.c:479
+#: build/build.c:125 build/pack.c:483
 #, fuzzy
 msgid "Unable to open temp file.\n"
 msgstr "Datei %s kann nicht zum Lesen geöffnet werden: %s."
@@ -866,7 +866,7 @@ msgstr "Öffnen von %s fehlgeschlagen: %s"
 msgid "readRPM: read %s: %s\n"
 msgstr "Lesen von %s fehlgeschlagen: %s."
 
-#: build/pack.c:305 build/pack.c:521
+#: build/pack.c:305 build/pack.c:529
 #, fuzzy, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: »readLead« fehlgeschlagen\n"
@@ -882,91 +882,91 @@ msgid "readRPM: reading header from %s\n"
 msgstr "Fehler beim Eintrag %s von %s"
 
 # , c-format
-#: build/pack.c:467
+#: build/pack.c:471
 #, fuzzy
 msgid "Unable to create immutable header region.\n"
 msgstr "Nicht möglich %s zu schreiben"
 
 # , c-format
-#: build/pack.c:485
+#: build/pack.c:490
 #, fuzzy
 msgid "Unable to write temp header\n"
 msgstr "Nicht möglich %s zu schreiben"
 
-#: build/pack.c:493
+#: build/pack.c:500
 msgid "Bad CSA data\n"
 msgstr ""
 
 # , c-format
-#: build/pack.c:528
+#: build/pack.c:536
 #, fuzzy
 msgid "Unable to write final header\n"
 msgstr "Nicht möglich %s zu schreiben"
 
-#: build/pack.c:546
+#: build/pack.c:556
 #, fuzzy, c-format
 msgid "Generating signature: %d\n"
 msgstr "PGP-Signatur generieren"
 
 # , c-format
-#: build/pack.c:559
+#: build/pack.c:574
 #, fuzzy
 msgid "Unable to reload signature header.\n"
 msgstr "Nicht möglich %s zu schreiben"
 
 # , c-format
-#: build/pack.c:567
+#: build/pack.c:582
 #, fuzzy, c-format
 msgid "Could not open %s: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen\n"
 
 # , c-format
-#: build/pack.c:603 lib/psm.c:1444
+#: build/pack.c:618 lib/psm.c:1444
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Nicht möglich %s zu schreiben"
 
 # , c-format
-#: build/pack.c:618
+#: build/pack.c:633
 #, fuzzy, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "Nicht möglich %s zu schreiben"
 
 # , c-format
-#: build/pack.c:628
+#: build/pack.c:644
 #, fuzzy, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "Nicht möglich %s zu schreiben"
 
 # , c-format
-#: build/pack.c:642
+#: build/pack.c:658
 #, fuzzy, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "Nicht möglich %s zu schreiben"
 
 # , c-format
-#: build/pack.c:652
+#: build/pack.c:668
 #, fuzzy, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "Nicht möglich %s zu schreiben"
 
 # , c-format
-#: build/pack.c:658
+#: build/pack.c:674
 #, fuzzy, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Nicht möglich %s zu schreiben"
 
-#: build/pack.c:683 lib/psm.c:1725
+#: build/pack.c:699 lib/psm.c:1725
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:750
+#: build/pack.c:766
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:767
+#: build/pack.c:783
 #, fuzzy, c-format
 msgid "cannot create %s: %s\n"
 msgstr "kann Datei %s nicht öffnen: "
@@ -1759,45 +1759,56 @@ msgstr "kann Datei %s nicht öffnen: "
 msgid "error creating temporary file %s\n"
 msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
 
-#: lib/package.c:167 lib/package.c:238
+#: lib/package.c:179 lib/package.c:255
 #, fuzzy
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr ""
 "Nur Pakete mit Hauptnummern <= 3 werden von dieser RPM-Version unterstützt"
 
-#: lib/package.c:188 lib/package.c:246
+#: lib/package.c:200 lib/package.c:263
 #, fuzzy
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 "Nur Pakete mit Hauptnummern <= 3 werden von dieser RPM-Version unterstützt"
 
-#: lib/package.c:224 lib/rpmchecksig.c:156 lib/rpmchecksig.c:522
+#: lib/package.c:241 lib/rpmchecksig.c:161 lib/rpmchecksig.c:541
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: »readLead« fehlgeschlagen\n"
 
-#: lib/package.c:230
+#: lib/package.c:247
 #, c-format
 msgid "%s: bad magic\n"
 msgstr ""
 
-#: lib/package.c:254 lib/rpmchecksig.c:174 lib/rpmchecksig.c:538
+#: lib/package.c:272 lib/rpmchecksig.c:179 lib/rpmchecksig.c:557
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: »rpmReadSignature« fehlgeschlagen\n"
 
-#: lib/package.c:258 lib/rpmchecksig.c:178 lib/rpmchecksig.c:543
+#: lib/package.c:276 lib/rpmchecksig.c:183 lib/rpmchecksig.c:562
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Keine Signatur verfügbar\n"
 
-#: lib/package.c:284
+#: lib/package.c:304 lib/rpmchecksig.c:462
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: »readLead« fehlgeschlagen\n"
 
-#: lib/package.c:303 lib/rpmchecksig.c:107 lib/rpmchecksig.c:466
+#. Parse the parameters from the OpenPGP packets that will be needed.
+#: lib/package.c:334 lib/rpmchecksig.c:631
+#, fuzzy
+msgid "========== Header DSA signature\n"
+msgstr "nicht möglich, die Signatur zu lesen"
+
+#. Parse the parameters from the OpenPGP packets that will be needed.
+#: lib/package.c:357
+msgid "========== Package DSA/RSA signature\n"
+msgstr ""
+
+#: lib/package.c:366 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
 #, fuzzy, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: »readLead« fehlgeschlagen\n"
@@ -2577,68 +2588,81 @@ msgstr "Öffnen von %s fehlgeschlagen: %s"
 msgid "(added provide)"
 msgstr "die Datei »%s« gehört zu keinem Paket\n"
 
-#: lib/rpmchecksig.c:49
+#: lib/rpmchecksig.c:51
 #, fuzzy, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s: Öffnen fehlgeschlagen\n"
 
-#: lib/rpmchecksig.c:61
+#: lib/rpmchecksig.c:63
 #, fuzzy
 msgid "makeTempFile failed\n"
 msgstr "%s: Öffnen fehlgeschlagen\n"
 
-#: lib/rpmchecksig.c:101
+#: lib/rpmchecksig.c:104
 #, fuzzy, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: »readLead« fehlgeschlagen\n"
 
-#: lib/rpmchecksig.c:161
-#, c-format
-msgid "%s: Can't sign v1.0 RPM\n"
+#: lib/rpmchecksig.c:166
+#, fuzzy, c-format
+msgid "%s: Can't sign v1 packaging\n"
 msgstr "%s: Kann v1.0-RPM nicht signieren\n"
 
-#: lib/rpmchecksig.c:165
-#, c-format
-msgid "%s: Can't re-sign v2.0 RPM\n"
+#: lib/rpmchecksig.c:170
+#, fuzzy, c-format
+msgid "%s: Can't re-sign v2 packaging\n"
 msgstr "%s: Kann v2.0-RPM nicht erneuert signieren\n"
 
-#: lib/rpmchecksig.c:229
+#: lib/rpmchecksig.c:239
 #, fuzzy, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: »readLead« fehlgeschlagen\n"
 
-#: lib/rpmchecksig.c:235
+#: lib/rpmchecksig.c:245
 #, fuzzy, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: »rpmReadSignature« fehlgeschlagen\n"
 
-#: lib/rpmchecksig.c:528
+#: lib/rpmchecksig.c:476
+#, fuzzy, c-format
+msgid "%s: headerGetEntry failed\n"
+msgstr "%s: »readLead« fehlgeschlagen\n"
+
+#: lib/rpmchecksig.c:547
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: Keine Signatur verfügbar (v1.0 RPM)\n"
 
-#: lib/rpmchecksig.c:725
+#: lib/rpmchecksig.c:618
+msgid "========== Package RSA signature\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:637
+msgid "========== Package DSA signature\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:768
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:726 lib/rpmchecksig.c:740
+#: lib/rpmchecksig.c:769 lib/rpmchecksig.c:783
 #, fuzzy
 msgid " (MISSING KEYS:"
 msgstr " (FEHLENDE SCHLüSSEL)"
 
-#: lib/rpmchecksig.c:728 lib/rpmchecksig.c:742
+#: lib/rpmchecksig.c:771 lib/rpmchecksig.c:785
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:729 lib/rpmchecksig.c:743
+#: lib/rpmchecksig.c:772 lib/rpmchecksig.c:786
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:731 lib/rpmchecksig.c:745
+#: lib/rpmchecksig.c:774 lib/rpmchecksig.c:788
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:739
+#: lib/rpmchecksig.c:782
 msgid "OK"
 msgstr ""
 
@@ -2855,149 +2879,147 @@ msgstr ""
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "Datei %s kann nicht zum Lesen geöffnet werden: %s."
 
-#: lib/signature.c:117
+#: lib/signature.c:118
 msgid "file is not regular -- skipping size check\n"
 msgstr ""
 
-#: lib/signature.c:126
+#: lib/signature.c:127
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:131
+#: lib/signature.c:132
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:151
+#: lib/signature.c:152
 #, fuzzy
 msgid "No signature\n"
 msgstr "%s: Keine Signatur verfügbar\n"
 
-#: lib/signature.c:155
+#: lib/signature.c:156
 #, fuzzy
 msgid "Old PGP signature\n"
 msgstr "PGP-Signatur generieren"
 
-#: lib/signature.c:168
+#: lib/signature.c:169
 #, 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:224
+#: lib/signature.c:225
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:299 lib/signature.c:397 lib/signature.c:537
-#: lib/signature.c:569
+#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:656
+#: lib/signature.c:688
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "Konnte pgp nicht durchführen"
 
-#: lib/signature.c:315
+#: lib/signature.c:322
 #, fuzzy
 msgid "pgp failed\n"
 msgstr "pgp fehlgeschlagen"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:322
+#: lib/signature.c:329
 #, fuzzy
 msgid "pgp failed to write signature\n"
 msgstr "pgp fehlgeschlagen beim Schreiben der Signatur"
 
-#: lib/signature.c:327
+#: lib/signature.c:334
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:343 lib/signature.c:442
+#: lib/signature.c:350 lib/signature.c:450
 #, fuzzy
 msgid "unable to read the signature\n"
 msgstr "nicht möglich, die Signatur zu lesen"
 
-#: lib/signature.c:348
+#: lib/signature.c:355
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:414
+#: lib/signature.c:422
 #, fuzzy
 msgid "gpg failed\n"
 msgstr "pgp fehlgeschlagen"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:421
+#: lib/signature.c:429
 #, fuzzy
 msgid "gpg failed to write signature\n"
 msgstr "pgp fehlgeschlagen beim Schreiben der Signatur"
 
-#: lib/signature.c:426
+#: lib/signature.c:434
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:447
+#: lib/signature.c:455
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:475
-#, fuzzy
-msgid "Generating signature using PGP.\n"
-msgstr "PGP-Signatur generieren"
-
-#: lib/signature.c:481
-#, fuzzy
-msgid "Generating signature using GPG.\n"
-msgstr "PGP-Signatur generieren"
-
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:574 lib/signature.c:627
+#: lib/signature.c:693 lib/signature.c:747
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:607
+#: lib/signature.c:727
 #, 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:619
+#: lib/signature.c:739
 #, fuzzy, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "\"pgp_name:\" muss in der rpmrc-Datei gesetzt sein"
 
-#: lib/signature.c:663
+#: lib/signature.c:783
 msgid "Header+Payload size: "
 msgstr ""
 
-#: lib/signature.c:692
+#: lib/signature.c:823
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:732
+#: lib/signature.c:880
+msgid "Header SHA1 digest: "
+msgstr ""
+
+#: lib/signature.c:1042
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "alle MD5-Signaturen überspringen"
 
-#: lib/signature.c:822
+#: lib/signature.c:1135
+msgid "Header "
+msgstr ""
+
+#: lib/signature.c:1136
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "%s: Keine Signatur verfügbar\n"
 
-#: lib/signature.c:886
+#: lib/signature.c:1214
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:906
+#: lib/signature.c:1240
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:910
+#: lib/signature.c:1244
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
@@ -3270,162 +3292,162 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging"
 msgstr ""
 
 #. @-modfilesys@
-#: rpmdb/rpmdb.c:129
+#: rpmdb/rpmdb.c:163
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:387
+#: rpmdb/rpmdb.c:440
 #, fuzzy, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr "kann Datei %s nicht öffnen: "
 
-#: rpmdb/rpmdb.c:409
+#: rpmdb/rpmdb.c:462
 #, fuzzy, c-format
 msgid "cannot open %s index\n"
 msgstr "Fehler: kann %s nicht öffnen\n"
 
-#: rpmdb/rpmdb.c:501
+#: rpmdb/rpmdb.c:554
 #, fuzzy, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "Fehler beim Eintrag %s von %s"
 
-#: rpmdb/rpmdb.c:632
+#: rpmdb/rpmdb.c:685
 #, fuzzy, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "Fehler bei Schreiben des Eintrags %s nach %s"
 
 # FIXME
-#: rpmdb/rpmdb.c:642
+#: rpmdb/rpmdb.c:695
 #, fuzzy, c-format
 msgid "error(%d) removing record %s from %s\n"
 msgstr "Fehler beim Löschen des Eintrags %s nach %s"
 
-#: rpmdb/rpmdb.c:906
+#: rpmdb/rpmdb.c:959
 #, fuzzy
 msgid "no dbpath has been set\n"
 msgstr "»dbpath« ist nicht gesetzt"
 
-#: rpmdb/rpmdb.c:1054
+#: rpmdb/rpmdb.c:1107
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database\n"
 msgstr ""
 
 #. error
-#: rpmdb/rpmdb.c:1319
+#: rpmdb/rpmdb.c:1372
 #, fuzzy, c-format
 msgid "error(%d) counting packages\n"
 msgstr "Fehler beim Suchen nach Paket %s\n"
 
-#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3372
+#: rpmdb/rpmdb.c:2150 rpmdb/rpmdb.c:3502
 #, fuzzy, c-format
 msgid "record number %u in database is bad -- skipping.\n"
 msgstr ""
 "Eintrag Nummer %d in der Datenback ist nicht in Ordnung -- wird übersprungen"
 
-#: rpmdb/rpmdb.c:2150
+#: rpmdb/rpmdb.c:2203
 #, c-format
 msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2420
+#: rpmdb/rpmdb.c:2473
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "kann Kopfzeilen bei %d nicht lesen, um danach zu suchen"
 
 # FIXME
-#: rpmdb/rpmdb.c:2540
+#: rpmdb/rpmdb.c:2634
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "Fehler beim Löschen des Eintrags %s nach %s"
 
 # FIXME
-#: rpmdb/rpmdb.c:2544
+#: rpmdb/rpmdb.c:2638
 #, fuzzy, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "Fehler beim Löschen des Eintrags %s nach %s"
 
-#: rpmdb/rpmdb.c:2714
+#: rpmdb/rpmdb.c:2808
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "Fehler beim Suchen nach Paket %s\n"
 
-#: rpmdb/rpmdb.c:2873
+#: rpmdb/rpmdb.c:3003
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
 # FIXME
-#: rpmdb/rpmdb.c:2877
+#: rpmdb/rpmdb.c:3007
 #, fuzzy, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "Fehler beim Löschen des Eintrags %s nach %s"
 
-#: rpmdb/rpmdb.c:3258
+#: rpmdb/rpmdb.c:3388
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3291
+#: rpmdb/rpmdb.c:3421
 msgid "no dbpath has been set"
 msgstr "»dbpath« ist nicht gesetzt"
 
-#: rpmdb/rpmdb.c:3318
+#: rpmdb/rpmdb.c:3448
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "Datenbank aus der vorhandenen neu erstellen"
 
-#: rpmdb/rpmdb.c:3322
+#: rpmdb/rpmdb.c:3452
 #, fuzzy, c-format
 msgid "temporary database %s already exists\n"
 msgstr "die temporäre Datenbank %s existiert schon"
 
-#: rpmdb/rpmdb.c:3328
+#: rpmdb/rpmdb.c:3458
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
 
-#: rpmdb/rpmdb.c:3330
+#: rpmdb/rpmdb.c:3460
 #, fuzzy, c-format
 msgid "creating directory %s: %s\n"
 msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
 
-#: rpmdb/rpmdb.c:3337
+#: rpmdb/rpmdb.c:3467
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "Datenbank aus der vorhandenen neu erstellen"
 
-#: rpmdb/rpmdb.c:3348
+#: rpmdb/rpmdb.c:3478
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "Datenbank aus der vorhandenen neu erstellen"
 
-#: rpmdb/rpmdb.c:3412
+#: rpmdb/rpmdb.c:3542
 #, fuzzy, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "kann einen Eintrag hinzufügen, ursprünglich bei %d"
 
-#: rpmdb/rpmdb.c:3430
+#: rpmdb/rpmdb.c:3560
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3438
+#: rpmdb/rpmdb.c:3568
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3440
+#: rpmdb/rpmdb.c:3570
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3450
+#: rpmdb/rpmdb.c:3580
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "Fehler beim Anlegen des Verzeichnisses %s: %s"
 
 # , c-format
-#: rpmdb/rpmdb.c:3452
+#: rpmdb/rpmdb.c:3582
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "Öffnen von %s fehlgeschlagen: %s"
@@ -3650,6 +3672,14 @@ msgstr "Fehler: der FTP-Port muss eine Zahl sein\n"
 msgid "failed to create %s: %s\n"
 msgstr "anlegen von %s fehlgeschlagen\n"
 
+#, fuzzy
+#~ msgid "Generating signature using PGP.\n"
+#~ msgstr "PGP-Signatur generieren"
+
+#, fuzzy
+#~ msgid "Generating signature using GPG.\n"
+#~ msgstr "PGP-Signatur generieren"
+
 #~ msgid "no packages given for uninstall"
 #~ msgstr "Es wurden keine Pakete für die Deinstallation angegeben"
 
@@ -4689,10 +4719,6 @@ msgstr "anlegen von %s fehlgeschlagen\n"
 #~ msgstr "%s: Öffnen fehlgeschlagen\n"
 
 #, fuzzy
-#~ msgid "New Header signature\n"
-#~ msgstr "nicht möglich, die Signatur zu lesen"
-
-#, fuzzy
 #~ msgid "path %s is not relocateable for package %s-%s-%s"
 #~ msgstr "Paket %s ist nicht installiert\n"
 
diff --git a/po/fi.po b/po/fi.po
index 5cc612f9c..5434f5630 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-02-10 13:58-0500\n"
+"POT-Creation-Date: 2002-03-06 18:13-0500\n"
 "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
 "Language-Team: Finnish <linux@sot.com>\n"
 "Content-Type: text/plain; charset=\n"
@@ -190,7 +190,7 @@ msgid "RPM version %s\n"
 msgstr "RPM versio %s\n"
 
 #: rpmqv.c:235
-msgid "Copyright (C) 1998-2000 - Red Hat, Inc."
+msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
 msgstr ""
 
 #: rpmqv.c:236
@@ -321,49 +321,40 @@ msgstr "--allfiles: voidaan käyttää vain paketteja asennettaessa"
 
 #: rpmqv.c:795
 msgid "--justdb may only be specified during package installation and erasure"
-msgstr ""
-"--justdb: voidaan käyttää vain paketteja asennettaessa tai poistettaessa"
+msgstr "--justdb: voidaan käyttää vain paketteja asennettaessa tai poistettaessa"
 
 #: rpmqv.c:800
 #, fuzzy
 msgid ""
 "script disabling options may only be specified during package installation "
 "and erasure"
-msgstr ""
-"--justdb: voidaan käyttää vain paketteja asennettaessa tai poistettaessa"
+msgstr "--justdb: voidaan käyttää vain paketteja asennettaessa tai poistettaessa"
 
 #: rpmqv.c:805
 #, fuzzy
 msgid ""
 "trigger disabling options may only be specified during package installation "
 "and erasure"
-msgstr ""
-"--justdb: voidaan käyttää vain paketteja asennettaessa tai poistettaessa"
+msgstr "--justdb: voidaan käyttää vain paketteja asennettaessa tai poistettaessa"
 
 #: rpmqv.c:809
 #, fuzzy
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
-msgstr ""
-"--nodeps: voidaan käyttää vain paketteja asennettaessa, poistettaessa tai "
-"tarkistettaessa"
+msgstr "--nodeps: voidaan käyttää vain paketteja asennettaessa, poistettaessa tai tarkistettaessa"
 
 #: rpmqv.c:814
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
-msgstr ""
-"--test: voidaan käyttää vain paketteja asennettaessa, poistettaessa ja "
-"käännettäessä"
+msgstr "--test: voidaan käyttää vain paketteja asennettaessa, poistettaessa ja käännettäessä"
 
 #: rpmqv.c:819
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
-msgstr ""
-"--root (-r): voidaan käyttää vain paketteja asennettaessa, poistettaessa, "
-"kyseltäessä ja tietokannan uudelleenluonnissa"
+msgstr "--root (-r): voidaan käyttää vain paketteja asennettaessa, poistettaessa, kyseltäessä ja tietokannan uudelleenluonnissa"
 
 #: rpmqv.c:831
 msgid "arguments to --root (-r) must begin with a /"
@@ -447,7 +438,7 @@ msgstr "--querytags: odottamattomia parametrejä"
 msgid "no arguments given"
 msgstr "kyselylle ei annettu parametrejä"
 
-#: build/build.c:125 build/pack.c:479
+#: build/build.c:125 build/pack.c:483
 #, fuzzy
 msgid "Unable to open temp file.\n"
 msgstr "En voi avata %s luettavaksi: %s."
@@ -795,7 +786,7 @@ msgstr "en voinut avata %s: %s"
 msgid "readRPM: read %s: %s\n"
 msgstr "En voi lukea %s: %s."
 
-#: build/pack.c:305 build/pack.c:521
+#: build/pack.c:305 build/pack.c:529
 #, fuzzy, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: readLead  epäonnistui\n"
@@ -810,81 +801,81 @@ msgstr "virhe: %s ei vaikuta RPM paketilta\n"
 msgid "readRPM: reading header from %s\n"
 msgstr "virhe luettaessa tietuetta %s %s:stä"
 
-#: build/pack.c:467
+#: build/pack.c:471
 #, fuzzy
 msgid "Unable to create immutable header region.\n"
 msgstr "%s:n kirjoitus ei onnistu"
 
-#: build/pack.c:485
+#: build/pack.c:490
 #, fuzzy
 msgid "Unable to write temp header\n"
 msgstr "%s:n kirjoitus ei onnistu"
 
-#: build/pack.c:493
+#: build/pack.c:500
 msgid "Bad CSA data\n"
 msgstr ""
 
-#: build/pack.c:528
+#: build/pack.c:536
 #, fuzzy
 msgid "Unable to write final header\n"
 msgstr "%s:n kirjoitus ei onnistu"
 
-#: build/pack.c:546
+#: build/pack.c:556
 #, fuzzy, c-format
 msgid "Generating signature: %d\n"
 msgstr "generoi PGP-allekirjoitus"
 
-#: build/pack.c:559
+#: build/pack.c:574
 #, fuzzy
 msgid "Unable to reload signature header.\n"
 msgstr "%s:n kirjoitus ei onnistu"
 
-#: build/pack.c:567
+#: build/pack.c:582
 #, fuzzy, c-format
 msgid "Could not open %s: %s\n"
 msgstr "%s:n avaus epäonnistui\n"
 
-#: build/pack.c:603 lib/psm.c:1444
+#: build/pack.c:618 lib/psm.c:1444
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "%s:n kirjoitus ei onnistu"
 
-#: build/pack.c:618
+#: build/pack.c:633
 #, fuzzy, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "%s:n kirjoitus ei onnistu"
 
-#: build/pack.c:628
+#: build/pack.c:644
 #, fuzzy, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "%s:n kirjoitus ei onnistu"
 
-#: build/pack.c:642
+#: build/pack.c:658
 #, fuzzy, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "%s:n kirjoitus ei onnistu"
 
-#: build/pack.c:652
+#: build/pack.c:668
 #, fuzzy, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "%s:n kirjoitus ei onnistu"
 
-#: build/pack.c:658
+#: build/pack.c:674
 #, fuzzy, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "%s:n kirjoitus ei onnistu"
 
-#: build/pack.c:683 lib/psm.c:1725
+#: build/pack.c:699 lib/psm.c:1725
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:750
+#: build/pack.c:766
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:767
+#: build/pack.c:783
 #, fuzzy, c-format
 msgid "cannot create %s: %s\n"
 msgstr "en voinut avata tiedostoa %s: "
@@ -1645,45 +1636,54 @@ msgstr "en voinut avata tiedostoa %s: "
 msgid "error creating temporary file %s\n"
 msgstr "virhe luotaessa hakemistoa %s: %s"
 
-#: lib/package.c:167 lib/package.c:238
+#: lib/package.c:179 lib/package.c:255
 #, fuzzy
 msgid "packaging version 1 is not supported by this version of RPM\n"
-msgstr ""
-"tämä versio RPM:stä tukee vain suuremmman kuin 3 versionumeron paketteja"
+msgstr "tämä versio RPM:stä tukee vain suuremmman kuin 3 versionumeron paketteja"
 
-#: lib/package.c:188 lib/package.c:246
+#: lib/package.c:200 lib/package.c:263
 #, fuzzy
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
-msgstr ""
-"tämä versio RPM:stä tukee vain suuremmman kuin 3 versionumeron paketteja"
+msgstr "tämä versio RPM:stä tukee vain suuremmman kuin 3 versionumeron paketteja"
 
-#: lib/package.c:224 lib/rpmchecksig.c:156 lib/rpmchecksig.c:522
+#: lib/package.c:241 lib/rpmchecksig.c:161 lib/rpmchecksig.c:541
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: readLead  epäonnistui\n"
 
-#: lib/package.c:230
+#: lib/package.c:247
 #, c-format
 msgid "%s: bad magic\n"
 msgstr ""
 
-#: lib/package.c:254 lib/rpmchecksig.c:174 lib/rpmchecksig.c:538
+#: lib/package.c:272 lib/rpmchecksig.c:179 lib/rpmchecksig.c:557
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: rpmReadSignature epäonnistui\n"
 
-#: lib/package.c:258 lib/rpmchecksig.c:178 lib/rpmchecksig.c:543
+#: lib/package.c:276 lib/rpmchecksig.c:183 lib/rpmchecksig.c:562
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Ei allekirjoitusta saatavilla\n"
 
-#: lib/package.c:284
+#: lib/package.c:304 lib/rpmchecksig.c:462
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: readLead  epäonnistui\n"
 
-#: lib/package.c:303 lib/rpmchecksig.c:107 lib/rpmchecksig.c:466
+#. Parse the parameters from the OpenPGP packets that will be needed.
+#: lib/package.c:334 lib/rpmchecksig.c:631
+#, fuzzy
+msgid "========== Header DSA signature\n"
+msgstr "en voinut lukea allekirjoitusta"
+
+#. Parse the parameters from the OpenPGP packets that will be needed.
+#: lib/package.c:357
+msgid "========== Package DSA/RSA signature\n"
+msgstr ""
+
+#: lib/package.c:366 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
 #, fuzzy, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: readLead  epäonnistui\n"
@@ -1715,16 +1715,13 @@ msgstr ""
 
 #: lib/poptI.c:110
 msgid "install all files, even configurations which might otherwise be skipped"
-msgstr ""
-"asenna kaikki tiedostot, myös konfiguraatiot, jotka muuten ehkä ohitettaisiin"
+msgstr "asenna kaikki tiedostot, myös konfiguraatiot, jotka muuten ehkä ohitettaisiin"
 
 #: lib/poptI.c:114
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
-msgstr ""
-"poista kaikki paketit, joiden nimeä vastaa  <paketti> (tavallisesti, jos  "
-"<paketti> määrittää useita paketteja, tulee virhe)"
+msgstr "poista kaikki paketit, joiden nimeä vastaa  <paketti> (tavallisesti, jos  <paketti> määrittää useita paketteja, tulee virhe)"
 
 #: lib/poptI.c:120 lib/poptI.c:171
 #, fuzzy
@@ -1860,9 +1857,7 @@ msgstr "älä suorita asennusskriptejä"
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
-msgstr ""
-"päivitä vanhempaan versioon (--force päivitettäessä tekee tämän "
-"automaattisesti)"
+msgstr "päivitä vanhempaan versioon (--force päivitettäessä tekee tämän automaattisesti)"
 
 #: lib/poptI.c:207
 msgid "print percentages as package installs"
@@ -2450,68 +2445,81 @@ msgstr "en voinut avata %s: %s"
 msgid "(added provide)"
 msgstr "tiedostoa %s ei omista mikään paketti\n"
 
-#: lib/rpmchecksig.c:49
+#: lib/rpmchecksig.c:51
 #, fuzzy, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s: avaus ei onnistunut\n"
 
-#: lib/rpmchecksig.c:61
+#: lib/rpmchecksig.c:63
 #, fuzzy
 msgid "makeTempFile failed\n"
 msgstr "%s: avaus ei onnistunut\n"
 
-#: lib/rpmchecksig.c:101
+#: lib/rpmchecksig.c:104
 #, fuzzy, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: readLead  epäonnistui\n"
 
-#: lib/rpmchecksig.c:161
-#, c-format
-msgid "%s: Can't sign v1.0 RPM\n"
+#: lib/rpmchecksig.c:166
+#, fuzzy, c-format
+msgid "%s: Can't sign v1 packaging\n"
 msgstr "%s: En voi allekirjoittaa v1.0 RPM:ää\n"
 
-#: lib/rpmchecksig.c:165
-#, c-format
-msgid "%s: Can't re-sign v2.0 RPM\n"
+#: lib/rpmchecksig.c:170
+#, fuzzy, c-format
+msgid "%s: Can't re-sign v2 packaging\n"
 msgstr "%s: En voi uudelleen allekirjoittaa v2.0 RPM:ää\n"
 
-#: lib/rpmchecksig.c:229
+#: lib/rpmchecksig.c:239
 #, fuzzy, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: readLead  epäonnistui\n"
 
-#: lib/rpmchecksig.c:235
+#: lib/rpmchecksig.c:245
 #, fuzzy, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmReadSignature epäonnistui\n"
 
-#: lib/rpmchecksig.c:528
+#: lib/rpmchecksig.c:476
+#, fuzzy, c-format
+msgid "%s: headerGetEntry failed\n"
+msgstr "%s: readLead  epäonnistui\n"
+
+#: lib/rpmchecksig.c:547
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: Ei allekirjoitusta saatavilla (v1.0 RPM)\n"
 
-#: lib/rpmchecksig.c:725
+#: lib/rpmchecksig.c:618
+msgid "========== Package RSA signature\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:637
+msgid "========== Package DSA signature\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:768
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:726 lib/rpmchecksig.c:740
+#: lib/rpmchecksig.c:769 lib/rpmchecksig.c:783
 #, fuzzy
 msgid " (MISSING KEYS:"
 msgstr "(PUUTTUVAT AVAIMET)"
 
-#: lib/rpmchecksig.c:728 lib/rpmchecksig.c:742
+#: lib/rpmchecksig.c:771 lib/rpmchecksig.c:785
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:729 lib/rpmchecksig.c:743
+#: lib/rpmchecksig.c:772 lib/rpmchecksig.c:786
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:731 lib/rpmchecksig.c:745
+#: lib/rpmchecksig.c:774 lib/rpmchecksig.c:788
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:739
+#: lib/rpmchecksig.c:782
 msgid "OK"
 msgstr ""
 
@@ -2723,149 +2731,147 @@ msgstr ""
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "En voi avata %s luettavaksi: %s."
 
-#: lib/signature.c:117
+#: lib/signature.c:118
 msgid "file is not regular -- skipping size check\n"
 msgstr ""
 
-#: lib/signature.c:126
+#: lib/signature.c:127
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:131
+#: lib/signature.c:132
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:151
+#: lib/signature.c:152
 #, fuzzy
 msgid "No signature\n"
 msgstr "%s: Ei allekirjoitusta saatavilla\n"
 
-#: lib/signature.c:155
+#: lib/signature.c:156
 #, fuzzy
 msgid "Old PGP signature\n"
 msgstr "generoi PGP-allekirjoitus"
 
-#: lib/signature.c:168
+#: lib/signature.c:169
 #, 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:224
+#: lib/signature.c:225
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:299 lib/signature.c:397 lib/signature.c:537
-#: lib/signature.c:569
+#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:656
+#: lib/signature.c:688
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "En voinut ajaa pgp:tä"
 
-#: lib/signature.c:315
+#: lib/signature.c:322
 #, fuzzy
 msgid "pgp failed\n"
 msgstr "pgp epäonnistui"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:322
+#: lib/signature.c:329
 #, fuzzy
 msgid "pgp failed to write signature\n"
 msgstr "pgp ei voinut kirjoittaa allekirjoitusta"
 
-#: lib/signature.c:327
+#: lib/signature.c:334
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:343 lib/signature.c:442
+#: lib/signature.c:350 lib/signature.c:450
 #, fuzzy
 msgid "unable to read the signature\n"
 msgstr "en voinut lukea allekirjoitusta"
 
-#: lib/signature.c:348
+#: lib/signature.c:355
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:414
+#: lib/signature.c:422
 #, fuzzy
 msgid "gpg failed\n"
 msgstr "pgp epäonnistui"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:421
+#: lib/signature.c:429
 #, fuzzy
 msgid "gpg failed to write signature\n"
 msgstr "pgp ei voinut kirjoittaa allekirjoitusta"
 
-#: lib/signature.c:426
+#: lib/signature.c:434
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:447
+#: lib/signature.c:455
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:475
-#, fuzzy
-msgid "Generating signature using PGP.\n"
-msgstr "generoi PGP-allekirjoitus"
-
-#: lib/signature.c:481
-#, fuzzy
-msgid "Generating signature using GPG.\n"
-msgstr "generoi PGP-allekirjoitus"
-
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:574 lib/signature.c:627
+#: lib/signature.c:693 lib/signature.c:747
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:607
+#: lib/signature.c:727
 #, 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:619
+#: lib/signature.c:739
 #, fuzzy, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "Sinun pitää asettaa \"pgp_name:\" rpmrc-tiedostossa"
 
-#: lib/signature.c:663
+#: lib/signature.c:783
 msgid "Header+Payload size: "
 msgstr ""
 
-#: lib/signature.c:692
+#: lib/signature.c:823
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:732
+#: lib/signature.c:880
+msgid "Header SHA1 digest: "
+msgstr ""
+
+#: lib/signature.c:1042
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "ohita MD5-allekirjoitukset"
 
-#: lib/signature.c:822
+#: lib/signature.c:1135
+msgid "Header "
+msgstr ""
+
+#: lib/signature.c:1136
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "%s: Ei allekirjoitusta saatavilla\n"
 
-#: lib/signature.c:886
+#: lib/signature.c:1214
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:906
+#: lib/signature.c:1240
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:910
+#: lib/signature.c:1244
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
@@ -3136,156 +3142,156 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging"
 msgstr ""
 
 #. @-modfilesys@
-#: rpmdb/rpmdb.c:129
+#: rpmdb/rpmdb.c:163
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:387
+#: rpmdb/rpmdb.c:440
 #, fuzzy, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr "en voinut avata tiedostoa %s: "
 
-#: rpmdb/rpmdb.c:409
+#: rpmdb/rpmdb.c:462
 #, fuzzy, c-format
 msgid "cannot open %s index\n"
 msgstr "virhe: en voi avata %s\n"
 
-#: rpmdb/rpmdb.c:501
+#: rpmdb/rpmdb.c:554
 #, fuzzy, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "virhe luettaessa tietuetta %s %s:stä"
 
-#: rpmdb/rpmdb.c:632
+#: rpmdb/rpmdb.c:685
 #, fuzzy, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "virhe talletettaessa tietuetta %s %s:ään"
 
-#: rpmdb/rpmdb.c:642
+#: rpmdb/rpmdb.c:695
 #, fuzzy, c-format
 msgid "error(%d) removing record %s from %s\n"
 msgstr "virhe poistettaessa tietuetta %s %s:stä"
 
-#: rpmdb/rpmdb.c:906
+#: rpmdb/rpmdb.c:959
 #, fuzzy
 msgid "no dbpath has been set\n"
 msgstr "dbpath ei ole asetettu"
 
-#: rpmdb/rpmdb.c:1054
+#: rpmdb/rpmdb.c:1107
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database\n"
 msgstr ""
 
 #. error
-#: rpmdb/rpmdb.c:1319
+#: rpmdb/rpmdb.c:1372
 #, fuzzy, c-format
 msgid "error(%d) counting packages\n"
 msgstr "virhe etsittäessä pakettia %s\n"
 
-#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3372
+#: rpmdb/rpmdb.c:2150 rpmdb/rpmdb.c:3502
 #, fuzzy, c-format
 msgid "record number %u in database is bad -- skipping.\n"
 msgstr "tietue numero %d tietokannassa viallinen -- ohitan sen"
 
-#: rpmdb/rpmdb.c:2150
+#: rpmdb/rpmdb.c:2203
 #, c-format
 msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2420
+#: rpmdb/rpmdb.c:2473
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "en voi lukea headeria %d:stä päivittäessä"
 
-#: rpmdb/rpmdb.c:2540
+#: rpmdb/rpmdb.c:2634
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "virhe poistettaessa tietuetta %s %s:stä"
 
-#: rpmdb/rpmdb.c:2544
+#: rpmdb/rpmdb.c:2638
 #, fuzzy, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "virhe poistettaessa tietuetta %s %s:stä"
 
-#: rpmdb/rpmdb.c:2714
+#: rpmdb/rpmdb.c:2808
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "virhe etsittäessä pakettia %s\n"
 
-#: rpmdb/rpmdb.c:2873
+#: rpmdb/rpmdb.c:3003
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2877
+#: rpmdb/rpmdb.c:3007
 #, fuzzy, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "virhe poistettaessa tietuetta %s %s:stä"
 
-#: rpmdb/rpmdb.c:3258
+#: rpmdb/rpmdb.c:3388
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3291
+#: rpmdb/rpmdb.c:3421
 msgid "no dbpath has been set"
 msgstr "dbpath ei ole asetettu"
 
-#: rpmdb/rpmdb.c:3318
+#: rpmdb/rpmdb.c:3448
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
 
-#: rpmdb/rpmdb.c:3322
+#: rpmdb/rpmdb.c:3452
 #, fuzzy, c-format
 msgid "temporary database %s already exists\n"
 msgstr "väliaikainen tietokanta %s on jo olemassa"
 
-#: rpmdb/rpmdb.c:3328
+#: rpmdb/rpmdb.c:3458
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "virhe luotaessa hakemistoa %s: %s"
 
-#: rpmdb/rpmdb.c:3330
+#: rpmdb/rpmdb.c:3460
 #, fuzzy, c-format
 msgid "creating directory %s: %s\n"
 msgstr "virhe luotaessa hakemistoa %s: %s"
 
-#: rpmdb/rpmdb.c:3337
+#: rpmdb/rpmdb.c:3467
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
 
-#: rpmdb/rpmdb.c:3348
+#: rpmdb/rpmdb.c:3478
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "kokoa tietokanta uudelleen vanhasta tietokannasta"
 
-#: rpmdb/rpmdb.c:3412
+#: rpmdb/rpmdb.c:3542
 #, fuzzy, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "en voi lisätä tietuetta %d:stä"
 
-#: rpmdb/rpmdb.c:3430
+#: rpmdb/rpmdb.c:3560
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3438
+#: rpmdb/rpmdb.c:3568
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3440
+#: rpmdb/rpmdb.c:3570
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3450
+#: rpmdb/rpmdb.c:3580
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "virhe luotaessa hakemistoa %s: %s"
 
-#: rpmdb/rpmdb.c:3452
+#: rpmdb/rpmdb.c:3582
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "en voinut avata %s: %s"
@@ -3508,6 +3514,14 @@ msgstr "virhe: ftpport pitää olla luku\n"
 msgid "failed to create %s: %s\n"
 msgstr "%s:n luonti epäonnistui\n"
 
+#, fuzzy
+#~ msgid "Generating signature using PGP.\n"
+#~ msgstr "generoi PGP-allekirjoitus"
+
+#, fuzzy
+#~ msgid "Generating signature using GPG.\n"
+#~ msgstr "generoi PGP-allekirjoitus"
+
 #~ msgid "no packages given for uninstall"
 #~ msgstr "poistolle ei määritelty paketteja"
 
@@ -3808,9 +3822,7 @@ msgstr "%s:n luonti epäonnistui\n"
 #, fuzzy
 #~ msgid ""
 #~ "   Install, upgrade and query (with -p) allow URL's to be used in place"
-#~ msgstr ""
-#~ "   asennuksessa, päivityksessä ja kyselyssä (-p:n kanssa)  ftp URL:ja "
-#~ "voidaan käyttää"
+#~ msgstr "   asennuksessa, päivityksessä ja kyselyssä (-p:n kanssa)  ftp URL:ja voidaan käyttää"
 
 #, fuzzy
 #~ msgid "   of file names as well as the following options:"
@@ -3912,9 +3924,7 @@ msgstr "%s:n luonti epäonnistui\n"
 #~ msgid ""
 #~ "show all verifiable information for each file (must be used with -l, -c, "
 #~ "or -d)"
-#~ msgstr ""
-#~ "näytä kaikki varmistettavissa oleva tieto kustakin tiedostosta (pitää "
-#~ "käyttää -l, -c, tai -d kanssa)"
+#~ msgstr "näytä kaikki varmistettavissa oleva tieto kustakin tiedostosta (pitää käyttää -l, -c, tai -d kanssa)"
 
 #~ msgid "list capabilities package provides"
 #~ msgstr "luettele paketin tarjoamat ominaisuudet"
@@ -3928,9 +3938,7 @@ msgstr "%s:n luonti epäonnistui\n"
 #~ msgid ""
 #~ "verify a package installation using the same same package specification "
 #~ "options as -q"
-#~ msgstr ""
-#~ "tarkista paketin asennus käyttäen samoja paketin määrittelyparametrejä "
-#~ "kuin -q "
+#~ msgstr "tarkista paketin asennus käyttäen samoja paketin määrittelyparametrejä kuin -q "
 
 #~ msgid "do not verify file attributes"
 #~ msgstr "älä tarkista tiedostojen ominaisuuksia"
@@ -4019,9 +4027,7 @@ msgstr "%s:n luonti epäonnistui\n"
 #~ msgid ""
 #~ "install source package, build binary package and remove spec file, "
 #~ "sources, patches, and icons."
-#~ msgstr ""
-#~ "asenna lähdekoodipaketti, käännä binääripaketti ja poista "
-#~ "määrittelytiedosto, lähdekoodi, korjaukset ja kuvakkeet"
+#~ msgstr "asenna lähdekoodipaketti, käännä binääripaketti ja poista määrittelytiedosto, lähdekoodi, korjaukset ja kuvakkeet"
 
 #~ msgid "like --rebuild, but don't build any package"
 #~ msgstr "kuten --rebuild, mutta ei käännä paketteja"
@@ -4051,16 +4057,12 @@ msgstr "%s:n luonti epäonnistui\n"
 #~ msgid ""
 #~ "set the file permissions to those in the package database using the same "
 #~ "package specification options as -q"
-#~ msgstr ""
-#~ "aseta tiedostojen oikeudet niiksi, jotka ne ovat pakettien tietokannassa "
-#~ "käyttäen samoja pakettien määrittelyparametrejä kuin -q"
+#~ msgstr "aseta tiedostojen oikeudet niiksi, jotka ne ovat pakettien tietokannassa käyttäen samoja pakettien määrittelyparametrejä kuin -q"
 
 #~ msgid ""
 #~ "set the file owner and group to those in the package database using the "
 #~ "same package specification options as -q"
-#~ msgstr ""
-#~ "aseta tiedostojen omistaja ja ryhmä niiksi, jotka ne ovat pakettien "
-#~ "tietokannassa käyttäen samoja pakettien määrittelyparametrejä kuin -q"
+#~ msgstr "aseta tiedostojen omistaja ja ryhmä niiksi, jotka ne ovat pakettien tietokannassa käyttäen samoja pakettien määrittelyparametrejä kuin -q"
 
 #~ msgid "-u and --uninstall are deprecated and no longer work.\n"
 #~ msgstr "-u ja --uninstall ovat vanhentuneet eivätkä enää toimi.\n"
@@ -4072,9 +4074,7 @@ msgstr "%s:n luonti epäonnistui\n"
 #~ msgid ""
 #~ "script disabling options may only be specified during package "
 #~ "installation, erasure, and verification"
-#~ msgstr ""
-#~ "--noscripts: voidaan käyttää vain paketteja asennettaessa, poistettaessa "
-#~ "tai tarkistettaessa"
+#~ msgstr "--noscripts: voidaan käyttää vain paketteja asennettaessa, poistettaessa tai tarkistettaessa"
 
 #, fuzzy
 #~ msgid "--apply may only be specified during package installation"
@@ -4094,9 +4094,7 @@ msgstr "%s:n luonti epäonnistui\n"
 #~ msgid ""
 #~ "--nomd5 may only be used during signature checking and package "
 #~ "verification"
-#~ msgstr ""
-#~ "--nopgp: voidaan käyttää vain allekirjoitusta tarkistettaessa ja "
-#~ "paketteja todennettaessa"
+#~ msgstr "--nopgp: voidaan käyttää vain allekirjoitusta tarkistettaessa ja paketteja todennettaessa"
 
 #, fuzzy
 #~ msgid "Could not run pgp.  Use --nopgp to skip PGP checks.\n"
@@ -4146,9 +4144,7 @@ msgstr "%s:n luonti epäonnistui\n"
 #~ msgid ""
 #~ "  Install, upgrade and query (with -p) modes allow URL's to be used in "
 #~ "place"
-#~ msgstr ""
-#~ "   asennuksessa, päivityksessä ja kyselyssä (-p:n kanssa)  ftp URL:ja "
-#~ "voidaan käyttää"
+#~ msgstr "   asennuksessa, päivityksessä ja kyselyssä (-p:n kanssa)  ftp URL:ja voidaan käyttää"
 
 #, fuzzy
 #~ msgid "  of file names as well as the following options:"
@@ -4306,9 +4302,7 @@ msgstr "%s:n luonti epäonnistui\n"
 #~ msgid ""
 #~ "--notriggers may only be specified during package installation, erasure, "
 #~ "and verification"
-#~ msgstr ""
-#~ "--nodeps: voidaan käyttää vain paketteja asennettaessa, poistettaessa tai "
-#~ "tarkistettaessa"
+#~ msgstr "--nodeps: voidaan käyttää vain paketteja asennettaessa, poistettaessa tai tarkistettaessa"
 
 #, fuzzy
 #~ msgid "       %s {--initdb}   [--dbpath <dir>]\n"
@@ -4476,29 +4470,22 @@ msgstr "%s:n luonti epäonnistui\n"
 
 #, fuzzy
 #~ msgid "                        [--rmsource] [--rmspec] specfile"
-#~ msgstr ""
-#~ "                        [--buildarch <arkk>] [--rmsource] "
-#~ "määrittelytiedosto"
+#~ msgstr "                        [--buildarch <arkk>] [--rmsource] määrittelytiedosto"
 
 #, fuzzy
 #~ msgid "       %s {--rmsource} [--rcfile <file>] [-v] specfile\n"
-#~ msgstr ""
-#~ "       rpm {--rmsource} [--rcfile <tiedosto>] [-v] määrittelytiedosto"
+#~ msgstr "       rpm {--rmsource} [--rcfile <tiedosto>] [-v] määrittelytiedosto"
 
 #, fuzzy
 #~ msgid ""
 #~ "       %s {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm\n"
-#~ msgstr ""
-#~ "       rpm {--rebuild} [--rcfile <tiedosto>] [-v] lähdekoodi1.rpm ... "
-#~ "lähdekoodiN.rpm"
+#~ msgstr "       rpm {--rebuild} [--rcfile <tiedosto>] [-v] lähdekoodi1.rpm ... lähdekoodiN.rpm"
 
 #, fuzzy
 #~ msgid ""
 #~ "       %s {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN."
 #~ "rpm\n"
-#~ msgstr ""
-#~ "       rpm {--recompile} [--rcfile <tiedosto>] [-v] lähdekoodi1.rpm ... "
-#~ "lähdekoodiN.rpm"
+#~ msgstr "       rpm {--recompile} [--rcfile <tiedosto>] [-v] lähdekoodi1.rpm ... lähdekoodiN.rpm"
 
 #, fuzzy
 #~ msgid "       %s {--freshen -F} file1.rpm ... fileN.rpm\n"
@@ -4546,10 +4533,6 @@ msgstr "%s:n luonti epäonnistui\n"
 #~ msgstr "%s: avaus ei onnistunut\n"
 
 #, fuzzy
-#~ msgid "New Header signature\n"
-#~ msgstr "en voinut lukea allekirjoitusta"
-
-#, fuzzy
 #~ msgid "path %s is not relocateable for package %s-%s-%s"
 #~ msgstr "paketti %s ei ole asennettu\n"
 
@@ -4596,21 +4579,16 @@ msgstr "%s:n luonti epäonnistui\n"
 #~ "<kj>]"
 
 #~ msgid "       rpm {--rmsource} [--rcfile <file>] [-v] specfile"
-#~ msgstr ""
-#~ "       rpm {--rmsource} [--rcfile <tiedosto>] [-v] määrittelytiedosto"
+#~ msgstr "       rpm {--rmsource} [--rcfile <tiedosto>] [-v] määrittelytiedosto"
 
 #~ msgid ""
 #~ "       rpm {--rebuild} [--rcfile <file>] [-v] source1.rpm ... sourceN.rpm"
-#~ msgstr ""
-#~ "       rpm {--rebuild} [--rcfile <tiedosto>] [-v] lähdekoodi1.rpm ... "
-#~ "lähdekoodiN.rpm"
+#~ msgstr "       rpm {--rebuild} [--rcfile <tiedosto>] [-v] lähdekoodi1.rpm ... lähdekoodiN.rpm"
 
 #~ msgid ""
 #~ "       rpm {--recompile} [--rcfile <file>] [-v] source1.rpm ... sourceN."
 #~ "rpm"
-#~ msgstr ""
-#~ "       rpm {--recompile} [--rcfile <tiedosto>] [-v] lähdekoodi1.rpm ... "
-#~ "lähdekoodiN.rpm"
+#~ msgstr "       rpm {--recompile} [--rcfile <tiedosto>] [-v] lähdekoodi1.rpm ... lähdekoodiN.rpm"
 
 #, fuzzy
 #~ msgid "                        [--sign] [--nobuild] ]"
@@ -4639,12 +4617,10 @@ msgstr "%s:n luonti epäonnistui\n"
 #~ msgstr "älä tarkista paketin käyttöjärjestelmää"
 
 #~ msgid "--build (-b) requires one of a,b,i,c,p,l as its sole argument"
-#~ msgstr ""
-#~ "--build (-b) vaatii yhden joukosta a,b,i,c,p,l ainoana parametrinään"
+#~ msgstr "--build (-b) vaatii yhden joukosta a,b,i,c,p,l ainoana parametrinään"
 
 #~ msgid "--tarbuild (-t) requires one of a,b,i,c,p,l as its sole argument"
-#~ msgstr ""
-#~ "--tarbuild (-t) vaatii yhden joukosta a,b,i,c,p,l ainoana parametrinään"
+#~ msgstr "--tarbuild (-t) vaatii yhden joukosta a,b,i,c,p,l ainoana parametrinään"
 
 #~ msgid "arguments to --dbpath must begin with a /"
 #~ msgstr "--dbpath:n parametrien pitää alkaa /-merkillä"
@@ -4655,17 +4631,13 @@ msgstr "%s:n luonti epäonnistui\n"
 #~ msgid ""
 #~ "ftp options can only be used during package queries, installs, and "
 #~ "upgrades"
-#~ msgstr ""
-#~ "ftp-parametrejä voidaan käyttää vain paketteja kysellessä, asennettaessa "
-#~ "ja päivitettäessä"
+#~ msgstr "ftp-parametrejä voidaan käyttää vain paketteja kysellessä, asennettaessa ja päivitettäessä"
 
 #, fuzzy
 #~ msgid ""
 #~ "http options can only be used during package queries, installs, and "
 #~ "upgrades"
-#~ msgstr ""
-#~ "ftp-parametrejä voidaan käyttää vain paketteja kysellessä, asennettaessa "
-#~ "ja päivitettäessä"
+#~ msgstr "ftp-parametrejä voidaan käyttää vain paketteja kysellessä, asennettaessa ja päivitettäessä"
 
 #~ msgid "relocate files even though the package doesn't allow it"
 #~ msgstr "siirrä tiedostot toiseen hakemistoon vaikka paketti ei sitä sallisi"
@@ -4978,33 +4950,25 @@ msgstr "%s:n luonti epäonnistui\n"
 #~ msgid ""
 #~ "--noscripts may only be specified during package installation and "
 #~ "uninstallation"
-#~ msgstr ""
-#~ "--noscripts: voidaan käyttää vain paketteja asennettaessa, poistettaessa "
-#~ "tai tarkistettaessa"
+#~ msgstr "--noscripts: voidaan käyttää vain paketteja asennettaessa, poistettaessa tai tarkistettaessa"
 
 #, fuzzy
 #~ msgid ""
 #~ "--nodeps may only be specified during package installation, "
 #~ "uninstallation, and verification"
-#~ msgstr ""
-#~ "--nodeps: voidaan käyttää vain paketteja asennettaessa, poistettaessa tai "
-#~ "tarkistettaessa"
+#~ msgstr "--nodeps: voidaan käyttää vain paketteja asennettaessa, poistettaessa tai tarkistettaessa"
 
 #, fuzzy
 #~ msgid ""
 #~ "--test may only be specified during package installation, uninstallation, "
 #~ "and building"
-#~ msgstr ""
-#~ "--test: voidaan käyttää vain paketteja asennettaessa, poistettaessa ja "
-#~ "käännettäessä"
+#~ msgstr "--test: voidaan käyttää vain paketteja asennettaessa, poistettaessa ja käännettäessä"
 
 #, fuzzy
 #~ msgid ""
 #~ "--root (-r) may only be specified during installation, uninstallation, "
 #~ "querying, and database rebuilds"
-#~ msgstr ""
-#~ "--root (-r): voidaan käyttää vain paketteja asennettaessa, poistettaessa, "
-#~ "kyseltäessä ja tietokannan uudelleenluonnissa"
+#~ msgstr "--root (-r): voidaan käyttää vain paketteja asennettaessa, poistettaessa, kyseltäessä ja tietokannan uudelleenluonnissa"
 
 #, fuzzy
 #~ msgid "--clean may only be used during package building"
diff --git a/po/fr.po b/po/fr.po
index a2790e512..827838834 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-02-10 13:58-0500\n"
+"POT-Creation-Date: 2002-03-06 18:13-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -198,7 +198,7 @@ msgid "RPM version %s\n"
 msgstr ""
 
 #: rpmqv.c:235
-msgid "Copyright (C) 1998-2000 - Red Hat, Inc."
+msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
 msgstr ""
 
 #: rpmqv.c:236
@@ -478,7 +478,7 @@ msgstr ""
 msgid "no arguments given"
 msgstr "aucun argument n'a t fourni pour la requte"
 
-#: build/build.c:125 build/pack.c:479
+#: build/build.c:125 build/pack.c:483
 #, fuzzy
 msgid "Unable to open temp file.\n"
 msgstr "impossible d'ouvrir: %s\n"
@@ -821,7 +821,7 @@ msgstr "impossible d'ouvrir: %s\n"
 msgid "readRPM: read %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:305 build/pack.c:521
+#: build/pack.c:305 build/pack.c:529
 #, fuzzy, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
@@ -836,81 +836,81 @@ msgstr ""
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:467
+#: build/pack.c:471
 #, fuzzy
 msgid "Unable to create immutable header region.\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:485
+#: build/pack.c:490
 #, fuzzy
 msgid "Unable to write temp header\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:493
+#: build/pack.c:500
 msgid "Bad CSA data\n"
 msgstr ""
 
-#: build/pack.c:528
+#: build/pack.c:536
 #, fuzzy
 msgid "Unable to write final header\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:546
+#: build/pack.c:556
 #, fuzzy, c-format
 msgid "Generating signature: %d\n"
 msgstr "      --sign            - genre une signature PGP"
 
-#: build/pack.c:559
+#: build/pack.c:574
 #, fuzzy
 msgid "Unable to reload signature header.\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:567
+#: build/pack.c:582
 #, fuzzy, c-format
 msgid "Could not open %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:603 lib/psm.c:1444
+#: build/pack.c:618 lib/psm.c:1444
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:618
+#: build/pack.c:633
 #, fuzzy, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:628
+#: build/pack.c:644
 #, fuzzy, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:642
+#: build/pack.c:658
 #, fuzzy, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:652
+#: build/pack.c:668
 #, fuzzy, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:658
+#: build/pack.c:674
 #, fuzzy, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: build/pack.c:683 lib/psm.c:1725
+#: build/pack.c:699 lib/psm.c:1725
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:750
+#: build/pack.c:766
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:767
+#: build/pack.c:783
 #, fuzzy, c-format
 msgid "cannot create %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
@@ -1671,41 +1671,52 @@ msgstr "impossible d'ouvrir: %s\n"
 msgid "error creating temporary file %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/package.c:167 lib/package.c:238
+#: lib/package.c:179 lib/package.c:255
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:188 lib/package.c:246
+#: lib/package.c:200 lib/package.c:263
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:224 lib/rpmchecksig.c:156 lib/rpmchecksig.c:522
+#: lib/package.c:241 lib/rpmchecksig.c:161 lib/rpmchecksig.c:541
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
 
-#: lib/package.c:230
+#: lib/package.c:247
 #, c-format
 msgid "%s: bad magic\n"
 msgstr ""
 
-#: lib/package.c:254 lib/rpmchecksig.c:174 lib/rpmchecksig.c:538
+#: lib/package.c:272 lib/rpmchecksig.c:179 lib/rpmchecksig.c:557
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/package.c:258 lib/rpmchecksig.c:178 lib/rpmchecksig.c:543
+#: lib/package.c:276 lib/rpmchecksig.c:183 lib/rpmchecksig.c:562
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/package.c:284
+#: lib/package.c:304 lib/rpmchecksig.c:462
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/package.c:303 lib/rpmchecksig.c:107 lib/rpmchecksig.c:466
+#. Parse the parameters from the OpenPGP packets that will be needed.
+#: lib/package.c:334 lib/rpmchecksig.c:631
+#, fuzzy
+msgid "========== Header DSA signature\n"
+msgstr "      --sign            - genre une signature PGP"
+
+#. Parse the parameters from the OpenPGP packets that will be needed.
+#: lib/package.c:357
+msgid "========== Package DSA/RSA signature\n"
+msgstr ""
+
+#: lib/package.c:366 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
 #, fuzzy, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
@@ -2485,67 +2496,80 @@ msgstr "impossible d'ouvrir: %s\n"
 msgid "(added provide)"
 msgstr ""
 
-#: lib/rpmchecksig.c:49
+#: lib/rpmchecksig.c:51
 #, fuzzy, c-format
 msgid "%s: open failed: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmchecksig.c:61
+#: lib/rpmchecksig.c:63
 #, fuzzy
 msgid "makeTempFile failed\n"
 msgstr "La construction a chou.\n"
 
-#: lib/rpmchecksig.c:101
+#: lib/rpmchecksig.c:104
 #, fuzzy, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmchecksig.c:161
+#: lib/rpmchecksig.c:166
 #, c-format
-msgid "%s: Can't sign v1.0 RPM\n"
+msgid "%s: Can't sign v1 packaging\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:165
+#: lib/rpmchecksig.c:170
 #, c-format
-msgid "%s: Can't re-sign v2.0 RPM\n"
+msgid "%s: Can't re-sign v2 packaging\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:229
+#: lib/rpmchecksig.c:239
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:235
+#: lib/rpmchecksig.c:245
 #, fuzzy, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/rpmchecksig.c:528
+#: lib/rpmchecksig.c:476
+#, fuzzy, c-format
+msgid "%s: headerGetEntry failed\n"
+msgstr "impossible d'ouvrir: %s\n"
+
+#: lib/rpmchecksig.c:547
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:725
+#: lib/rpmchecksig.c:618
+msgid "========== Package RSA signature\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:637
+msgid "========== Package DSA signature\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:768
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:726 lib/rpmchecksig.c:740
+#: lib/rpmchecksig.c:769 lib/rpmchecksig.c:783
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:728 lib/rpmchecksig.c:742
+#: lib/rpmchecksig.c:771 lib/rpmchecksig.c:785
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:729 lib/rpmchecksig.c:743
+#: lib/rpmchecksig.c:772 lib/rpmchecksig.c:786
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:731 lib/rpmchecksig.c:745
+#: lib/rpmchecksig.c:774 lib/rpmchecksig.c:788
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:739
+#: lib/rpmchecksig.c:782
 msgid "OK"
 msgstr ""
 
@@ -2756,146 +2780,144 @@ msgstr ""
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/signature.c:117
+#: lib/signature.c:118
 msgid "file is not regular -- skipping size check\n"
 msgstr ""
 
-#: lib/signature.c:126
+#: lib/signature.c:127
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:131
+#: lib/signature.c:132
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:151
+#: lib/signature.c:152
 msgid "No signature\n"
 msgstr ""
 
-#: lib/signature.c:155
+#: lib/signature.c:156
 #, fuzzy
 msgid "Old PGP signature\n"
 msgstr "      --sign            - genre une signature PGP"
 
-#: lib/signature.c:168
+#: lib/signature.c:169
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr ""
 
-#: lib/signature.c:224
+#: lib/signature.c:225
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:299 lib/signature.c:397 lib/signature.c:537
-#: lib/signature.c:569
+#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:656
+#: lib/signature.c:688
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/signature.c:315
+#: lib/signature.c:322
 #, fuzzy
 msgid "pgp failed\n"
 msgstr "La construction a chou.\n"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:322
+#: lib/signature.c:329
 #, fuzzy
 msgid "pgp failed to write signature\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/signature.c:327
+#: lib/signature.c:334
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:343 lib/signature.c:442
+#: lib/signature.c:350 lib/signature.c:450
 #, fuzzy
 msgid "unable to read the signature\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/signature.c:348
+#: lib/signature.c:355
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:414
+#: lib/signature.c:422
 #, fuzzy
 msgid "gpg failed\n"
 msgstr "La construction a chou.\n"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:421
+#: lib/signature.c:429
 #, fuzzy
 msgid "gpg failed to write signature\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: lib/signature.c:426
+#: lib/signature.c:434
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:447
+#: lib/signature.c:455
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:475
-#, fuzzy
-msgid "Generating signature using PGP.\n"
-msgstr "      --sign            - genre une signature PGP"
-
-#: lib/signature.c:481
-#, fuzzy
-msgid "Generating signature using GPG.\n"
-msgstr "      --sign            - genre une signature PGP"
-
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:574 lib/signature.c:627
+#: lib/signature.c:693 lib/signature.c:747
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:607
+#: lib/signature.c:727
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:619
+#: lib/signature.c:739
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:663
+#: lib/signature.c:783
 msgid "Header+Payload size: "
 msgstr ""
 
-#: lib/signature.c:692
+#: lib/signature.c:823
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:732
+#: lib/signature.c:880
+msgid "Header SHA1 digest: "
+msgstr ""
+
+#: lib/signature.c:1042
 msgid "V3 RSA/MD5 signature: "
 msgstr ""
 
-#: lib/signature.c:822
+#: lib/signature.c:1135
+msgid "Header "
+msgstr ""
+
+#: lib/signature.c:1136
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "      --sign            - genre une signature PGP"
 
-#: lib/signature.c:886
+#: lib/signature.c:1214
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:906
+#: lib/signature.c:1240
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:910
+#: lib/signature.c:1244
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
@@ -3166,155 +3188,155 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging"
 msgstr ""
 
 #. @-modfilesys@
-#: rpmdb/rpmdb.c:129
+#: rpmdb/rpmdb.c:163
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:387
+#: rpmdb/rpmdb.c:440
 #, fuzzy, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: rpmdb/rpmdb.c:409
+#: rpmdb/rpmdb.c:462
 #, fuzzy, c-format
 msgid "cannot open %s index\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: rpmdb/rpmdb.c:501
+#: rpmdb/rpmdb.c:554
 #, fuzzy, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: rpmdb/rpmdb.c:632
+#: rpmdb/rpmdb.c:685
 #, fuzzy, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: rpmdb/rpmdb.c:642
+#: rpmdb/rpmdb.c:695
 #, fuzzy, c-format
 msgid "error(%d) removing record %s from %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: rpmdb/rpmdb.c:906
+#: rpmdb/rpmdb.c:959
 msgid "no dbpath has been set\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1054
+#: rpmdb/rpmdb.c:1107
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database\n"
 msgstr ""
 
 #. error
-#: rpmdb/rpmdb.c:1319
+#: rpmdb/rpmdb.c:1372
 #, fuzzy, c-format
 msgid "error(%d) counting packages\n"
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3372
+#: rpmdb/rpmdb.c:2150 rpmdb/rpmdb.c:3502
 #, c-format
 msgid "record number %u in database is bad -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2150
+#: rpmdb/rpmdb.c:2203
 #, c-format
 msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2420
+#: rpmdb/rpmdb.c:2473
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "aucun package n'a t spcifi pour la dsinstallation"
 
-#: rpmdb/rpmdb.c:2540
+#: rpmdb/rpmdb.c:2634
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2544
+#: rpmdb/rpmdb.c:2638
 #, fuzzy, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: rpmdb/rpmdb.c:2714
+#: rpmdb/rpmdb.c:2808
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "aucun package n'a t spcifi pour l'installation"
 
-#: rpmdb/rpmdb.c:2873
+#: rpmdb/rpmdb.c:3003
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2877
+#: rpmdb/rpmdb.c:3007
 #, fuzzy, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: rpmdb/rpmdb.c:3258
+#: rpmdb/rpmdb.c:3388
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3291
+#: rpmdb/rpmdb.c:3421
 msgid "no dbpath has been set"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3318
+#: rpmdb/rpmdb.c:3448
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: rpmdb/rpmdb.c:3322
+#: rpmdb/rpmdb.c:3452
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3328
+#: rpmdb/rpmdb.c:3458
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: rpmdb/rpmdb.c:3330
+#: rpmdb/rpmdb.c:3460
 #, fuzzy, c-format
 msgid "creating directory %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: rpmdb/rpmdb.c:3337
+#: rpmdb/rpmdb.c:3467
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3348
+#: rpmdb/rpmdb.c:3478
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3412
+#: rpmdb/rpmdb.c:3542
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3430
+#: rpmdb/rpmdb.c:3560
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3438
+#: rpmdb/rpmdb.c:3568
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3440
+#: rpmdb/rpmdb.c:3570
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3450
+#: rpmdb/rpmdb.c:3580
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
-#: rpmdb/rpmdb.c:3452
+#: rpmdb/rpmdb.c:3582
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
@@ -3526,6 +3548,14 @@ msgstr ""
 msgid "failed to create %s: %s\n"
 msgstr "impossible d'ouvrir: %s\n"
 
+#, fuzzy
+#~ msgid "Generating signature using PGP.\n"
+#~ msgstr "      --sign            - genre une signature PGP"
+
+#, fuzzy
+#~ msgid "Generating signature using GPG.\n"
+#~ msgstr "      --sign            - genre une signature PGP"
+
 #~ msgid "no packages given for uninstall"
 #~ msgstr "aucun package n'a t spcifi pour la dsinstallation"
 
@@ -4124,10 +4154,6 @@ msgstr "impossible d'ouvrir: %s\n"
 #~ msgstr "    --checksig <pkg>+  - vrifie la signature PGP"
 
 #, fuzzy
-#~ msgid "New Header signature\n"
-#~ msgstr "      --sign            - genre une signature PGP"
-
-#, fuzzy
 #~ msgid "path %s is not relocateable for package %s-%s-%s"
 #~ msgstr "aucun package n'a t spcifi pour l'installation"
 
diff --git a/po/gl.po b/po/gl.po
index cc80cb010..aff213d5d 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
-"POT-Creation-Date: 2002-02-10 13:58-0500\n"
+"POT-Creation-Date: 2002-03-06 18:13-0500\n"
 "PO-Revision-Date: 2001-01-13 22:31+0100\n"
 "Last-Translator: Jesús Bravo Álvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -189,7 +189,7 @@ msgid "RPM version %s\n"
 msgstr ""
 
 #: rpmqv.c:235
-msgid "Copyright (C) 1998-2000 - Red Hat, Inc."
+msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
 msgstr ""
 
 #: rpmqv.c:236
@@ -423,7 +423,7 @@ msgstr ""
 msgid "no arguments given"
 msgstr ""
 
-#: build/build.c:125 build/pack.c:479
+#: build/build.c:125 build/pack.c:483
 msgid "Unable to open temp file.\n"
 msgstr ""
 
@@ -765,7 +765,7 @@ msgstr ""
 msgid "readRPM: read %s: %s\n"
 msgstr ""
 
-#: build/pack.c:305 build/pack.c:521
+#: build/pack.c:305 build/pack.c:529
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr ""
@@ -780,77 +780,77 @@ msgstr ""
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:467
+#: build/pack.c:471
 msgid "Unable to create immutable header region.\n"
 msgstr ""
 
-#: build/pack.c:485
+#: build/pack.c:490
 msgid "Unable to write temp header\n"
 msgstr ""
 
-#: build/pack.c:493
+#: build/pack.c:500
 msgid "Bad CSA data\n"
 msgstr ""
 
-#: build/pack.c:528
+#: build/pack.c:536
 msgid "Unable to write final header\n"
 msgstr ""
 
-#: build/pack.c:546
+#: build/pack.c:556
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr ""
 
-#: build/pack.c:559
+#: build/pack.c:574
 msgid "Unable to reload signature header.\n"
 msgstr ""
 
-#: build/pack.c:567
+#: build/pack.c:582
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:603 lib/psm.c:1444
+#: build/pack.c:618 lib/psm.c:1444
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
 
-#: build/pack.c:618
+#: build/pack.c:633
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr ""
 
-#: build/pack.c:628
+#: build/pack.c:644
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr ""
 
-#: build/pack.c:642
+#: build/pack.c:658
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:652
+#: build/pack.c:668
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr ""
 
-#: build/pack.c:658
+#: build/pack.c:674
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:683 lib/psm.c:1725
+#: build/pack.c:699 lib/psm.c:1725
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:750
+#: build/pack.c:766
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:767
+#: build/pack.c:783
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr ""
@@ -1582,41 +1582,51 @@ msgstr ""
 msgid "error creating temporary file %s\n"
 msgstr ""
 
-#: lib/package.c:167 lib/package.c:238
+#: lib/package.c:179 lib/package.c:255
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:188 lib/package.c:246
+#: lib/package.c:200 lib/package.c:263
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:224 lib/rpmchecksig.c:156 lib/rpmchecksig.c:522
+#: lib/package.c:241 lib/rpmchecksig.c:161 lib/rpmchecksig.c:541
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
 
-#: lib/package.c:230
+#: lib/package.c:247
 #, c-format
 msgid "%s: bad magic\n"
 msgstr ""
 
-#: lib/package.c:254 lib/rpmchecksig.c:174 lib/rpmchecksig.c:538
+#: lib/package.c:272 lib/rpmchecksig.c:179 lib/rpmchecksig.c:557
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/package.c:258 lib/rpmchecksig.c:178 lib/rpmchecksig.c:543
+#: lib/package.c:276 lib/rpmchecksig.c:183 lib/rpmchecksig.c:562
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/package.c:284
+#: lib/package.c:304 lib/rpmchecksig.c:462
 #, c-format
 msgid "%s: headerRead failed\n"
 msgstr ""
 
-#: lib/package.c:303 lib/rpmchecksig.c:107 lib/rpmchecksig.c:466
+#. Parse the parameters from the OpenPGP packets that will be needed.
+#: lib/package.c:334 lib/rpmchecksig.c:631
+msgid "========== Header DSA signature\n"
+msgstr ""
+
+#. Parse the parameters from the OpenPGP packets that will be needed.
+#: lib/package.c:357
+msgid "========== Package DSA/RSA signature\n"
+msgstr ""
+
+#: lib/package.c:366 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr ""
@@ -2320,66 +2330,79 @@ msgstr ""
 msgid "(added provide)"
 msgstr ""
 
-#: lib/rpmchecksig.c:49
+#: lib/rpmchecksig.c:51
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:61
+#: lib/rpmchecksig.c:63
 msgid "makeTempFile failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:101
+#: lib/rpmchecksig.c:104
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:161
+#: lib/rpmchecksig.c:166
 #, c-format
-msgid "%s: Can't sign v1.0 RPM\n"
+msgid "%s: Can't sign v1 packaging\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:165
+#: lib/rpmchecksig.c:170
 #, c-format
-msgid "%s: Can't re-sign v2.0 RPM\n"
+msgid "%s: Can't re-sign v2 packaging\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:229
+#: lib/rpmchecksig.c:239
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:235
+#: lib/rpmchecksig.c:245
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:528
+#: lib/rpmchecksig.c:476
+#, c-format
+msgid "%s: headerGetEntry failed\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:547
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:725
+#: lib/rpmchecksig.c:618
+msgid "========== Package RSA signature\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:637
+msgid "========== Package DSA signature\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:768
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:726 lib/rpmchecksig.c:740
+#: lib/rpmchecksig.c:769 lib/rpmchecksig.c:783
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:728 lib/rpmchecksig.c:742
+#: lib/rpmchecksig.c:771 lib/rpmchecksig.c:785
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:729 lib/rpmchecksig.c:743
+#: lib/rpmchecksig.c:772 lib/rpmchecksig.c:786
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:731 lib/rpmchecksig.c:745
+#: lib/rpmchecksig.c:774 lib/rpmchecksig.c:788
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:739
+#: lib/rpmchecksig.c:782
 msgid "OK"
 msgstr ""
 
@@ -2589,137 +2612,137 @@ msgstr ""
 msgid "Unable to open %s for reading: %s.\n"
 msgstr ""
 
-#: lib/signature.c:117
+#: lib/signature.c:118
 msgid "file is not regular -- skipping size check\n"
 msgstr ""
 
-#: lib/signature.c:126
+#: lib/signature.c:127
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:131
+#: lib/signature.c:132
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:151
+#: lib/signature.c:152
 msgid "No signature\n"
 msgstr ""
 
-#: lib/signature.c:155
+#: lib/signature.c:156
 msgid "Old PGP signature\n"
 msgstr ""
 
-#: lib/signature.c:168
+#: lib/signature.c:169
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr ""
 
-#: lib/signature.c:224
+#: lib/signature.c:225
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:299 lib/signature.c:397 lib/signature.c:537
-#: lib/signature.c:569
+#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:656
+#: lib/signature.c:688
 #, c-format
 msgid "Could not exec %s: %s\n"
 msgstr ""
 
-#: lib/signature.c:315
+#: lib/signature.c:322
 msgid "pgp failed\n"
 msgstr ""
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:322
+#: lib/signature.c:329
 msgid "pgp failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:327
+#: lib/signature.c:334
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:343 lib/signature.c:442
+#: lib/signature.c:350 lib/signature.c:450
 msgid "unable to read the signature\n"
 msgstr ""
 
-#: lib/signature.c:348
+#: lib/signature.c:355
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:414
+#: lib/signature.c:422
 msgid "gpg failed\n"
 msgstr ""
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:421
+#: lib/signature.c:429
 msgid "gpg failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:426
+#: lib/signature.c:434
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:447
+#: lib/signature.c:455
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:475
-msgid "Generating signature using PGP.\n"
-msgstr ""
-
-#: lib/signature.c:481
-msgid "Generating signature using GPG.\n"
-msgstr ""
-
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:574 lib/signature.c:627
+#: lib/signature.c:693 lib/signature.c:747
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:607
+#: lib/signature.c:727
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:619
+#: lib/signature.c:739
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:663
+#: lib/signature.c:783
 msgid "Header+Payload size: "
 msgstr ""
 
-#: lib/signature.c:692
+#: lib/signature.c:823
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:732
+#: lib/signature.c:880
+msgid "Header SHA1 digest: "
+msgstr ""
+
+#: lib/signature.c:1042
 msgid "V3 RSA/MD5 signature: "
 msgstr ""
 
-#: lib/signature.c:822
+#: lib/signature.c:1135
+msgid "Header "
+msgstr ""
+
+#: lib/signature.c:1136
 msgid "V3 DSA signature: "
 msgstr ""
 
-#: lib/signature.c:886
+#: lib/signature.c:1214
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:906
+#: lib/signature.c:1240
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:910
+#: lib/signature.c:1244
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
@@ -2986,155 +3009,155 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging"
 msgstr ""
 
 #. @-modfilesys@
-#: rpmdb/rpmdb.c:129
+#: rpmdb/rpmdb.c:163
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:387
+#: rpmdb/rpmdb.c:440
 #, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:409
+#: rpmdb/rpmdb.c:462
 #, c-format
 msgid "cannot open %s index\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:501
+#: rpmdb/rpmdb.c:554
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:632
+#: rpmdb/rpmdb.c:685
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:642
+#: rpmdb/rpmdb.c:695
 #, c-format
 msgid "error(%d) removing record %s from %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:906
+#: rpmdb/rpmdb.c:959
 msgid "no dbpath has been set\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1054
+#: rpmdb/rpmdb.c:1107
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database\n"
 msgstr ""
 
 #. error
-#: rpmdb/rpmdb.c:1319
+#: rpmdb/rpmdb.c:1372
 #, c-format
 msgid "error(%d) counting packages\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3372
+#: rpmdb/rpmdb.c:2150 rpmdb/rpmdb.c:3502
 #, c-format
 msgid "record number %u in database is bad -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2150
+#: rpmdb/rpmdb.c:2203
 #, c-format
 msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2420
+#: rpmdb/rpmdb.c:2473
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2540
+#: rpmdb/rpmdb.c:2634
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2544
+#: rpmdb/rpmdb.c:2638
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2714
+#: rpmdb/rpmdb.c:2808
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2873
+#: rpmdb/rpmdb.c:3003
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2877
+#: rpmdb/rpmdb.c:3007
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3258
+#: rpmdb/rpmdb.c:3388
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3291
+#: rpmdb/rpmdb.c:3421
 msgid "no dbpath has been set"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3318
+#: rpmdb/rpmdb.c:3448
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3322
+#: rpmdb/rpmdb.c:3452
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3328
+#: rpmdb/rpmdb.c:3458
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3330
+#: rpmdb/rpmdb.c:3460
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3337
+#: rpmdb/rpmdb.c:3467
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3348
+#: rpmdb/rpmdb.c:3478
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3412
+#: rpmdb/rpmdb.c:3542
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3430
+#: rpmdb/rpmdb.c:3560
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3438
+#: rpmdb/rpmdb.c:3568
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3440
+#: rpmdb/rpmdb.c:3570
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3450
+#: rpmdb/rpmdb.c:3580
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3452
+#: rpmdb/rpmdb.c:3582
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
diff --git a/po/is.po b/po/is.po
index 0076299d1..28c0d2a4f 100644
--- a/po/is.po
+++ b/po/is.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-02-10 13:58-0500\n"
+"POT-Creation-Date: 2002-03-06 18:13-0500\n"
 "PO-Revision-Date: 2001-07-12 13:25+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
@@ -189,7 +189,8 @@ msgid "RPM version %s\n"
 msgstr "RPM útgáfa %s\n"
 
 #: rpmqv.c:235
-msgid "Copyright (C) 1998-2000 - Red Hat, Inc."
+#, fuzzy
+msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
 msgstr "Höfundarréttur (C) 1998-2000 - Red Hat Inc"
 
 #: rpmqv.c:236
@@ -423,7 +424,7 @@ msgstr ""
 msgid "no arguments given"
 msgstr ""
 
-#: build/build.c:125 build/pack.c:479
+#: build/build.c:125 build/pack.c:483
 msgid "Unable to open temp file.\n"
 msgstr "Get ekki opnağ tempi skrá.\n"
 
@@ -765,7 +766,7 @@ msgstr ""
 msgid "readRPM: read %s: %s\n"
 msgstr ""
 
-#: build/pack.c:305 build/pack.c:521
+#: build/pack.c:305 build/pack.c:529
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: Fseek brást: %s\n"
@@ -780,81 +781,81 @@ msgstr ""
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:467
+#: build/pack.c:471
 #, fuzzy
 msgid "Unable to create immutable header region.\n"
 msgstr "Get ekki lesiğ haus úr %s: %s\n"
 
-#: build/pack.c:485
+#: build/pack.c:490
 #, fuzzy
 msgid "Unable to write temp header\n"
 msgstr "Gat ekki ritağ haus í %s: %s\n"
 
-#: build/pack.c:493
+#: build/pack.c:500
 msgid "Bad CSA data\n"
 msgstr ""
 
-#: build/pack.c:528
+#: build/pack.c:536
 #, fuzzy
 msgid "Unable to write final header\n"
 msgstr "Gat ekki ritağ haus í %s: %s\n"
 
-#: build/pack.c:546
+#: build/pack.c:556
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr ""
 
-#: build/pack.c:559
+#: build/pack.c:574
 #, fuzzy
 msgid "Unable to reload signature header.\n"
 msgstr "Get ekki lesiğ haus úr %s: %s\n"
 
-#: build/pack.c:567
+#: build/pack.c:582
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:603 lib/psm.c:1444
+#: build/pack.c:618 lib/psm.c:1444
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Get ekki ritağ í pakka: %s\n"
 
-#: build/pack.c:618
+#: build/pack.c:633
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "Get ekki opnağ sigtarget %s: %s\n"
 
-#: build/pack.c:628
+#: build/pack.c:644
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "Get ekki lesiğ haus úr %s: %s\n"
 
-#: build/pack.c:642
+#: build/pack.c:658
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "Gat ekki ritağ haus í %s: %s\n"
 
-#: build/pack.c:652
+#: build/pack.c:668
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "Get ekki lesiğ innihald %s: %s\n"
 
-#: build/pack.c:658
+#: build/pack.c:674
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Get ekki ritağ innihald í %s: %s\n"
 
-#: build/pack.c:683 lib/psm.c:1725
+#: build/pack.c:699 lib/psm.c:1725
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Skrifaği: %s\n"
 
-#: build/pack.c:750
+#: build/pack.c:766
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:767
+#: build/pack.c:783
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr ""
@@ -1588,41 +1589,51 @@ msgstr "%s búiğ til sem %s\n"
 msgid "error creating temporary file %s\n"
 msgstr ""
 
-#: lib/package.c:167 lib/package.c:238
+#: lib/package.c:179 lib/package.c:255
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:188 lib/package.c:246
+#: lib/package.c:200 lib/package.c:263
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:224 lib/rpmchecksig.c:156 lib/rpmchecksig.c:522
+#: lib/package.c:241 lib/rpmchecksig.c:161 lib/rpmchecksig.c:541
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
 
-#: lib/package.c:230
+#: lib/package.c:247
 #, c-format
 msgid "%s: bad magic\n"
 msgstr ""
 
-#: lib/package.c:254 lib/rpmchecksig.c:174 lib/rpmchecksig.c:538
+#: lib/package.c:272 lib/rpmchecksig.c:179 lib/rpmchecksig.c:557
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/package.c:258 lib/rpmchecksig.c:178 lib/rpmchecksig.c:543
+#: lib/package.c:276 lib/rpmchecksig.c:183 lib/rpmchecksig.c:562
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/package.c:284
+#: lib/package.c:304 lib/rpmchecksig.c:462
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: Fseek brást: %s\n"
 
-#: lib/package.c:303 lib/rpmchecksig.c:107 lib/rpmchecksig.c:466
+#. Parse the parameters from the OpenPGP packets that will be needed.
+#: lib/package.c:334 lib/rpmchecksig.c:631
+msgid "========== Header DSA signature\n"
+msgstr ""
+
+#. Parse the parameters from the OpenPGP packets that will be needed.
+#: lib/package.c:357
+msgid "========== Package DSA/RSA signature\n"
+msgstr ""
+
+#: lib/package.c:366 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr ""
@@ -2335,66 +2346,79 @@ msgstr ""
 msgid "(added provide)"
 msgstr ""
 
-#: lib/rpmchecksig.c:49
+#: lib/rpmchecksig.c:51
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:61
+#: lib/rpmchecksig.c:63
 msgid "makeTempFile failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:101
+#: lib/rpmchecksig.c:104
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:161
+#: lib/rpmchecksig.c:166
 #, c-format
-msgid "%s: Can't sign v1.0 RPM\n"
+msgid "%s: Can't sign v1 packaging\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:165
+#: lib/rpmchecksig.c:170
 #, c-format
-msgid "%s: Can't re-sign v2.0 RPM\n"
+msgid "%s: Can't re-sign v2 packaging\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:229
+#: lib/rpmchecksig.c:239
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:235
+#: lib/rpmchecksig.c:245
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:528
+#: lib/rpmchecksig.c:476
+#, fuzzy, c-format
+msgid "%s: headerGetEntry failed\n"
+msgstr "%s: Fseek brást: %s\n"
+
+#: lib/rpmchecksig.c:547
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:725
+#: lib/rpmchecksig.c:618
+msgid "========== Package RSA signature\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:637
+msgid "========== Package DSA signature\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:768
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:726 lib/rpmchecksig.c:740
+#: lib/rpmchecksig.c:769 lib/rpmchecksig.c:783
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:728 lib/rpmchecksig.c:742
+#: lib/rpmchecksig.c:771 lib/rpmchecksig.c:785
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:729 lib/rpmchecksig.c:743
+#: lib/rpmchecksig.c:772 lib/rpmchecksig.c:786
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:731 lib/rpmchecksig.c:745
+#: lib/rpmchecksig.c:774 lib/rpmchecksig.c:788
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:739
+#: lib/rpmchecksig.c:782
 msgid "OK"
 msgstr ""
 
@@ -2604,137 +2628,137 @@ msgstr ""
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "Get ekki opnağ %s til lesturs: %s.\n"
 
-#: lib/signature.c:117
+#: lib/signature.c:118
 msgid "file is not regular -- skipping size check\n"
 msgstr ""
 
-#: lib/signature.c:126
+#: lib/signature.c:127
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:131
+#: lib/signature.c:132
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:151
+#: lib/signature.c:152
 msgid "No signature\n"
 msgstr ""
 
-#: lib/signature.c:155
+#: lib/signature.c:156
 msgid "Old PGP signature\n"
 msgstr ""
 
-#: lib/signature.c:168
+#: lib/signature.c:169
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr ""
 
-#: lib/signature.c:224
+#: lib/signature.c:225
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:299 lib/signature.c:397 lib/signature.c:537
-#: lib/signature.c:569
+#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:656
+#: lib/signature.c:688
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "Gat ekki keyrt %s: %s\n"
 
-#: lib/signature.c:315
+#: lib/signature.c:322
 msgid "pgp failed\n"
 msgstr "pgp brást\n"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:322
+#: lib/signature.c:329
 msgid "pgp failed to write signature\n"
 msgstr "pgp gat ekki lesiğ undirskriftina\n"
 
-#: lib/signature.c:327
+#: lib/signature.c:334
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:343 lib/signature.c:442
+#: lib/signature.c:350 lib/signature.c:450
 msgid "unable to read the signature\n"
 msgstr "get ekki lesiğ undirskriftina\n"
 
-#: lib/signature.c:348
+#: lib/signature.c:355
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:414
+#: lib/signature.c:422
 msgid "gpg failed\n"
 msgstr "ggp brást\n"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:421
+#: lib/signature.c:429
 msgid "gpg failed to write signature\n"
 msgstr "gpg get ekki lesiğ undirskriftina\n"
 
-#: lib/signature.c:426
+#: lib/signature.c:434
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:447
+#: lib/signature.c:455
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:475
-msgid "Generating signature using PGP.\n"
-msgstr ""
-
-#: lib/signature.c:481
-msgid "Generating signature using GPG.\n"
-msgstr ""
-
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:574 lib/signature.c:627
+#: lib/signature.c:693 lib/signature.c:747
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:607
+#: lib/signature.c:727
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:619
+#: lib/signature.c:739
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:663
+#: lib/signature.c:783
 msgid "Header+Payload size: "
 msgstr ""
 
-#: lib/signature.c:692
+#: lib/signature.c:823
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:732
+#: lib/signature.c:880
+msgid "Header SHA1 digest: "
+msgstr ""
+
+#: lib/signature.c:1042
 msgid "V3 RSA/MD5 signature: "
 msgstr ""
 
-#: lib/signature.c:822
+#: lib/signature.c:1135
+msgid "Header "
+msgstr ""
+
+#: lib/signature.c:1136
 msgid "V3 DSA signature: "
 msgstr ""
 
-#: lib/signature.c:886
+#: lib/signature.c:1214
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:906
+#: lib/signature.c:1240
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:910
+#: lib/signature.c:1244
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
@@ -3001,155 +3025,155 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging"
 msgstr ""
 
 #. @-modfilesys@
-#: rpmdb/rpmdb.c:129
+#: rpmdb/rpmdb.c:163
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:387
+#: rpmdb/rpmdb.c:440
 #, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr "get ekki opnağ %s index meğ db%d - %s (%d)\n"
 
-#: rpmdb/rpmdb.c:409
+#: rpmdb/rpmdb.c:462
 #, c-format
 msgid "cannot open %s index\n"
 msgstr "get ekki opnağ %s index\n"
 
-#: rpmdb/rpmdb.c:501
+#: rpmdb/rpmdb.c:554
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:632
+#: rpmdb/rpmdb.c:685
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:642
+#: rpmdb/rpmdb.c:695
 #, c-format
 msgid "error(%d) removing record %s from %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:906
+#: rpmdb/rpmdb.c:959
 msgid "no dbpath has been set\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1054
+#: rpmdb/rpmdb.c:1107
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database\n"
 msgstr ""
 
 #. error
-#: rpmdb/rpmdb.c:1319
+#: rpmdb/rpmdb.c:1372
 #, c-format
 msgid "error(%d) counting packages\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3372
+#: rpmdb/rpmdb.c:2150 rpmdb/rpmdb.c:3502
 #, c-format
 msgid "record number %u in database is bad -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2150
+#: rpmdb/rpmdb.c:2203
 #, c-format
 msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2420
+#: rpmdb/rpmdb.c:2473
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2540
+#: rpmdb/rpmdb.c:2634
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2544
+#: rpmdb/rpmdb.c:2638
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2714
+#: rpmdb/rpmdb.c:2808
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2873
+#: rpmdb/rpmdb.c:3003
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2877
+#: rpmdb/rpmdb.c:3007
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3258
+#: rpmdb/rpmdb.c:3388
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3291
+#: rpmdb/rpmdb.c:3421
 msgid "no dbpath has been set"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3318
+#: rpmdb/rpmdb.c:3448
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3322
+#: rpmdb/rpmdb.c:3452
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3328
+#: rpmdb/rpmdb.c:3458
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3330
+#: rpmdb/rpmdb.c:3460
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3337
+#: rpmdb/rpmdb.c:3467
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3348
+#: rpmdb/rpmdb.c:3478
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3412
+#: rpmdb/rpmdb.c:3542
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3430
+#: rpmdb/rpmdb.c:3560
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3438
+#: rpmdb/rpmdb.c:3568
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3440
+#: rpmdb/rpmdb.c:3570
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3450
+#: rpmdb/rpmdb.c:3580
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3452
+#: rpmdb/rpmdb.c:3582
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
diff --git a/po/ja.po b/po/ja.po
index 54e02695c..cd392345a 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-02-10 13:58-0500\n"
+"POT-Creation-Date: 2002-03-06 18:13-0500\n"
 "PO-Revision-Date: 1999-12-01 22:49 +JST\n"
 "Last-Translator: Kanda Mitsuru <kanda@nn.iij4u.or.jp>\n"
 "Language-Team: JRPM <jrpm@linux.or.jp>\n"
@@ -200,7 +200,7 @@ msgstr "RPM ¥Ğ¡¼¥¸¥ç¥ó %s\n"
 
 #: rpmqv.c:235
 #, fuzzy
-msgid "Copyright (C) 1998-2000 - Red Hat, Inc."
+msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
 msgstr ""
 "Ãøºî¸¢ (C) 1998 - Red Hat Software\n"
 "ËİÌõ¼Ô ¿ÀÅÄ ½¼ <kanda@nn.iij4u.or.jp>\n"
@@ -457,7 +457,7 @@ msgstr "--querytags ¤Î°ú¿ô¤¬´Ö°ã¤Ã¤Æ¤¤¤Ş¤¹"
 msgid "no arguments given"
 msgstr "Ì䤤¹ç¤ï¤»¤Î¤¿¤á¤Î°ú¿ô¤¬¤¢¤ê¤Ş¤»¤ó"
 
-#: build/build.c:125 build/pack.c:479
+#: build/build.c:125 build/pack.c:483
 #, fuzzy
 msgid "Unable to open temp file.\n"
 msgstr "°ì»ş¥Õ¥¡¥¤¥ë¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Ş¤»¤ó"
@@ -812,7 +812,7 @@ msgstr "readRPM: %s ¤Î¥ª¡¼¥×¥ó: %s\n"
 msgid "readRPM: read %s: %s\n"
 msgstr "readRPM: %s ¤ÎÆɤ߹ş¤ß: %s\n"
 
-#: build/pack.c:305 build/pack.c:521
+#: build/pack.c:305 build/pack.c:529
 #, fuzzy, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: Fread ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿: %s\n"
@@ -827,82 +827,82 @@ msgstr "readRPM: %s ¤Ï RPM ¥Ñ¥Ã¥±¡¼¥¸¤Ç¤Ï¤¢¤ê¤Ş¤»¤ó\n"
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: %s ¤«¤é¤Î¥Ø¥Ã¥À¤ÎÆɤ߹ş¤ß\n"
 
-#: build/pack.c:467
+#: build/pack.c:471
 #, fuzzy
 msgid "Unable to create immutable header region.\n"
 msgstr "¥¢¥¤¥³¥ó¤òÆɤळ¤È¤¬¤Ç¤­¤Ş¤»¤ó: %s"
 
-#: build/pack.c:485
+#: build/pack.c:490
 #, fuzzy
 msgid "Unable to write temp header\n"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Î½ñ¤­¹ş¤ß¤Ë¼ºÇÔ¤·¤Ş¤·¤¿: %s"
 
-#: build/pack.c:493
+#: build/pack.c:500
 #, fuzzy
 msgid "Bad CSA data\n"
 msgstr "ÉÔÀµ¤Ê CSA ¥Ç¡¼¥¿"
 
-#: build/pack.c:528
+#: build/pack.c:536
 #, fuzzy
 msgid "Unable to write final header\n"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Î½ñ¤­¹ş¤ß¤Ë¼ºÇÔ¤·¤Ş¤·¤¿: %s"
 
-#: build/pack.c:546
+#: build/pack.c:556
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "½ğ̾¤ÎÀ¸À®Ãæ: %d\n"
 
-#: build/pack.c:559
+#: build/pack.c:574
 #, fuzzy
 msgid "Unable to reload signature header.\n"
 msgstr "¥¢¥¤¥³¥ó¤òÆɤळ¤È¤¬¤Ç¤­¤Ş¤»¤ó: %s"
 
-#: build/pack.c:567
+#: build/pack.c:582
 #, fuzzy, c-format
 msgid "Could not open %s: %s\n"
 msgstr "%s ¤Î¥ª¡¼¥×¥ó¤Ë¼ºÇÔ¤·¤Ş¤·¤¿\n"
 
-#: build/pack.c:603 lib/psm.c:1444
+#: build/pack.c:618 lib/psm.c:1444
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Î½ñ¤­¹ş¤ß¤Ë¼ºÇÔ¤·¤Ş¤·¤¿: %s"
 
-#: build/pack.c:618
+#: build/pack.c:633
 #, fuzzy, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "sigtarget ¤ÎÆɤ߹ş¤ß¤¬¤Ç¤­¤Ş¤»¤ó¤Ç¤·¤¿: %s"
 
-#: build/pack.c:628
+#: build/pack.c:644
 #, fuzzy, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "¥¢¥¤¥³¥ó¤òÆɤळ¤È¤¬¤Ç¤­¤Ş¤»¤ó: %s"
 
-#: build/pack.c:642
+#: build/pack.c:658
 #, fuzzy, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Î½ñ¤­¹ş¤ß¤Ë¼ºÇÔ¤·¤Ş¤·¤¿: %s"
 
-#: build/pack.c:652
+#: build/pack.c:668
 #, fuzzy, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "¥¢¥¤¥³¥ó¤òÆɤळ¤È¤¬¤Ç¤­¤Ş¤»¤ó: %s"
 
-#: build/pack.c:658
+#: build/pack.c:674
 #, fuzzy, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸¤Î½ñ¤­¹ş¤ß¤Ë¼ºÇÔ¤·¤Ş¤·¤¿: %s"
 
-#: build/pack.c:683 lib/psm.c:1725
+#: build/pack.c:699 lib/psm.c:1725
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "½ñ¤­¹ş¤ßÃæ: %s\n"
 
-#: build/pack.c:750
+#: build/pack.c:766
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Î ½ĞÎÏ¥Õ¥¡¥¤¥ë̾¤òÀ¸À®¤Ç¤­¤Ş¤»¤ó¤Ç¤·¤¿: %s\n"
 
-#: build/pack.c:767
+#: build/pack.c:783
 #, fuzzy, c-format
 msgid "cannot create %s: %s\n"
 msgstr "%s ¤òºîÀ®¤Ç¤­¤Ş¤»¤ó: %s\n"
@@ -1668,45 +1668,56 @@ msgstr "·Ù¹ğ: %s ¤Ï %s ¤È¤·¤ÆºîÀ®¤µ¤ì¤Ş¤¹"
 msgid "error creating temporary file %s\n"
 msgstr "°ì»ş¥Õ¥¡¥¤¥ë %s ¤ÎºîÀ®¥¨¥é¡¼"
 
-#: lib/package.c:167 lib/package.c:238
+#: lib/package.c:179 lib/package.c:255
 #, fuzzy
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr ""
 "¥á¥¸¥ã¡¼ÈÖ¹æ <=3 ¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î¤ß¤³¤Î¥Ğ¡¼¥¸¥ç¥ó¤Î RPM ¤Ï¥µ¥İ¡¼¥È¤µ¤ì¤Æ¤¤¤Ş¤¹"
 
-#: lib/package.c:188 lib/package.c:246
+#: lib/package.c:200 lib/package.c:263
 #, fuzzy
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 "¥á¥¸¥ã¡¼ÈÖ¹æ <=3 ¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î¤ß¤³¤Î¥Ğ¡¼¥¸¥ç¥ó¤Î RPM ¤Ï¥µ¥İ¡¼¥È¤µ¤ì¤Æ¤¤¤Ş¤¹"
 
-#: lib/package.c:224 lib/rpmchecksig.c:156 lib/rpmchecksig.c:522
+#: lib/package.c:241 lib/rpmchecksig.c:161 lib/rpmchecksig.c:541
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: readLead ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿\n"
 
-#: lib/package.c:230
+#: lib/package.c:247
 #, fuzzy, c-format
 msgid "%s: bad magic\n"
 msgstr "ÉÔÀµ¤Ê¥Ş¥¸¥Ã¥¯"
 
-#: lib/package.c:254 lib/rpmchecksig.c:174 lib/rpmchecksig.c:538
+#: lib/package.c:272 lib/rpmchecksig.c:179 lib/rpmchecksig.c:557
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: rpmReadSignature ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿\n"
 
-#: lib/package.c:258 lib/rpmchecksig.c:178 lib/rpmchecksig.c:543
+#: lib/package.c:276 lib/rpmchecksig.c:183 lib/rpmchecksig.c:562
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Í­¸ú¤Ê½ğ̾¤Ï¤¢¤ê¤Ş¤»¤ó\n"
 
-#: lib/package.c:284
+#: lib/package.c:304 lib/rpmchecksig.c:462
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: readLead ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿\n"
 
-#: lib/package.c:303 lib/rpmchecksig.c:107 lib/rpmchecksig.c:466
+#. Parse the parameters from the OpenPGP packets that will be needed.
+#: lib/package.c:334 lib/rpmchecksig.c:631
+#, fuzzy
+msgid "========== Header DSA signature\n"
+msgstr "¿·¤·¤¤¥Ø¥Ã¥À½ğ̾\n"
+
+#. Parse the parameters from the OpenPGP packets that will be needed.
+#: lib/package.c:357
+msgid "========== Package DSA/RSA signature\n"
+msgstr ""
+
+#: lib/package.c:366 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
 #, fuzzy, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Fread ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿: %s\n"
@@ -2494,68 +2505,81 @@ msgstr "ÉÔÀµ¤Ê¥Õ¥¡¥¤¥ë¤Î¾õÂÖ: %s"
 msgid "(added provide)"
 msgstr "%s: %s ¤Ï db ¤¬Ä󶡤¹¤ë¤³¤È¤Ë¤è¤Ã¤ÆËş¤µ¤ì¤Ş¤¹¡£\n"
 
-#: lib/rpmchecksig.c:49
+#: lib/rpmchecksig.c:51
 #, fuzzy, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s: fdOpen ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿: %s\n"
 
-#: lib/rpmchecksig.c:61
+#: lib/rpmchecksig.c:63
 #, fuzzy
 msgid "makeTempFile failed\n"
 msgstr "makeTempFile ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿\n"
 
-#: lib/rpmchecksig.c:101
+#: lib/rpmchecksig.c:104
 #, fuzzy, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: Fwrite ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿: %s\n"
 
-#: lib/rpmchecksig.c:161
-#, c-format
-msgid "%s: Can't sign v1.0 RPM\n"
+#: lib/rpmchecksig.c:166
+#, fuzzy, c-format
+msgid "%s: Can't sign v1 packaging\n"
 msgstr "%s: v1.0 ¤Î RPM ¤Ë¤Ï½ğ̾¤Ç¤­¤Ş¤»¤ó\n"
 
-#: lib/rpmchecksig.c:165
-#, c-format
-msgid "%s: Can't re-sign v2.0 RPM\n"
+#: lib/rpmchecksig.c:170
+#, fuzzy, c-format
+msgid "%s: Can't re-sign v2 packaging\n"
 msgstr "%s: v2.0 ¤Î RPM ¤Ë¤ÏºÆ½ğ̾¤Ç¤­¤Ş¤»¤ó\n"
 
-#: lib/rpmchecksig.c:229
+#: lib/rpmchecksig.c:239
 #, fuzzy, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: writedLead ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿: %s\n"
 
-#: lib/rpmchecksig.c:235
+#: lib/rpmchecksig.c:245
 #, fuzzy, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmWriteSignature ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿\n"
 
-#: lib/rpmchecksig.c:528
+#: lib/rpmchecksig.c:476
+#, fuzzy, c-format
+msgid "%s: headerGetEntry failed\n"
+msgstr "%s: readLead ¤Ë¼ºÇÔ¤·¤Ş¤·¤¿\n"
+
+#: lib/rpmchecksig.c:547
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: Í­¸ú¤Ê½ğ̾¤Ï¤¢¤ê¤Ş¤»¤ó(v1.0 RPM)\n"
 
-#: lib/rpmchecksig.c:725
+#: lib/rpmchecksig.c:618
+msgid "========== Package RSA signature\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:637
+msgid "========== Package DSA signature\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:768
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:726 lib/rpmchecksig.c:740
+#: lib/rpmchecksig.c:769 lib/rpmchecksig.c:783
 #, fuzzy
 msgid " (MISSING KEYS:"
 msgstr " (¥­¡¼¤Îʶ¼º) "
 
-#: lib/rpmchecksig.c:728 lib/rpmchecksig.c:742
+#: lib/rpmchecksig.c:771 lib/rpmchecksig.c:785
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:729 lib/rpmchecksig.c:743
+#: lib/rpmchecksig.c:772 lib/rpmchecksig.c:786
 msgid " (UNTRUSTED KEYS:"
 msgstr " (¿®Íê¤Ç¤­¤Ê¤¤¸°:"
 
-#: lib/rpmchecksig.c:731 lib/rpmchecksig.c:745
+#: lib/rpmchecksig.c:774 lib/rpmchecksig.c:788
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:739
+#: lib/rpmchecksig.c:782
 msgid "OK"
 msgstr ""
 
@@ -2768,149 +2792,147 @@ msgstr ""
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "Æɤ߹ş¤à¤¿¤á¤Ë %s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Ş¤»¤ó: %s¡£"
 
-#: lib/signature.c:117
+#: lib/signature.c:118
 msgid "file is not regular -- skipping size check\n"
 msgstr ""
 "¥Õ¥¡¥¤¥ë¤Ï°ìÈ̤Υե¡¥¤¥ë¤Ç¤Ï¤¢¤ê¤Ş¤»¤ó -- ¥µ¥¤¥º¥Á¥§¥Ã¥¯¤ò¥¹¥­¥Ã¥×¤·¤Ş¤¹\n"
 
-#: lib/signature.c:126
+#: lib/signature.c:127
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:131
+#: lib/signature.c:132
 #, fuzzy, c-format
 msgid "  Actual size: %12d\n"
 msgstr "½ğ̾¥µ¥¤¥º: %d\n"
 
-#: lib/signature.c:151
+#: lib/signature.c:152
 msgid "No signature\n"
 msgstr "½ğ̾¤Ï¤¢¤ê¤Ş¤»¤ó\n"
 
-#: lib/signature.c:155
+#: lib/signature.c:156
 msgid "Old PGP signature\n"
 msgstr "¸Å¤¤ PGP ½ğ̾\n"
 
-#: lib/signature.c:168
+#: lib/signature.c:169
 #, fuzzy
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr "¸Å¤¤(ÆâÉô¤À¤±¤Î)½ğ̾!  ¤É¤¦¤ä¤Ã¤Æ¤½¤ì¤ò¼ê¤Ë¤¤¤ì¤Ş¤·¤¿¤«!?"
 
-#: lib/signature.c:224
+#: lib/signature.c:225
 #, fuzzy, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "½ğ̾¥µ¥¤¥º: %d\n"
 
-#: lib/signature.c:299 lib/signature.c:397 lib/signature.c:537
-#: lib/signature.c:569
+#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:656
+#: lib/signature.c:688
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "%s ¤ò¼Â¹Ô¤Ç¤­¤Ş¤»¤ó¤Ç¤·¤¿: %s"
 
-#: lib/signature.c:315
+#: lib/signature.c:322
 #, fuzzy
 msgid "pgp failed\n"
 msgstr "pgp ¼ºÇÔ"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:322
+#: lib/signature.c:329
 #, fuzzy
 msgid "pgp failed to write signature\n"
 msgstr "pgp ¤¬½ğ̾¤ò½ñ¤­¹ş¤à¤Î¤Ë¼ºÇÔ¤·¤Ş¤·¤¿"
 
-#: lib/signature.c:327
+#: lib/signature.c:334
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr "PGP ½ğ̾¥µ¥¤¥º: %s\n"
 
-#: lib/signature.c:343 lib/signature.c:442
+#: lib/signature.c:350 lib/signature.c:450
 #, fuzzy
 msgid "unable to read the signature\n"
 msgstr "½ğ̾¤òÆɤळ¤È¤¬¤Ç¤­¤Ş¤»¤ó"
 
-#: lib/signature.c:348
+#: lib/signature.c:355
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr "PGP ½ğ̾¤Î %d ¥Ğ¥¤¥È¤ò¼èÆÀ\n"
 
-#: lib/signature.c:414
+#: lib/signature.c:422
 #, fuzzy
 msgid "gpg failed\n"
 msgstr "gpg ¼ºÇÔ"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:421
+#: lib/signature.c:429
 #, fuzzy
 msgid "gpg failed to write signature\n"
 msgstr "gpg ¤¬½ğ̾¤ò½ñ¤­¹ş¤à¤Î¤Ë¼ºÇÔ¤·¤Ş¤·¤¿"
 
-#: lib/signature.c:426
+#: lib/signature.c:434
 #, fuzzy, c-format
 msgid "GPG sig size: %d\n"
 msgstr "GPG ½ğ̾¥µ¥¤¥º: %s\n"
 
-#: lib/signature.c:447
+#: lib/signature.c:455
 #, fuzzy, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr "GPG ½ğ̾¤Î %d ¥Ğ¥¤¥È¤ò¼èÆÀ\n"
 
-#: lib/signature.c:475
-#, fuzzy
-msgid "Generating signature using PGP.\n"
-msgstr "PGP ¤ò»ÈÍѤ·¤Æ½ğ̾¤ÎÀ¸À®Ãæ\n"
-
-#: lib/signature.c:481
-#, fuzzy
-msgid "Generating signature using GPG.\n"
-msgstr "GPG ¤ò»ÈÍѤ·¤Æ½ğ̾¤ÎÀ¸À®Ãæ\n"
-
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:574 lib/signature.c:627
+#: lib/signature.c:693 lib/signature.c:747
 #, fuzzy, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "¥Ş¥¯¥í¥Õ¥¡¥¤¥ëÃæ¤Î̵¸ú¤Ê %%_signature ¡£\n"
 
-#: lib/signature.c:607
+#: lib/signature.c:727
 #, fuzzy, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "¥Ş¥¯¥í¥Õ¥¡¥¤¥ë¤Ë \"%%_pgp_name\" ¤òÀßÄꤷ¤Ê¤±¤ì¤Ğ¤Ê¤ê¤Ş¤»¤ó"
 
-#: lib/signature.c:619
+#: lib/signature.c:739
 #, fuzzy, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "¥Ş¥¯¥í¥Õ¥¡¥¤¥ë¤Ë \"%%_pgp_name\" ¤òÀßÄꤷ¤Ê¤±¤ì¤Ğ¤Ê¤ê¤Ş¤»¤ó"
 
-#: lib/signature.c:663
+#: lib/signature.c:783
 #, fuzzy
 msgid "Header+Payload size: "
 msgstr "¥Ø¥Ã¥À¥µ¥¤¥º¤¬Â礭¤¹¤®¤Ş¤¹"
 
-#: lib/signature.c:692
+#: lib/signature.c:823
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:732
+#: lib/signature.c:880
+msgid "Header SHA1 digest: "
+msgstr ""
+
+#: lib/signature.c:1042
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "MD5 ½ğ̾¤ò¥¹¥­¥Ã¥×¤·¤Ş¤¹"
 
-#: lib/signature.c:822
+#: lib/signature.c:1135
+msgid "Header "
+msgstr ""
+
+#: lib/signature.c:1136
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "½ğ̾¤Ï¤¢¤ê¤Ş¤»¤ó\n"
 
-#: lib/signature.c:886
+#: lib/signature.c:1214
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:906
+#: lib/signature.c:1240
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:910
+#: lib/signature.c:1244
 #, fuzzy, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "½ğ̾¥Ñ¥Ã¥É: %d\n"
@@ -3191,158 +3213,158 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging"
 msgstr ""
 
 #. @-modfilesys@
-#: rpmdb/rpmdb.c:129
+#: rpmdb/rpmdb.c:163
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:387
+#: rpmdb/rpmdb.c:440
 #, fuzzy, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr "%s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Ş¤»¤ó  %s:%d"
 
-#: rpmdb/rpmdb.c:409
+#: rpmdb/rpmdb.c:462
 #, fuzzy, c-format
 msgid "cannot open %s index\n"
 msgstr "%s ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Ş¤»¤ó\n"
 
-#: rpmdb/rpmdb.c:501
+#: rpmdb/rpmdb.c:554
 #, fuzzy, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "¥ì¥³¡¼¥É %s ¤Î¼èÆÀ¤Î¥¨¥é¡¼ (%s ¤«¤é)"
 
-#: rpmdb/rpmdb.c:632
+#: rpmdb/rpmdb.c:685
 #, fuzzy, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "¥ì¥³¡¼¥É %s ¤ò %s ¤Ë¥¹¥È¥¢¤Ç¥¨¥é¡¼ "
 
-#: rpmdb/rpmdb.c:642
+#: rpmdb/rpmdb.c:695
 #, fuzzy, c-format
 msgid "error(%d) removing record %s from %s\n"
 msgstr "¥ì¥³¡¼¥É %s ¤ò %s ¤Ëºï½ü¤Ç¥¨¥é¡¼"
 
-#: rpmdb/rpmdb.c:906
+#: rpmdb/rpmdb.c:959
 #, fuzzy
 msgid "no dbpath has been set\n"
 msgstr "dbpath ¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Ş¤»¤ó"
 
-#: rpmdb/rpmdb.c:1054
+#: rpmdb/rpmdb.c:1107
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database\n"
 msgstr ""
 
 #. error
-#: rpmdb/rpmdb.c:1319
+#: rpmdb/rpmdb.c:1372
 #, fuzzy, c-format
 msgid "error(%d) counting packages\n"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Îõº÷¥¨¥é¡¼\n"
 
-#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3372
+#: rpmdb/rpmdb.c:2150 rpmdb/rpmdb.c:3502
 #, fuzzy, c-format
 msgid "record number %u in database is bad -- skipping.\n"
 msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹Ãæ¤Î¥ì¥³¡¼¥ÉÈÖ¹æ %d ¤ÏÉÔÀµ¤Ç¤¹ -- ¥¹¥­¥Ã¥×¤·¤Ş¤¹"
 
-#: rpmdb/rpmdb.c:2150
+#: rpmdb/rpmdb.c:2203
 #, c-format
 msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2420
+#: rpmdb/rpmdb.c:2473
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "¸¡º÷¤Î¤¿¤á¤Î %d ¤Ç ¥Ø¥Ã¥À¤òÆɤळ¤È¤¬¤Ç¤­¤Ş¤»¤ó"
 
-#: rpmdb/rpmdb.c:2540
+#: rpmdb/rpmdb.c:2634
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "group ¥¤¥ó¥Ç¥Ã¥¯¥¹¤òºï½ü¤·¤Ş¤¹\n"
 
-#: rpmdb/rpmdb.c:2544
+#: rpmdb/rpmdb.c:2638
 #, fuzzy, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "name ¥¤¥ó¥Ç¥Ã¥¯¥¹ºï½ü¤·¤Ş¤¹\n"
 
-#: rpmdb/rpmdb.c:2714
+#: rpmdb/rpmdb.c:2808
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "¥Ñ¥Ã¥±¡¼¥¸ %s ¤Îõº÷¥¨¥é¡¼\n"
 
-#: rpmdb/rpmdb.c:2873
+#: rpmdb/rpmdb.c:3003
 #, fuzzy, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "%s ¤ò %s ¤Ø̾Á°¤òÊѹ¹¤·¤Ş¤¹\n"
 
-#: rpmdb/rpmdb.c:2877
+#: rpmdb/rpmdb.c:3007
 #, fuzzy, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "%s ¤ò %s ¤Ø̾Á°¤òÊѹ¹¤·¤Ş¤¹\n"
 
-#: rpmdb/rpmdb.c:3258
+#: rpmdb/rpmdb.c:3388
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3291
+#: rpmdb/rpmdb.c:3421
 msgid "no dbpath has been set"
 msgstr "dbpath ¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Ş¤»¤ó"
 
-#: rpmdb/rpmdb.c:3318
+#: rpmdb/rpmdb.c:3448
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "rootdir %s Ãæ¤Ç¥Ç¡¼¥¿¥Ù¡¼¥¹¤òºÆ¹½ÃÛ¤·¤Ş¤¹\n"
 
-#: rpmdb/rpmdb.c:3322
+#: rpmdb/rpmdb.c:3452
 #, fuzzy, c-format
 msgid "temporary database %s already exists\n"
 msgstr "°ì»şÅª¤Ê¥Ç¡¼¥¿¥Ù¡¼¥¹ %s ¤Ï¤¹¤Ç¤Ë¸ºß¤·¤Æ¤¤¤Ş¤¹"
 
-#: rpmdb/rpmdb.c:3328
+#: rpmdb/rpmdb.c:3458
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ÎºîÀ®: %s\n"
 
-#: rpmdb/rpmdb.c:3330
+#: rpmdb/rpmdb.c:3460
 #, fuzzy, c-format
 msgid "creating directory %s: %s\n"
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ÎºîÀ®: %s\n"
 
-#: rpmdb/rpmdb.c:3337
+#: rpmdb/rpmdb.c:3467
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "¸Å¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥ª¡¼¥×¥ó\n"
 
-#: rpmdb/rpmdb.c:3348
+#: rpmdb/rpmdb.c:3478
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "¿·¤·¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤Î¥ª¡¼¥×¥ó\n"
 
-#: rpmdb/rpmdb.c:3412
+#: rpmdb/rpmdb.c:3542
 #, fuzzy, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "%d ¤Ë ¥ª¥ê¥¸¥Ê¥ë¤Î¥ì¥³¡¼¥É¤òÉղäǤ­¤Ş¤»¤ó"
 
-#: rpmdb/rpmdb.c:3430
+#: rpmdb/rpmdb.c:3560
 #, fuzzy
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 "¥Ç¡¼¥¿¥Ù¡¼¥¹¤ÎºÆ¹½Ãۤ˼ºÇÔ; ¥ª¥ê¥¸¥Ê¥ë¥Ç¡¼¥¿¥Ù¡¼¥¹¤¬¤Ş¤À¤½¤³¤Ë»Ä¤Ã¤Æ¤¤¤Ş¤¹\n"
 
-#: rpmdb/rpmdb.c:3438
+#: rpmdb/rpmdb.c:3568
 msgid "failed to replace old database with new database!\n"
 msgstr "¸Å¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò¿·¤·¤¤¥Ç¡¼¥¿¥Ù¡¼¥¹¤ËÃÖ¤­´¹¤¨¤ë¤Î¤Ë¼ºÇÔ!\n"
 
-#: rpmdb/rpmdb.c:3440
+#: rpmdb/rpmdb.c:3570
 #, fuzzy, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "%s Ãæ¤Î¥Õ¥¡¥¤¥ë¤ò¥ê¥«¥Ğ¡¼¤¹¤ë¤¿¤á¤Ë %s ¤«¤é¥Õ¥¡¥¤¥ë¤ÈÃÖ¤­´¹¤¨¤Ş¤¹"
 
-#: rpmdb/rpmdb.c:3450
+#: rpmdb/rpmdb.c:3580
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ÎºîÀ®: %s\n"
 
-#: rpmdb/rpmdb.c:3452
+#: rpmdb/rpmdb.c:3582
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤Îºï½ü¼ºÇÔ: %s\n"
@@ -3566,6 +3588,14 @@ msgstr "url ¥İ¡¼¥È¤Ï¿ô»ú¤Ç¤Ê¤±¤ì¤Ğ¤Ê¤ê¤Ş¤»¤ó\n"
 msgid "failed to create %s: %s\n"
 msgstr "%s ¤ÎºîÀ®¤Ë¼ºÇÔ¤·¤Ş¤·¤¿\n"
 
+#, fuzzy
+#~ msgid "Generating signature using PGP.\n"
+#~ msgstr "PGP ¤ò»ÈÍѤ·¤Æ½ğ̾¤ÎÀ¸À®Ãæ\n"
+
+#, fuzzy
+#~ msgid "Generating signature using GPG.\n"
+#~ msgstr "GPG ¤ò»ÈÍѤ·¤Æ½ğ̾¤ÎÀ¸À®Ãæ\n"
+
 #~ msgid "no packages given for uninstall"
 #~ msgstr "¥¢¥ó¥¤¥ó¥¹¥È¡¼¥ë¤Î¤¿¤á¤Î¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Ş¤»¤ó"
 
@@ -4222,9 +4252,6 @@ msgstr "%s ¤ÎºîÀ®¤Ë¼ºÇÔ¤·¤Ş¤·¤¿\n"
 #~ msgid "expected size   : %d\n"
 #~ msgstr "´üÂÔ¤µ¤ì¤ë¥µ¥¤¥º: %d\n"
 
-#~ msgid "New Header signature\n"
-#~ msgstr "¿·¤·¤¤¥Ø¥Ã¥À½ğ̾\n"
-
 #, fuzzy
 #~ msgid "path %s is not relocateable for package %s-%s-%s"
 #~ msgstr "¥Ñ¥¹ %s ¤ÏºÆÇÛÃ֤Ǥ­¤Ş¤»¤ó(¥Ñ¥Ã¥±¡¼¥¸ %s-%s-%s ¤ËÂФ·¤Æ)"
diff --git a/po/ko.po b/po/ko.po
index 4ce2d9727..8a3a9f221 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-02-10 13:58-0500\n"
+"POT-Creation-Date: 2002-03-06 18:13-0500\n"
 "PO-Revision-Date: 2001-09-07 22:03+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
@@ -190,7 +190,8 @@ msgid "RPM version %s\n"
 msgstr "RPM - %s\n"
 
 #: rpmqv.c:235
-msgid "Copyright (C) 1998-2000 - Red Hat, Inc."
+#, fuzzy
+msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
 msgstr "Copyright (C) 1998-2000 - Red Hat, Inc."
 
 #: rpmqv.c:236
@@ -432,7 +433,7 @@ msgstr "--querytags ¿É¼Ç¿¡ ºÎÀûÀıÇÑ Àμö°¡ ÁöÁ¤µÇ¾ú½À´Ï´Ù "
 msgid "no arguments given"
 msgstr "ÁúÀÇ¿¡ ÇÊ¿äÇÑ Àμö°¡ ÁöÁ¤µÇÁö ¾Ê¾Ò½À´Ï´Ù"
 
-#: build/build.c:125 build/pack.c:479
+#: build/build.c:125 build/pack.c:483
 msgid "Unable to open temp file.\n"
 msgstr "Àӽà ÆÄÀÏÀ» ¿­ ¼ö ¾ø½À´Ï´Ù.\n"
 
@@ -777,7 +778,7 @@ msgstr "RPM Àбâ(readRPM): %s (À»)¸¦ ¿±´Ï´Ù: %s\n"
 msgid "readRPM: read %s: %s\n"
 msgstr "RPM Àбâ(readRPM): %s (À»)¸¦ ÀнÀ´Ï´Ù: %s\n"
 
-#: build/pack.c:305 build/pack.c:521
+#: build/pack.c:305 build/pack.c:529
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: Fseek¿¡ ½ÇÆĞÇß½À´Ï´Ù: %s\n"
@@ -792,77 +793,77 @@ msgstr "RPM Àбâ(readRPM): %s (Àº)´Â RPM ÆĞÅ°Áö°¡ ¾Æ´Õ´Ï´Ù\n"
 msgid "readRPM: reading header from %s\n"
 msgstr "RPM Àбâ(readRPM): %s ¿¡¼­ Çì´õ¸¦ ÀĞ°í ÀÖ½À´Ï´Ù\n"
 
-#: build/pack.c:467
+#: build/pack.c:471
 msgid "Unable to create immutable header region.\n"
 msgstr "°íÁ¤ Çì´õ ¿µ¿ª(immutable header region)À» »ı¼ºÇÒ ¼ö ¾ø½À´Ï´Ù.\n"
 
-#: build/pack.c:485
+#: build/pack.c:490
 msgid "Unable to write temp header\n"
 msgstr "ÀÓ½Ã(temp) Çì´õ¸¦ ÀÛ¼ºÇÒ ¼ö ¾ø½À´Ï´Ù\n"
 
-#: build/pack.c:493
+#: build/pack.c:500
 msgid "Bad CSA data\n"
 msgstr "À߸øµÈ CSA µ¥ÀÌÅÍ\n"
 
-#: build/pack.c:528
+#: build/pack.c:536
 msgid "Unable to write final header\n"
 msgstr "¸¶Áö¸·(final) Çì´õ¸¦ ÀÛ¼ºÇÒ ¼ö ¾ø½À´Ï´Ù\n"
 
-#: build/pack.c:546
+#: build/pack.c:556
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "¼­¸í »ı¼º Áß: %d\n"
 
-#: build/pack.c:559
+#: build/pack.c:574
 msgid "Unable to reload signature header.\n"
 msgstr "¼­¸í(signature) Çì´õ¸¦ ´Ù½Ã Àоî¿Ã ¼ö ¾ø½À´Ï´Ù.\n"
 
-#: build/pack.c:567
+#: build/pack.c:582
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr "%s (À»)¸¦ ¿­ ¼ö ¾øÀ½: %s\n"
 
-#: build/pack.c:603 lib/psm.c:1444
+#: build/pack.c:618 lib/psm.c:1444
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "ÆĞÅ°Áö¸¦ ÀÛ¼ºÇÒ ¼ö ¾øÀ½: %s\n"
 
-#: build/pack.c:618
+#: build/pack.c:633
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "¼­¸íÇÒ ´ë»ó %s (À»)¸¦ ¿­ ¼ö ¾øÀ½: %s\n"
 
-#: build/pack.c:628
+#: build/pack.c:644
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "%s ÀÇ Çì´õ¸¦ ÀĞÀ» ¼ö ¾øÀ½: %s\n"
 
-#: build/pack.c:642
+#: build/pack.c:658
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "%s ¿¡ Çì´õ¸¦ ÀÛ¼ºÇÒ ¼ö ¾øÀ½: %s\n"
 
-#: build/pack.c:652
+#: build/pack.c:668
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "%s ÀÇ payload¸¦ ÀĞÀ» ¼ö ¾øÀ½: %s\n"
 
-#: build/pack.c:658
+#: build/pack.c:674
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "%s ¿¡ payload¸¦ ÀÛ¼ºÇÒ ¼ö ¾øÀ½: %s\n"
 
-#: build/pack.c:683 lib/psm.c:1725
+#: build/pack.c:699 lib/psm.c:1725
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "ÀÛ¼º: %s\n"
 
-#: build/pack.c:750
+#: build/pack.c:766
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr "%s ÆĞÅ°ÁöÀÇ Ãâ·Â ÆÄÀϸíÀ» »ı¼ºÇÒ ¼ö ¾øÀ½: %s\n"
 
-#: build/pack.c:767
+#: build/pack.c:783
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr "%s (À»)¸¦ »ı¼ºÇÒ ¼ö ¾øÀ½: %s\n"
@@ -1611,42 +1612,52 @@ msgstr "%s (ÀÌ)°¡ %s (À¸)·Î »ı¼ºµÇ¾ú½À´Ï´Ù\n"
 msgid "error creating temporary file %s\n"
 msgstr "Àӽà ÆÄÀÏ %s (À»)¸¦ »ı¼ºÇÏ´Â µµÁß ¿À·ù°¡ ¹ß»ıÇß½À´Ï´Ù\n"
 
-#: lib/package.c:167 lib/package.c:238
+#: lib/package.c:179 lib/package.c:255
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr "ÀÌ RPM ¹öÀü¿¡¼­´Â ÆĞŰ¡ ¹öÀü '1' ÀÌ Áö¿øµÇÁö ¾Ê½À´Ï´Ù\n"
 
-#: lib/package.c:188 lib/package.c:246
+#: lib/package.c:200 lib/package.c:263
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 "ÀÌ RPM ¹öÀü¿¡¼­´Â ÁÖ¿ä ¹øÈ£(major number) <= 4 ÀÇ ÆĞŰ¡ ¸¸À» Áö¿øÇÕ´Ï´Ù\n"
 
-#: lib/package.c:224 lib/rpmchecksig.c:156 lib/rpmchecksig.c:522
+#: lib/package.c:241 lib/rpmchecksig.c:161 lib/rpmchecksig.c:541
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: readLead¿¡ ½ÇÆĞÇß½À´Ï´Ù\n"
 
-#: lib/package.c:230
+#: lib/package.c:247
 #, fuzzy, c-format
 msgid "%s: bad magic\n"
 msgstr "À߸øµÈ magic ÀÔ´Ï´Ù"
 
-#: lib/package.c:254 lib/rpmchecksig.c:174 lib/rpmchecksig.c:538
+#: lib/package.c:272 lib/rpmchecksig.c:179 lib/rpmchecksig.c:557
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: rpmReadSignature¿¡ ½ÇÆĞÇß½À´Ï´Ù\n"
 
-#: lib/package.c:258 lib/rpmchecksig.c:178 lib/rpmchecksig.c:543
+#: lib/package.c:276 lib/rpmchecksig.c:183 lib/rpmchecksig.c:562
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: À¯È¿ÇÑ ¼­¸íÀÌ ¾ø½À´Ï´Ù\n"
 
-#: lib/package.c:284
+#: lib/package.c:304 lib/rpmchecksig.c:462
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: readLead¿¡ ½ÇÆĞÇß½À´Ï´Ù\n"
 
-#: lib/package.c:303 lib/rpmchecksig.c:107 lib/rpmchecksig.c:466
+#. Parse the parameters from the OpenPGP packets that will be needed.
+#: lib/package.c:334 lib/rpmchecksig.c:631
+msgid "========== Header DSA signature\n"
+msgstr ""
+
+#. Parse the parameters from the OpenPGP packets that will be needed.
+#: lib/package.c:357
+msgid "========== Package DSA/RSA signature\n"
+msgstr ""
+
+#: lib/package.c:366 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Fread¿¡ ½ÇÆĞÇß½À´Ï´Ù: %s\n"
@@ -2388,66 +2399,79 @@ msgstr "À߸øµÈ db ÆÄÀÏ    %s\n"
 msgid "(added provide)"
 msgstr "%s: %-45s ¿¹ (db°¡ Á¦°øÇÔ)\n"
 
-#: lib/rpmchecksig.c:49
+#: lib/rpmchecksig.c:51
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s: ¿©´Âµ¥ ½ÇÆĞÇß½À´Ï´Ù: %s\n"
 
-#: lib/rpmchecksig.c:61
+#: lib/rpmchecksig.c:63
 msgid "makeTempFile failed\n"
 msgstr "makeTempFile¿¡ ½ÇÆĞÇß½À´Ï´Ù\n"
 
-#: lib/rpmchecksig.c:101
+#: lib/rpmchecksig.c:104
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: Fwrite¿¡ ½ÇÆĞÇß½À´Ï´Ù: %s\n"
 
-#: lib/rpmchecksig.c:161
-#, c-format
-msgid "%s: Can't sign v1.0 RPM\n"
+#: lib/rpmchecksig.c:166
+#, fuzzy, c-format
+msgid "%s: Can't sign v1 packaging\n"
 msgstr "%s: v1.0 RPMÀº ¼­¸íÇÒ ¼ö ¾ø½À´Ï´Ù\n"
 
-#: lib/rpmchecksig.c:165
-#, c-format
-msgid "%s: Can't re-sign v2.0 RPM\n"
+#: lib/rpmchecksig.c:170
+#, fuzzy, c-format
+msgid "%s: Can't re-sign v2 packaging\n"
 msgstr "%s: v2.0 RPMÀº Àç-¼­¸íÇÒ ¼ö ¾ø½À´Ï´Ù\n"
 
-#: lib/rpmchecksig.c:229
+#: lib/rpmchecksig.c:239
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: writeLead¿¡ ½ÇÆĞÇß½À´Ï´Ù: %s\n"
 
-#: lib/rpmchecksig.c:235
+#: lib/rpmchecksig.c:245
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmWriteSignature¿¡ ½ÇÆĞÇß½À´Ï´Ù: %s\n"
 
-#: lib/rpmchecksig.c:528
+#: lib/rpmchecksig.c:476
+#, fuzzy, c-format
+msgid "%s: headerGetEntry failed\n"
+msgstr "%s: readLead¿¡ ½ÇÆĞÇß½À´Ï´Ù\n"
+
+#: lib/rpmchecksig.c:547
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: À¯È¿ÇÑ ¼­¸íÀÌ ¾ø½À´Ï´Ù (v1.0 RPM)\n"
 
-#: lib/rpmchecksig.c:725
+#: lib/rpmchecksig.c:618
+msgid "========== Package RSA signature\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:637
+msgid "========== Package DSA signature\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:768
 msgid "NOT OK"
 msgstr "¿Ã¹Ù¸£Áö ¾ÊÀ½"
 
-#: lib/rpmchecksig.c:726 lib/rpmchecksig.c:740
+#: lib/rpmchecksig.c:769 lib/rpmchecksig.c:783
 msgid " (MISSING KEYS:"
 msgstr " (Å°¸¦ ãÀ» ¼ö ¾øÀ½:"
 
-#: lib/rpmchecksig.c:728 lib/rpmchecksig.c:742
+#: lib/rpmchecksig.c:771 lib/rpmchecksig.c:785
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:729 lib/rpmchecksig.c:743
+#: lib/rpmchecksig.c:772 lib/rpmchecksig.c:786
 msgid " (UNTRUSTED KEYS:"
 msgstr " (Å°¸¦ ½Å·ÚÇÒ ¼ö ¾øÀ½:"
 
-#: lib/rpmchecksig.c:731 lib/rpmchecksig.c:745
+#: lib/rpmchecksig.c:774 lib/rpmchecksig.c:788
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:739
+#: lib/rpmchecksig.c:782
 msgid "OK"
 msgstr "È®ÀÎ"
 
@@ -2659,140 +2683,140 @@ msgstr "%s (À»)¸¦ ÀĞÀ» ¼ö ¾ø½À´Ï´Ù, HOMEÀÌ ³Ê¹« Å®´Ï´Ù.\n"
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "%s (À»)¸¦ ¿­ ¼ö ¾øÀ½: %s.\n"
 
-#: lib/signature.c:117
+#: lib/signature.c:118
 msgid "file is not regular -- skipping size check\n"
 msgstr "ÆÄÀÏÀÌ ¿Ã¹Ù¸£Áö(regular) ¾Ê½À´Ï´Ù -- ¿ë·® °Ë»ç¸¦ »ı·«ÇÕ´Ï´Ù\n"
 
-#: lib/signature.c:126
+#: lib/signature.c:127
 #, 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:131
+#: lib/signature.c:132
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr " ½ÇÁ¦ ¿ë·®: %12d\n"
 
-#: lib/signature.c:151
+#: lib/signature.c:152
 msgid "No signature\n"
 msgstr "¼­¸íÀÌ ¾ø½À´Ï´Ù\n"
 
-#: lib/signature.c:155
+#: lib/signature.c:156
 msgid "Old PGP signature\n"
 msgstr "ÀÌÀü PGP ¼­¸í\n"
 
-#: lib/signature.c:168
+#: lib/signature.c:169
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr "ÀÌÀü (³»ºÎ-¿ë) ¼­¸í!  ¾î¶»°Ô ¾òÀ¸¼Ì½À´Ï±î!?\n"
 
-#: lib/signature.c:224
+#: lib/signature.c:225
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "¼­¸í: size(%d)+pad(%d)\n"
 
-#: lib/signature.c:299 lib/signature.c:397 lib/signature.c:537
-#: lib/signature.c:569
+#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:656
+#: lib/signature.c:688
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "%s (À»)¸¦ ½ÇÇàÇÒ ¼ö ¾øÀ½: %s\n"
 
-#: lib/signature.c:315
+#: lib/signature.c:322
 msgid "pgp failed\n"
 msgstr "pgp¿¡ ½ÇÆĞÇÔ\n"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:322
+#: lib/signature.c:329
 msgid "pgp failed to write signature\n"
 msgstr "pgp ¼­¸íÀ» ÀÛ¼ºÇϴµ¥ ½ÇÆĞÇß½À´Ï´Ù\n"
 
-#: lib/signature.c:327
+#: lib/signature.c:334
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr "PGP ¼­¸í ¿ë·®: %d\n"
 
-#: lib/signature.c:343 lib/signature.c:442
+#: lib/signature.c:350 lib/signature.c:450
 msgid "unable to read the signature\n"
 msgstr "¼­¸íÀ» ÀĞÀ» ¼ö ¾ø½À´Ï´Ù\n"
 
-#: lib/signature.c:348
+#: lib/signature.c:355
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr "%d ¹ÙÀÌÆ®ÀÇ PGP ¼­¸íÀ» ¾ò¾ú½À´Ï´Ù\n"
 
-#: lib/signature.c:414
+#: lib/signature.c:422
 msgid "gpg failed\n"
 msgstr "gpg¿¡ ½ÇÆĞÇÔ\n"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:421
+#: lib/signature.c:429
 msgid "gpg failed to write signature\n"
 msgstr "gpg ¼­¸íÀ» ÀÛ¼ºÇϴµ¥ ½ÇÆĞÇß½À´Ï´Ù\n"
 
-#: lib/signature.c:426
+#: lib/signature.c:434
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr "GPG ¼­¸í ¿ë·®: %d\n"
 
-#: lib/signature.c:447
+#: lib/signature.c:455
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr "%d ¹ÙÀÌÆ®ÀÇ GPG ¼­¸íÀ» ¾ò¾ú½À´Ï´Ù\n"
 
-#: lib/signature.c:475
-msgid "Generating signature using PGP.\n"
-msgstr "PGP¸¦ »ç¿ëÇÏ¿© ¼­¸íÀ» »ı¼ºÇÕ´Ï´Ù.\n"
-
-#: lib/signature.c:481
-msgid "Generating signature using GPG.\n"
-msgstr "GPG¸¦ »ç¿ëÇÏ¿© ¼­¸íÀ» »ı¼ºÇÕ´Ï´Ù.\n"
-
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:574 lib/signature.c:627
+#: lib/signature.c:693 lib/signature.c:747
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "¸ÅÅ©·Î ÆÄÀÏ¿¡ ºÎÀûÇÕÇÑ %%_signatureÀÇ ³»¿ëÀÌ ÀÖ½À´Ï´Ù\n"
 
-#: lib/signature.c:607
+#: lib/signature.c:727
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "¸ÅÅ©·Î ÆÄÀÏ¿¡ \"%%_gpg_name\" À» ¼³Á¤ÇØ ÁÖ¼Å¾ß ÇÕ´Ï´Ù\n"
 
-#: lib/signature.c:619
+#: lib/signature.c:739
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "¸ÅÅ©·Î ÆÄÀÏ¿¡ \"%%_pgp_name\" À» ¼³Á¤ÇØ ÁÖ¼Å¾ß ÇÕ´Ï´Ù\n"
 
-#: lib/signature.c:663
+#: lib/signature.c:783
 #, fuzzy
 msgid "Header+Payload size: "
 msgstr "Çì´õÀÇ Å©±â°¡ ³Ê¹« Å®´Ï´Ù"
 
-#: lib/signature.c:692
+#: lib/signature.c:823
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:732
+#: lib/signature.c:880
+msgid "Header SHA1 digest: "
+msgstr ""
+
+#: lib/signature.c:1042
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "MD5 ¼­¸íÀº °Ë»çÇÏÁö ¾Ê½À´Ï´Ù"
 
-#: lib/signature.c:822
+#: lib/signature.c:1135
+msgid "Header "
+msgstr ""
+
+#: lib/signature.c:1136
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "¼­¸íÀÌ ¾ø½À´Ï´Ù\n"
 
-#: lib/signature.c:886
+#: lib/signature.c:1214
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:906
+#: lib/signature.c:1240
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:910
+#: lib/signature.c:1244
 #, fuzzy, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "¼­¸í: size(%d)+pad(%d)\n"
@@ -3070,44 +3094,44 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging"
 msgstr "(±âÁ¸ÀÇ) rpm[23] ÆĞŰ¡°ú ȣȯÇÏ´Â Çì´õ¸¦ »ı¼ºÇÕ´Ï´Ù"
 
 #. @-modfilesys@
-#: rpmdb/rpmdb.c:129
+#: rpmdb/rpmdb.c:163
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 "DB ÅÂ±× ÃʱâÈ­[dbiTagsInit]: ÀÎÁõµÇÁö ¾ÊÀº ÅÂ±× À̸§: \"%s\" (Àº)´Â ¹«½ÃµË´Ï"
 "´Ù\n"
 
-#: rpmdb/rpmdb.c:387
+#: rpmdb/rpmdb.c:440
 #, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr "db%2$d (À»)¸¦ ÀÌ¿ëÇÏ¿© %1$s À妽º¸¦ ¿­ ¼ö ¾ø½À´Ï´Ù - %3$s (%4$d)\n"
 
-#: rpmdb/rpmdb.c:409
+#: rpmdb/rpmdb.c:462
 #, c-format
 msgid "cannot open %s index\n"
 msgstr "%s À妽º¸¦ ¿­ ¼ö ¾ø½À´Ï´Ù\n"
 
-#: rpmdb/rpmdb.c:501
+#: rpmdb/rpmdb.c:554
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr ""
 "%3$s À妽º¿¡¼­ \"%2$s\" ·¹Äڵ带 ¾ò´Â µµÁß ¿À·ù(%1$d)°¡ ¹ß»ıÇß½À´Ï´Ù\n"
 
-#: rpmdb/rpmdb.c:632
+#: rpmdb/rpmdb.c:685
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "%3$s (À¸)·Î %2$s ·¹Äڵ带 ÀúÀåÇÏ´Â µµÁß ¿À·ù(%1$d)°¡ ¹ß»ıÇß½À´Ï´Ù\n"
 
-#: rpmdb/rpmdb.c:642
+#: rpmdb/rpmdb.c:695
 #, c-format
 msgid "error(%d) removing record %s from %s\n"
 msgstr "%3$s ¿¡¼­ %2$s ·¹Äڵ带 »èÁ¦ÇÏ´Â µµÁß ¿À·ù(%1$d)°¡ ¹ß»ıÇß½À´Ï´Ù\n"
 
-#: rpmdb/rpmdb.c:906
+#: rpmdb/rpmdb.c:959
 msgid "no dbpath has been set\n"
 msgstr "db°æ·Î°¡ ¼³Á¤µÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù\n"
 
-#: rpmdb/rpmdb.c:1054
+#: rpmdb/rpmdb.c:1107
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database\n"
@@ -3116,115 +3140,115 @@ msgstr ""
 "·Á¸é --rebuilddb ¿É¼ÇÀ» ÀÌ¿ëÇϽʽÿä\n"
 
 #. error
-#: rpmdb/rpmdb.c:1319
+#: rpmdb/rpmdb.c:1372
 #, c-format
 msgid "error(%d) counting packages\n"
 msgstr "ÆĞÅ°ÁöÀÇ ¼ö¸¦ ¼¼´Â µµÁß ¿À·ù(%d)°¡ ¹ß»ıÇß½À´Ï´Ù\n"
 
-#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3372
+#: rpmdb/rpmdb.c:2150 rpmdb/rpmdb.c:3502
 #, c-format
 msgid "record number %u in database is bad -- skipping.\n"
 msgstr "µ¥ÀÌÅͺ£À̽ºÀÇ ·¹ÄÚµå ¹øÈ£ %u (ÀÌ)°¡ À߸øµÇ¾ú½À´Ï´Ù -- »ı·«ÇÕ´Ï´Ù.\n"
 
-#: rpmdb/rpmdb.c:2150
+#: rpmdb/rpmdb.c:2203
 #, c-format
 msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
 msgstr "rpmdb: ¼Õ»óµÈ Çì´õ #%u (ÀÌ)°¡ º¹±¸(retrieved)µÇ¾ú½À´Ï´Ù, »ı·«ÇÕ´Ï´Ù.\n"
 
-#: rpmdb/rpmdb.c:2420
+#: rpmdb/rpmdb.c:2473
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "%s: 0x%x ÀÇ Çì´õ¸¦ ÀĞÀ» ¼ö ¾ø½À´Ï´Ù\n"
 
-#: rpmdb/rpmdb.c:2540
+#: rpmdb/rpmdb.c:2634
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "%2$s À妽º¿¡¼­ \"%1$s\" (À»)¸¦ »èÁ¦ÇÕ´Ï´Ù.\n"
 
-#: rpmdb/rpmdb.c:2544
+#: rpmdb/rpmdb.c:2638
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "%2$s À妽º¿¡¼­ %1$d Ç׸ñµé(entries)À» »èÁ¦ÇÕ´Ï´Ù.\n"
 
-#: rpmdb/rpmdb.c:2714
+#: rpmdb/rpmdb.c:2808
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "»õ·Î¿î ÆĞÅ°Áö¸¦ ¹èÄ¡ÇÏ´Â µµÁß ¿À·ù(%d)°¡ ¹ß»ıÇß½À´Ï´Ù\n"
 
-#: rpmdb/rpmdb.c:2873
+#: rpmdb/rpmdb.c:3003
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "%2$s À妽º¿¡ \"%1$s\" (À»)¸¦ Ãß°¡ÇÕ´Ï´Ù.\n"
 
-#: rpmdb/rpmdb.c:2877
+#: rpmdb/rpmdb.c:3007
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "%2$s À妽º¿¡ %1$d Ç׸ñµé(entries)À» Ãß°¡ÇÕ´Ï´Ù.\n"
 
-#: rpmdb/rpmdb.c:3258
+#: rpmdb/rpmdb.c:3388
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr "db3¸¦ À籸Ãà ÇÑ ÈÄ¿¡ %s (À»)¸¦ »èÁ¦ÇÕ´Ï´Ù.\n"
 
-#: rpmdb/rpmdb.c:3291
+#: rpmdb/rpmdb.c:3421
 msgid "no dbpath has been set"
 msgstr "db°æ·Î°¡ ¼³Á¤µÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù"
 
-#: rpmdb/rpmdb.c:3318
+#: rpmdb/rpmdb.c:3448
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "%2$s ¿¡ µ¥ÀÌÅͺ£À̽º %1$s (À»)¸¦ À籸Ãà ÇÕ´Ï´Ù\n"
 
-#: rpmdb/rpmdb.c:3322
+#: rpmdb/rpmdb.c:3452
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr "Àӽà µ¥ÀÌÅͺ£À̽º %s (ÀÌ)°¡ ÀÌ¹Ì Á¸ÀçÇÕ´Ï´Ù\n"
 
-#: rpmdb/rpmdb.c:3328
+#: rpmdb/rpmdb.c:3458
 #, c-format
 msgid "creating directory %s\n"
 msgstr "%s µğ·ºÅ丮¸¦ »ı¼ºÇÕ´Ï´Ù\n"
 
-#: rpmdb/rpmdb.c:3330
+#: rpmdb/rpmdb.c:3460
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr "%s µğ·ºÅ丮¸¦ »ı¼ºÇÔ: %s\n"
 
-#: rpmdb/rpmdb.c:3337
+#: rpmdb/rpmdb.c:3467
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "dbapi %d (À»)¸¦ ÅëÇØ ÀÌÀü µ¥ÀÌÅͺ£À̽º¸¦ ¿±´Ï´Ù\n"
 
-#: rpmdb/rpmdb.c:3348
+#: rpmdb/rpmdb.c:3478
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "dbapi %d (À»)¸¦ ÅëÇØ »õ·Î¿î µ¥ÀÌÅͺ£À̽º¸¦ ¿±´Ï´Ù\n"
 
-#: rpmdb/rpmdb.c:3412
+#: rpmdb/rpmdb.c:3542
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "%u ¿¡ ·¹Äڵ带 Ãß°¡ÇÒ ¼ö ¾ø½À´Ï´Ù\n"
 
-#: rpmdb/rpmdb.c:3430
+#: rpmdb/rpmdb.c:3560
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 "µ¥ÀÌÅͺ£À̽º¸¦ À籸ÃàÇϴµ¥ ½ÇÆĞÇÔ: ¿øº» µ¥ÀÌÅͺ£À̽º´Â ±×´ë·Î À¯ÁöµË´Ï´Ù\n"
 
-#: rpmdb/rpmdb.c:3438
+#: rpmdb/rpmdb.c:3568
 msgid "failed to replace old database with new database!\n"
 msgstr "ÀÌÀü µ¥ÀÌÅͺ£À̽º¸¦ »õ·Î¿î µ¥ÀÌÅͺ£À̽º·Î ±³Ã¼Çϴµ¥ ½ÇÆĞÇß½À´Ï´Ù!\n"
 
-#: rpmdb/rpmdb.c:3440
+#: rpmdb/rpmdb.c:3570
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "º¹±¸Çϱâ À§ÇØ $2$s ÀÇ ÆÄÀÏÀ» $1$s ÀÇ ÆÄÀÏ·Î ±³Ã¼ÇÕ´Ï´Ù"
 
-#: rpmdb/rpmdb.c:3450
+#: rpmdb/rpmdb.c:3580
 #, c-format
 msgid "removing directory %s\n"
 msgstr "%s µğ·ºÅ丮¸¦ »èÁ¦ÇÕ´Ï´Ù\n"
 
-#: rpmdb/rpmdb.c:3452
+#: rpmdb/rpmdb.c:3582
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "%s µğ·ºÅ丮¸¦ »èÁ¦Çϴµ¥ ½ÇÆĞÇÔ: %s\n"
@@ -3437,6 +3461,12 @@ msgstr "URL Æ÷Æ®´Â ¹İµå½Ã ¼ıÀÚÀ̾î¾ß ÇÕ´Ï´Ù\n"
 msgid "failed to create %s: %s\n"
 msgstr "%s (À»)¸¦ »ı¼ºÇϴµ¥ ½ÇÆĞÇÔ: %s\n"
 
+#~ msgid "Generating signature using PGP.\n"
+#~ msgstr "PGP¸¦ »ç¿ëÇÏ¿© ¼­¸íÀ» »ı¼ºÇÕ´Ï´Ù.\n"
+
+#~ msgid "Generating signature using GPG.\n"
+#~ msgstr "GPG¸¦ »ç¿ëÇÏ¿© ¼­¸íÀ» »ı¼ºÇÕ´Ï´Ù.\n"
+
 #~ msgid "no packages given for uninstall"
 #~ msgstr "Á¦°Å(uninstall)ÇÒ ÆĞÅ°Áö¸¦ ÁöÁ¤ÇÏÁö ¾ÊÀ¸¼Ì½À´Ï´Ù"
 
diff --git a/po/no.po b/po/no.po
index 18324503a..7c9b5e7d8 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-02-10 13:58-0500\n"
+"POT-Creation-Date: 2002-03-06 18:13-0500\n"
 "PO-Revision-Date: 2001-06-27 12:24+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -189,7 +189,8 @@ msgid "RPM version %s\n"
 msgstr "RPM versjon %s\n"
 
 #: rpmqv.c:235
-msgid "Copyright (C) 1998-2000 - Red Hat, Inc."
+#, fuzzy
+msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
 msgstr "Copyright © 1998-2000 - Red Hat, Inc."
 
 #: rpmqv.c:236
@@ -431,7 +432,7 @@ msgstr "uventede argumenter til --querytags "
 msgid "no arguments given"
 msgstr "ingen argumenter oppgitt for spørring"
 
-#: build/build.c:125 build/pack.c:479
+#: build/build.c:125 build/pack.c:483
 msgid "Unable to open temp file.\n"
 msgstr "Kunne ikke åpne spec fil %s: %s\n"
 
@@ -776,7 +777,7 @@ msgstr ""
 msgid "readRPM: read %s: %s\n"
 msgstr ""
 
-#: build/pack.c:305 build/pack.c:521
+#: build/pack.c:305 build/pack.c:529
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: Fseek feilet: %s\n"
@@ -791,81 +792,81 @@ msgstr "readRPM: %s er ikke en RPM-pakke\n"
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: leser header fra %s\n"
 
-#: build/pack.c:467
+#: build/pack.c:471
 #, fuzzy
 msgid "Unable to create immutable header region.\n"
 msgstr "Kunne ikke åpne spec fil %s: %s\n"
 
-#: build/pack.c:485
+#: build/pack.c:490
 #, fuzzy
 msgid "Unable to write temp header\n"
 msgstr "Kunne ikke skrive header til %s: %s\n"
 
-#: build/pack.c:493
+#: build/pack.c:500
 msgid "Bad CSA data\n"
 msgstr "Ugyldige CSA-data\n"
 
-#: build/pack.c:528
+#: build/pack.c:536
 #, fuzzy
 msgid "Unable to write final header\n"
 msgstr "Kunne ikke skrive header til %s: %s\n"
 
-#: build/pack.c:546
+#: build/pack.c:556
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "Genererer signatur: %d\n"
 
-#: build/pack.c:559
+#: build/pack.c:574
 #, fuzzy
 msgid "Unable to reload signature header.\n"
 msgstr "Kunne ikke åpne spec fil %s: %s\n"
 
-#: build/pack.c:567
+#: build/pack.c:582
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr "Kunne ikke åpne %s: %s\n"
 
-#: build/pack.c:603 lib/psm.c:1444
+#: build/pack.c:618 lib/psm.c:1444
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Kunne ikke skrive pakke: %s\n"
 
-#: build/pack.c:618
+#: build/pack.c:633
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "Kunne ikke åpne sigmål %s: %s\n"
 
-#: build/pack.c:628
+#: build/pack.c:644
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "Kunne ikke åpne spec fil %s: %s\n"
 
-#: build/pack.c:642
+#: build/pack.c:658
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "Kunne ikke skrive header til %s: %s\n"
 
-#: build/pack.c:652
+#: build/pack.c:668
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "Kunne ikke lese \"payload\" fra %s: %s\n"
 
-#: build/pack.c:658
+#: build/pack.c:674
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Kunne ikke skrive \"payload\" til %s: %s\n"
 
-#: build/pack.c:683 lib/psm.c:1725
+#: build/pack.c:699 lib/psm.c:1725
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Skrev: %s\n"
 
-#: build/pack.c:750
+#: build/pack.c:766
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:767
+#: build/pack.c:783
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr ""
@@ -1603,41 +1604,51 @@ msgstr "%s opprettet som %s\n"
 msgid "error creating temporary file %s\n"
 msgstr "feil under oppretting av midlertidig fil %s\n"
 
-#: lib/package.c:167 lib/package.c:238
+#: lib/package.c:179 lib/package.c:255
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:188 lib/package.c:246
+#: lib/package.c:200 lib/package.c:263
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:224 lib/rpmchecksig.c:156 lib/rpmchecksig.c:522
+#: lib/package.c:241 lib/rpmchecksig.c:161 lib/rpmchecksig.c:541
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: readLead feilet\n"
 
-#: lib/package.c:230
+#: lib/package.c:247
 #, fuzzy, c-format
 msgid "%s: bad magic\n"
 msgstr "Ugyldig magi"
 
-#: lib/package.c:254 lib/rpmchecksig.c:174 lib/rpmchecksig.c:538
+#: lib/package.c:272 lib/rpmchecksig.c:179 lib/rpmchecksig.c:557
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: rpmReadSignature feilet\n"
 
-#: lib/package.c:258 lib/rpmchecksig.c:178 lib/rpmchecksig.c:543
+#: lib/package.c:276 lib/rpmchecksig.c:183 lib/rpmchecksig.c:562
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Ingen signatur tilgjengelig\n"
 
-#: lib/package.c:284
+#: lib/package.c:304 lib/rpmchecksig.c:462
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: readLead feilet\n"
 
-#: lib/package.c:303 lib/rpmchecksig.c:107 lib/rpmchecksig.c:466
+#. Parse the parameters from the OpenPGP packets that will be needed.
+#: lib/package.c:334 lib/rpmchecksig.c:631
+msgid "========== Header DSA signature\n"
+msgstr ""
+
+#. Parse the parameters from the OpenPGP packets that will be needed.
+#: lib/package.c:357
+msgid "========== Package DSA/RSA signature\n"
+msgstr ""
+
+#: lib/package.c:366 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Fread feilet: %s\n"
@@ -2360,66 +2371,79 @@ msgstr ""
 msgid "(added provide)"
 msgstr ""
 
-#: lib/rpmchecksig.c:49
+#: lib/rpmchecksig.c:51
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s: åpne feilet: %s\n"
 
-#: lib/rpmchecksig.c:61
+#: lib/rpmchecksig.c:63
 msgid "makeTempFile failed\n"
 msgstr "makeTempFile feilet\n"
 
-#: lib/rpmchecksig.c:101
+#: lib/rpmchecksig.c:104
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: Fwrite feilet: %s\n"
 
-#: lib/rpmchecksig.c:161
-#, c-format
-msgid "%s: Can't sign v1.0 RPM\n"
+#: lib/rpmchecksig.c:166
+#, fuzzy, c-format
+msgid "%s: Can't sign v1 packaging\n"
 msgstr "%s: kan ikke signere v1.0 RPM\n"
 
-#: lib/rpmchecksig.c:165
-#, c-format
-msgid "%s: Can't re-sign v2.0 RPM\n"
+#: lib/rpmchecksig.c:170
+#, fuzzy, c-format
+msgid "%s: Can't re-sign v2 packaging\n"
 msgstr "%s: Kan ikke signere v2.0 RPM på nytt\n"
 
-#: lib/rpmchecksig.c:229
+#: lib/rpmchecksig.c:239
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: writeLead feilet: %s\n"
 
-#: lib/rpmchecksig.c:235
+#: lib/rpmchecksig.c:245
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmWriteSignature feilet: %s\n"
 
-#: lib/rpmchecksig.c:528
+#: lib/rpmchecksig.c:476
+#, fuzzy, c-format
+msgid "%s: headerGetEntry failed\n"
+msgstr "%s: readLead feilet\n"
+
+#: lib/rpmchecksig.c:547
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: Ingen signatur tilgjengelig (v1.0 RPM)\n"
 
-#: lib/rpmchecksig.c:725
+#: lib/rpmchecksig.c:618
+msgid "========== Package RSA signature\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:637
+msgid "========== Package DSA signature\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:768
 msgid "NOT OK"
 msgstr "IKKE OK"
 
-#: lib/rpmchecksig.c:726 lib/rpmchecksig.c:740
+#: lib/rpmchecksig.c:769 lib/rpmchecksig.c:783
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:728 lib/rpmchecksig.c:742
+#: lib/rpmchecksig.c:771 lib/rpmchecksig.c:785
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:729 lib/rpmchecksig.c:743
+#: lib/rpmchecksig.c:772 lib/rpmchecksig.c:786
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:731 lib/rpmchecksig.c:745
+#: lib/rpmchecksig.c:774 lib/rpmchecksig.c:788
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:739
+#: lib/rpmchecksig.c:782
 msgid "OK"
 msgstr "OK"
 
@@ -2629,139 +2653,139 @@ msgstr ""
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "Kunne ikke åpne spec fil %s: %s\n"
 
-#: lib/signature.c:117
+#: lib/signature.c:118
 msgid "file is not regular -- skipping size check\n"
 msgstr ""
 
-#: lib/signature.c:126
+#: lib/signature.c:127
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:131
+#: lib/signature.c:132
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:151
+#: lib/signature.c:152
 msgid "No signature\n"
 msgstr ""
 
-#: lib/signature.c:155
+#: lib/signature.c:156
 msgid "Old PGP signature\n"
 msgstr ""
 
-#: lib/signature.c:168
+#: lib/signature.c:169
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr ""
 
-#: lib/signature.c:224
+#: lib/signature.c:225
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:299 lib/signature.c:397 lib/signature.c:537
-#: lib/signature.c:569
+#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:656
+#: lib/signature.c:688
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "Kunne ikke kjøre %s: %s\n"
 
-#: lib/signature.c:315
+#: lib/signature.c:322
 msgid "pgp failed\n"
 msgstr ""
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:322
+#: lib/signature.c:329
 msgid "pgp failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:327
+#: lib/signature.c:334
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:343 lib/signature.c:442
+#: lib/signature.c:350 lib/signature.c:450
 msgid "unable to read the signature\n"
 msgstr ""
 
-#: lib/signature.c:348
+#: lib/signature.c:355
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:414
+#: lib/signature.c:422
 msgid "gpg failed\n"
 msgstr ""
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:421
+#: lib/signature.c:429
 msgid "gpg failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:426
+#: lib/signature.c:434
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:447
+#: lib/signature.c:455
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:475
-msgid "Generating signature using PGP.\n"
-msgstr ""
-
-#: lib/signature.c:481
-msgid "Generating signature using GPG.\n"
-msgstr ""
-
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:574 lib/signature.c:627
+#: lib/signature.c:693 lib/signature.c:747
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:607
+#: lib/signature.c:727
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:619
+#: lib/signature.c:739
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:663
+#: lib/signature.c:783
 #, fuzzy
 msgid "Header+Payload size: "
 msgstr "For stor header"
 
-#: lib/signature.c:692
+#: lib/signature.c:823
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:732
+#: lib/signature.c:880
+msgid "Header SHA1 digest: "
+msgstr ""
+
+#: lib/signature.c:1042
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "hopp over MD5-signaturer"
 
-#: lib/signature.c:822
+#: lib/signature.c:1135
+msgid "Header "
+msgstr ""
+
+#: lib/signature.c:1136
 msgid "V3 DSA signature: "
 msgstr ""
 
-#: lib/signature.c:886
+#: lib/signature.c:1214
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:906
+#: lib/signature.c:1240
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:910
+#: lib/signature.c:1244
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
@@ -3028,155 +3052,155 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging"
 msgstr "generer headere som er kompatible med (gamle) rpm[23] pakker"
 
 #. @-modfilesys@
-#: rpmdb/rpmdb.c:129
+#: rpmdb/rpmdb.c:163
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:387
+#: rpmdb/rpmdb.c:440
 #, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr "kan ikke åpne %s-indeks ved bruk av db%d - %s (%d)\n"
 
-#: rpmdb/rpmdb.c:409
+#: rpmdb/rpmdb.c:462
 #, c-format
 msgid "cannot open %s index\n"
 msgstr "kan ikke åpne %s indeks\n"
 
-#: rpmdb/rpmdb.c:501
+#: rpmdb/rpmdb.c:554
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:632
+#: rpmdb/rpmdb.c:685
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "feil(%d) under lagring av post %s til %s\n"
 
-#: rpmdb/rpmdb.c:642
+#: rpmdb/rpmdb.c:695
 #, c-format
 msgid "error(%d) removing record %s from %s\n"
 msgstr "feil(%d) under fjerning av post %s fra %s\n"
 
-#: rpmdb/rpmdb.c:906
+#: rpmdb/rpmdb.c:959
 msgid "no dbpath has been set\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1054
+#: rpmdb/rpmdb.c:1107
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database\n"
 msgstr ""
 
 #. error
-#: rpmdb/rpmdb.c:1319
+#: rpmdb/rpmdb.c:1372
 #, c-format
 msgid "error(%d) counting packages\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3372
+#: rpmdb/rpmdb.c:2150 rpmdb/rpmdb.c:3502
 #, c-format
 msgid "record number %u in database is bad -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2150
+#: rpmdb/rpmdb.c:2203
 #, c-format
 msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2420
+#: rpmdb/rpmdb.c:2473
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2540
+#: rpmdb/rpmdb.c:2634
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2544
+#: rpmdb/rpmdb.c:2638
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2714
+#: rpmdb/rpmdb.c:2808
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2873
+#: rpmdb/rpmdb.c:3003
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2877
+#: rpmdb/rpmdb.c:3007
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3258
+#: rpmdb/rpmdb.c:3388
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3291
+#: rpmdb/rpmdb.c:3421
 msgid "no dbpath has been set"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3318
+#: rpmdb/rpmdb.c:3448
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3322
+#: rpmdb/rpmdb.c:3452
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3328
+#: rpmdb/rpmdb.c:3458
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3330
+#: rpmdb/rpmdb.c:3460
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3337
+#: rpmdb/rpmdb.c:3467
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3348
+#: rpmdb/rpmdb.c:3478
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3412
+#: rpmdb/rpmdb.c:3542
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3430
+#: rpmdb/rpmdb.c:3560
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3438
+#: rpmdb/rpmdb.c:3568
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3440
+#: rpmdb/rpmdb.c:3570
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3450
+#: rpmdb/rpmdb.c:3580
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3452
+#: rpmdb/rpmdb.c:3582
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 762ff4fcd..2b7829148 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-02-10 13:58-0500\n"
+"POT-Creation-Date: 2002-03-06 18:13-0500\n"
 "PO-Revision-Date: 1999-05-25 17:00+0100\n"
 "Last-Translator: Pawe³ Dziekoñski <pdziekonski@mml.ch.pwr.wroc.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -199,7 +199,7 @@ msgstr "RPM wersja %s\n"
 
 #: rpmqv.c:235
 #, fuzzy
-msgid "Copyright (C) 1998-2000 - Red Hat, Inc."
+msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
 msgstr "Copyright (C) 1998 - Red Hat Software"
 
 #: rpmqv.c:236
@@ -447,7 +447,7 @@ msgstr "nieoczekiwane argumenty dla --querytags "
 msgid "no arguments given"
 msgstr "nie podano argumentów dla trybu zapytañ"
 
-#: build/build.c:125 build/pack.c:479
+#: build/build.c:125 build/pack.c:483
 #, fuzzy
 msgid "Unable to open temp file.\n"
 msgstr "Nie mo¿na otworzyæ pliku tymczasowego"
@@ -802,7 +802,7 @@ msgstr "readRPM: otwieranie %s: %s\n"
 msgid "readRPM: read %s: %s\n"
 msgstr "readRPM: czytanie %s: %s\n"
 
-#: build/pack.c:305 build/pack.c:521
+#: build/pack.c:305 build/pack.c:529
 #, fuzzy, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: readLead nie powiod³o siê\n"
@@ -817,82 +817,82 @@ msgstr "readRPM: %s nie jest pakietem RPM\n"
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: czytanie nag³ówka z %s\n"
 
-#: build/pack.c:467
+#: build/pack.c:471
 #, fuzzy
 msgid "Unable to create immutable header region.\n"
 msgstr "Nie mo¿na odczytaæ ikony: %s"
 
-#: build/pack.c:485
+#: build/pack.c:490
 #, fuzzy
 msgid "Unable to write temp header\n"
 msgstr "Nie mo¿na zapisaæ %s"
 
-#: build/pack.c:493
+#: build/pack.c:500
 #, fuzzy
 msgid "Bad CSA data\n"
 msgstr "B³êdne dane CSA"
 
-#: build/pack.c:528
+#: build/pack.c:536
 #, fuzzy
 msgid "Unable to write final header\n"
 msgstr "Nie mo¿na zapisaæ %s"
 
-#: build/pack.c:546
+#: build/pack.c:556
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "Generowanie sygnatury: %d\n"
 
-#: build/pack.c:559
+#: build/pack.c:574
 #, fuzzy
 msgid "Unable to reload signature header.\n"
 msgstr "Nie mo¿na odczytaæ ikony: %s"
 
-#: build/pack.c:567
+#: build/pack.c:582
 #, fuzzy, c-format
 msgid "Could not open %s: %s\n"
 msgstr "Nie mo¿na otworzyæ %s\n"
 
-#: build/pack.c:603 lib/psm.c:1444
+#: build/pack.c:618 lib/psm.c:1444
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Nie mo¿na zapisaæ pakietu: %s"
 
-#: build/pack.c:618
+#: build/pack.c:633
 #, fuzzy, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "Nie mo¿na odczytaæ sigtarget: %s"
 
-#: build/pack.c:628
+#: build/pack.c:644
 #, fuzzy, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "Nie mo¿na odczytaæ ikony: %s"
 
-#: build/pack.c:642
+#: build/pack.c:658
 #, fuzzy, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "Nie mo¿na zapisaæ pakietu: %s"
 
-#: build/pack.c:652
+#: build/pack.c:668
 #, fuzzy, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "Nie mo¿na odczytaæ ikony: %s"
 
-#: build/pack.c:658
+#: build/pack.c:674
 #, fuzzy, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Nie mo¿na zapisaæ pakietu: %s"
 
-#: build/pack.c:683 lib/psm.c:1725
+#: build/pack.c:699 lib/psm.c:1725
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Zapisano: %s\n"
 
-#: build/pack.c:750
+#: build/pack.c:766
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr "Nie mo¿na wygenerowaæ wyj¶ciowej nazwy dla pakietu %s: %s\n"
 
-#: build/pack.c:767
+#: build/pack.c:783
 #, fuzzy, c-format
 msgid "cannot create %s: %s\n"
 msgstr "nie mo¿na utworzyæ %s"
@@ -1651,45 +1651,56 @@ msgstr "ostrze¿enie: %s utworzony jako %s"
 msgid "error creating temporary file %s\n"
 msgstr "b³±d w tworzeniu pliku tymczasowego %s"
 
-#: lib/package.c:167 lib/package.c:238
+#: lib/package.c:179 lib/package.c:255
 #, fuzzy
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr ""
 "tylko pakiety z numerem g³ównym <= 3 s± obs³ugiwane przez t± wersjê RPM'a"
 
-#: lib/package.c:188 lib/package.c:246
+#: lib/package.c:200 lib/package.c:263
 #, fuzzy
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 "tylko pakiety z numerem g³ównym <= 3 s± obs³ugiwane przez t± wersjê RPM'a"
 
-#: lib/package.c:224 lib/rpmchecksig.c:156 lib/rpmchecksig.c:522
+#: lib/package.c:241 lib/rpmchecksig.c:161 lib/rpmchecksig.c:541
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: readLead nie powiod³o siê\n"
 
-#: lib/package.c:230
+#: lib/package.c:247
 #, fuzzy, c-format
 msgid "%s: bad magic\n"
 msgstr "B³êdny magic"
 
-#: lib/package.c:254 lib/rpmchecksig.c:174 lib/rpmchecksig.c:538
+#: lib/package.c:272 lib/rpmchecksig.c:179 lib/rpmchecksig.c:557
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: rpmReadSignature nie powiod³o siê\n"
 
-#: lib/package.c:258 lib/rpmchecksig.c:178 lib/rpmchecksig.c:543
+#: lib/package.c:276 lib/rpmchecksig.c:183 lib/rpmchecksig.c:562
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Sygnatura nie jest dostêpna\n"
 
-#: lib/package.c:284
+#: lib/package.c:304 lib/rpmchecksig.c:462
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: readLead nie powiod³o siê\n"
 
-#: lib/package.c:303 lib/rpmchecksig.c:107 lib/rpmchecksig.c:466
+#. Parse the parameters from the OpenPGP packets that will be needed.
+#: lib/package.c:334 lib/rpmchecksig.c:631
+#, fuzzy
+msgid "========== Header DSA signature\n"
+msgstr "Nowa sygnatura nag³ówka\n"
+
+#. Parse the parameters from the OpenPGP packets that will be needed.
+#: lib/package.c:357
+msgid "========== Package DSA/RSA signature\n"
+msgstr ""
+
+#: lib/package.c:366 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
 #, fuzzy, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: readLead nie powiod³o siê\n"
@@ -2451,67 +2462,80 @@ msgstr "b³êdny status pliku: %s"
 msgid "(added provide)"
 msgstr "Udostêpniane zasoby:"
 
-#: lib/rpmchecksig.c:49
+#: lib/rpmchecksig.c:51
 #, fuzzy, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s: Open nie powiod³o siê\n"
 
-#: lib/rpmchecksig.c:61
+#: lib/rpmchecksig.c:63
 #, fuzzy
 msgid "makeTempFile failed\n"
 msgstr "wykonanie nie powiod³o siê\n"
 
-#: lib/rpmchecksig.c:101
+#: lib/rpmchecksig.c:104
 #, fuzzy, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: readLead nie powiod³o siê\n"
 
-#: lib/rpmchecksig.c:161
-#, c-format
-msgid "%s: Can't sign v1.0 RPM\n"
+#: lib/rpmchecksig.c:166
+#, fuzzy, c-format
+msgid "%s: Can't sign v1 packaging\n"
 msgstr "%s: Nie mo¿na podpisaæ v1.0 RPM\n"
 
-#: lib/rpmchecksig.c:165
-#, c-format
-msgid "%s: Can't re-sign v2.0 RPM\n"
+#: lib/rpmchecksig.c:170
+#, fuzzy, c-format
+msgid "%s: Can't re-sign v2 packaging\n"
 msgstr "%s: Nie mo¿na ponownie podpisaæ v2.0 RPM\n"
 
-#: lib/rpmchecksig.c:229
+#: lib/rpmchecksig.c:239
 #, fuzzy, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: readLead nie powiod³o siê\n"
 
-#: lib/rpmchecksig.c:235
+#: lib/rpmchecksig.c:245
 #, fuzzy, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmReadSignature nie powiod³o siê\n"
 
-#: lib/rpmchecksig.c:528
+#: lib/rpmchecksig.c:476
+#, fuzzy, c-format
+msgid "%s: headerGetEntry failed\n"
+msgstr "%s: readLead nie powiod³o siê\n"
+
+#: lib/rpmchecksig.c:547
 #, 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:725
+#: lib/rpmchecksig.c:618
+msgid "========== Package RSA signature\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:637
+msgid "========== Package DSA signature\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:768
 msgid "NOT OK"
 msgstr "NIE DOBRZE"
 
-#: lib/rpmchecksig.c:726 lib/rpmchecksig.c:740
+#: lib/rpmchecksig.c:769 lib/rpmchecksig.c:783
 msgid " (MISSING KEYS:"
 msgstr " (BRAK KLUCZY:"
 
-#: lib/rpmchecksig.c:728 lib/rpmchecksig.c:742
+#: lib/rpmchecksig.c:771 lib/rpmchecksig.c:785
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:729 lib/rpmchecksig.c:743
+#: lib/rpmchecksig.c:772 lib/rpmchecksig.c:786
 msgid " (UNTRUSTED KEYS:"
 msgstr "(NIEWIARYGODNE KLUCZE:"
 
-#: lib/rpmchecksig.c:731 lib/rpmchecksig.c:745
+#: lib/rpmchecksig.c:774 lib/rpmchecksig.c:788
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:739
+#: lib/rpmchecksig.c:782
 msgid "OK"
 msgstr "OK"
 
@@ -2722,148 +2746,146 @@ msgstr ""
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "Nie mo¿na otworzyæ %s do odczytu: %s."
 
-#: lib/signature.c:117
+#: lib/signature.c:118
 msgid "file is not regular -- skipping size check\n"
 msgstr "plik nieregularny -- sprawdzanie rozmiaru pominiête\n"
 
-#: lib/signature.c:126
+#: lib/signature.c:127
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:131
+#: lib/signature.c:132
 #, fuzzy, c-format
 msgid "  Actual size: %12d\n"
 msgstr "Rozmiar sygnatury: %d\n"
 
-#: lib/signature.c:151
+#: lib/signature.c:152
 msgid "No signature\n"
 msgstr "Brak sygnatury\n"
 
-#: lib/signature.c:155
+#: lib/signature.c:156
 msgid "Old PGP signature\n"
 msgstr "Stara sygnatura PGP\n"
 
-#: lib/signature.c:168
+#: lib/signature.c:169
 #, 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:224
+#: lib/signature.c:225
 #, fuzzy, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "Rozmiar sygnatury: %d\n"
 
-#: lib/signature.c:299 lib/signature.c:397 lib/signature.c:537
-#: lib/signature.c:569
+#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:656
+#: lib/signature.c:688
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "Nie mo¿na uruchomiæ %s"
 
-#: lib/signature.c:315
+#: lib/signature.c:322
 #, fuzzy
 msgid "pgp failed\n"
 msgstr "pgp nie powiod³o siê"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:322
+#: lib/signature.c:329
 #, fuzzy
 msgid "pgp failed to write signature\n"
 msgstr "zapisanie sygnatury przez pgp nie powiod³o siê"
 
-#: lib/signature.c:327
+#: lib/signature.c:334
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr "rozmiar sygnatury PGP: %d\n"
 
-#: lib/signature.c:343 lib/signature.c:442
+#: lib/signature.c:350 lib/signature.c:450
 #, fuzzy
 msgid "unable to read the signature\n"
 msgstr "nie mo¿na odczytaæ sygnatury"
 
-#: lib/signature.c:348
+#: lib/signature.c:355
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr "Mam %d bajtów sygnatury PGP\n"
 
-#: lib/signature.c:414
+#: lib/signature.c:422
 #, fuzzy
 msgid "gpg failed\n"
 msgstr "gpg nie powiod³o siê"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:421
+#: lib/signature.c:429
 #, fuzzy
 msgid "gpg failed to write signature\n"
 msgstr "zapisanie sygnatury przez gpg nie powiod³o siê"
 
-#: lib/signature.c:426
+#: lib/signature.c:434
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr "rozmiar sygnatury GPG: %d\n"
 
-#: lib/signature.c:447
+#: lib/signature.c:455
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr "Mam %d bajtów sygnatury GPG\n"
 
-#: lib/signature.c:475
-#, fuzzy
-msgid "Generating signature using PGP.\n"
-msgstr "Generowanie sygnatury: %d\n"
-
-#: lib/signature.c:481
-#, fuzzy
-msgid "Generating signature using GPG.\n"
-msgstr "Generowanie sygnatury: %d\n"
-
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:574 lib/signature.c:627
+#: lib/signature.c:693 lib/signature.c:747
 #, fuzzy, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "B³êdny %%_signature spec w pliku makra.\n"
 
-#: lib/signature.c:607
+#: lib/signature.c:727
 #, 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:619
+#: lib/signature.c:739
 #, fuzzy, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "Musisz ustawiæ \"%%_pgp_name\" w pliku swego makra"
 
-#: lib/signature.c:663
+#: lib/signature.c:783
 #, fuzzy
 msgid "Header+Payload size: "
 msgstr "Rozmiar nag³ówka jest zbyt du¿y"
 
-#: lib/signature.c:692
+#: lib/signature.c:823
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:732
+#: lib/signature.c:880
+msgid "Header SHA1 digest: "
+msgstr ""
+
+#: lib/signature.c:1042
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "pomiñ wszelkie sygnatury MD5"
 
-#: lib/signature.c:822
+#: lib/signature.c:1135
+msgid "Header "
+msgstr ""
+
+#: lib/signature.c:1136
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "Brak sygnatury\n"
 
-#: lib/signature.c:886
+#: lib/signature.c:1214
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:906
+#: lib/signature.c:1240
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:910
+#: lib/signature.c:1244
 #, fuzzy, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Blok sygnatury: %d\n"
@@ -3139,42 +3161,42 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging"
 msgstr ""
 
 #. @-modfilesys@
-#: rpmdb/rpmdb.c:129
+#: rpmdb/rpmdb.c:163
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:387
+#: rpmdb/rpmdb.c:440
 #, fuzzy, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr "nie mo¿na otworzyæ %s przy %s:%d"
 
-#: rpmdb/rpmdb.c:409
+#: rpmdb/rpmdb.c:462
 #, fuzzy, c-format
 msgid "cannot open %s index\n"
 msgstr "nie mo¿na otworzyæ %s\n"
 
-#: rpmdb/rpmdb.c:501
+#: rpmdb/rpmdb.c:554
 #, fuzzy, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "b³±d pobierania rekordu %s z %s"
 
-#: rpmdb/rpmdb.c:632
+#: rpmdb/rpmdb.c:685
 #, fuzzy, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "b³±d zapisywania rekordu %s do %s"
 
-#: rpmdb/rpmdb.c:642
+#: rpmdb/rpmdb.c:695
 #, fuzzy, c-format
 msgid "error(%d) removing record %s from %s\n"
 msgstr "b³±d usuwania rekordu %s z %s"
 
-#: rpmdb/rpmdb.c:906
+#: rpmdb/rpmdb.c:959
 #, fuzzy
 msgid "no dbpath has been set\n"
 msgstr "¶cie¿ka bazy danych nie zosta³a podana"
 
-#: rpmdb/rpmdb.c:1054
+#: rpmdb/rpmdb.c:1107
 #, fuzzy
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
@@ -3184,115 +3206,115 @@ msgstr ""
 "nowym formacie"
 
 #. error
-#: rpmdb/rpmdb.c:1319
+#: rpmdb/rpmdb.c:1372
 #, fuzzy, c-format
 msgid "error(%d) counting packages\n"
 msgstr "b³±d szukania pakietu %s\n"
 
-#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3372
+#: rpmdb/rpmdb.c:2150 rpmdb/rpmdb.c:3502
 #, fuzzy, c-format
 msgid "record number %u in database is bad -- skipping.\n"
 msgstr "rekord numer %d w bazie danych jest b³êdny -- rekord pominiêto"
 
-#: rpmdb/rpmdb.c:2150
+#: rpmdb/rpmdb.c:2203
 #, c-format
 msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2420
+#: rpmdb/rpmdb.c:2473
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "nie mo¿na odczytaæ nag³ówka przy %d dla poszukiwania"
 
-#: rpmdb/rpmdb.c:2540
+#: rpmdb/rpmdb.c:2634
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "usuwanie indeksu grupy\n"
 
-#: rpmdb/rpmdb.c:2544
+#: rpmdb/rpmdb.c:2638
 #, fuzzy, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "usuwanie indeksu nazw\n"
 
-#: rpmdb/rpmdb.c:2714
+#: rpmdb/rpmdb.c:2808
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "b³±d szukania pakietu %s\n"
 
-#: rpmdb/rpmdb.c:2873
+#: rpmdb/rpmdb.c:3003
 #, fuzzy, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "zmiana nazwy %s na %s\n"
 
-#: rpmdb/rpmdb.c:2877
+#: rpmdb/rpmdb.c:3007
 #, fuzzy, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "zmiana nazwy %s na %s\n"
 
-#: rpmdb/rpmdb.c:3258
+#: rpmdb/rpmdb.c:3388
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3291
+#: rpmdb/rpmdb.c:3421
 msgid "no dbpath has been set"
 msgstr "¶cie¿ka bazy danych nie zosta³a podana"
 
-#: rpmdb/rpmdb.c:3318
+#: rpmdb/rpmdb.c:3448
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "odbudowywujê bazê danych w rootdir %s\n"
 
-#: rpmdb/rpmdb.c:3322
+#: rpmdb/rpmdb.c:3452
 #, fuzzy, c-format
 msgid "temporary database %s already exists\n"
 msgstr "tymczasowa baza danych %s ju¿ istnieje"
 
-#: rpmdb/rpmdb.c:3328
+#: rpmdb/rpmdb.c:3458
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "tworzenie katalogu: %s\n"
 
-#: rpmdb/rpmdb.c:3330
+#: rpmdb/rpmdb.c:3460
 #, fuzzy, c-format
 msgid "creating directory %s: %s\n"
 msgstr "tworzenie katalogu: %s\n"
 
-#: rpmdb/rpmdb.c:3337
+#: rpmdb/rpmdb.c:3467
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "otwieranie starej bazy danych\n"
 
-#: rpmdb/rpmdb.c:3348
+#: rpmdb/rpmdb.c:3478
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "otwieranie nowej bazy danych\n"
 
-#: rpmdb/rpmdb.c:3412
+#: rpmdb/rpmdb.c:3542
 #, fuzzy, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "nie mo¿na dodaæ rekordu oryginalnie przy %d"
 
-#: rpmdb/rpmdb.c:3430
+#: rpmdb/rpmdb.c:3560
 #, fuzzy
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr "przebudowanie bazy nie powiod³o siê; stara pozosta³a na miejscu\n"
 
-#: rpmdb/rpmdb.c:3438
+#: rpmdb/rpmdb.c:3568
 msgid "failed to replace old database with new database!\n"
 msgstr "zamiana starej bazy na now± nie powiod³a siê!\n"
 
-#: rpmdb/rpmdb.c:3440
+#: rpmdb/rpmdb.c:3570
 #, fuzzy, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "naprawcze zastêpowanie plików w %s plikami z %s"
 
-#: rpmdb/rpmdb.c:3450
+#: rpmdb/rpmdb.c:3580
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "tworzenie katalogu: %s\n"
 
-#: rpmdb/rpmdb.c:3452
+#: rpmdb/rpmdb.c:3582
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "usuniêcie katalogu %s nie powiod³o siê: %s\n"
@@ -3508,6 +3530,14 @@ msgstr "port musi byæ liczb±\n"
 msgid "failed to create %s: %s\n"
 msgstr "utworzenie %s nie powiod³o siê\n"
 
+#, fuzzy
+#~ msgid "Generating signature using PGP.\n"
+#~ msgstr "Generowanie sygnatury: %d\n"
+
+#, fuzzy
+#~ msgid "Generating signature using GPG.\n"
+#~ msgstr "Generowanie sygnatury: %d\n"
+
 #~ msgid "no packages given for uninstall"
 #~ msgstr "nie podano nazw plików do usuniêcia"
 
@@ -4659,9 +4689,6 @@ msgstr "utworzenie %s nie powiod³o siê\n"
 #~ msgid "expected size   : %d\n"
 #~ msgstr "oczekiwany rozmiar: %d\n"
 
-#~ msgid "New Header signature\n"
-#~ msgstr "Nowa sygnatura nag³ówka\n"
-
 #~ msgid "path %s is not relocateable for package %s-%s-%s"
 #~ msgstr "nie mo¿na u¿yæ ¶cie¿ki %s przy przesuwaniu pakietu %s-%s-%s"
 
diff --git a/po/pt.po b/po/pt.po
index 21f86b2ec..e5241fa34 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-02-10 13:58-0500\n"
+"POT-Creation-Date: 2002-03-06 18:13-0500\n"
 "PO-Revision-Date: 2000-06-22 01:13+01:00\n"
 "Last-Translator: José Nuno Coelho Sanarra Pires\n"
 "Language-Team: pt <kde@poli.org>\n"
@@ -189,7 +189,8 @@ msgid "RPM version %s\n"
 msgstr "RPM versão %s\n"
 
 #: rpmqv.c:235
-msgid "Copyright (C) 1998-2000 - Red Hat, Inc."
+#, fuzzy
+msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
 msgstr "Copyright (C) 1998-2000 - Red Hat, Inc."
 
 #: rpmqv.c:236
@@ -427,7 +428,7 @@ msgstr "argumentos inesperados no --querytags "
 msgid "no arguments given"
 msgstr "não foram indicados argumentos para a pesquisa"
 
-#: build/build.c:125 build/pack.c:479
+#: build/build.c:125 build/pack.c:483
 msgid "Unable to open temp file.\n"
 msgstr "Não consegui abrir um ficheiro temporário.\n"
 
@@ -774,7 +775,7 @@ msgstr "readRPM: aceder ao %s: %s\n"
 msgid "readRPM: read %s: %s\n"
 msgstr "readRPM: ler o %s: %s\n"
 
-#: build/pack.c:305 build/pack.c:521
+#: build/pack.c:305 build/pack.c:529
 #, fuzzy, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: O fread falhou: %s\n"
@@ -789,81 +790,81 @@ msgstr "readRPM: o %s não é um pacote RPM\n"
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: a ler o cabeçalho do %s\n"
 
-#: build/pack.c:467
+#: build/pack.c:471
 #, fuzzy
 msgid "Unable to create immutable header region.\n"
 msgstr "Não consegui ler o cabeçalho de %s: %s\n"
 
-#: build/pack.c:485
+#: build/pack.c:490
 #, fuzzy
 msgid "Unable to write temp header\n"
 msgstr "Não consegui gravar o cabeçalho de %s: %s\n"
 
-#: build/pack.c:493
+#: build/pack.c:500
 msgid "Bad CSA data\n"
 msgstr "Dados de CSA inválidos\n"
 
-#: build/pack.c:528
+#: build/pack.c:536
 #, fuzzy
 msgid "Unable to write final header\n"
 msgstr "Não consegui gravar o cabeçalho de %s: %s\n"
 
-#: build/pack.c:546
+#: build/pack.c:556
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "A gerar a assinatura: %d\n"
 
-#: build/pack.c:559
+#: build/pack.c:574
 #, fuzzy
 msgid "Unable to reload signature header.\n"
 msgstr "Não consegui ler o cabeçalho de %s: %s\n"
 
-#: build/pack.c:567
+#: build/pack.c:582
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr "Não consigo aceder ao %s: %s\n"
 
-#: build/pack.c:603 lib/psm.c:1444
+#: build/pack.c:618 lib/psm.c:1444
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Não consegui gravar o pacote: %s\n"
 
-#: build/pack.c:618
+#: build/pack.c:633
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "Não consegui abrir o sigtarget %s: %s\n"
 
-#: build/pack.c:628
+#: build/pack.c:644
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "Não consegui ler o cabeçalho de %s: %s\n"
 
-#: build/pack.c:642
+#: build/pack.c:658
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "Não consegui gravar o cabeçalho de %s: %s\n"
 
-#: build/pack.c:652
+#: build/pack.c:668
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "Não consegui ler o conteúdo de %s: %s\n"
 
-#: build/pack.c:658
+#: build/pack.c:674
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Não consegui escrever o conteúdo de %s: %s\n"
 
-#: build/pack.c:683 lib/psm.c:1725
+#: build/pack.c:699 lib/psm.c:1725
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Gravei: %s\n"
 
-#: build/pack.c:750
+#: build/pack.c:766
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr "Não consigo gerar o ficheiro de saída para o pacote %s: %s\n"
 
-#: build/pack.c:767
+#: build/pack.c:783
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr "não consigo criar o %s: %s\n"
@@ -1606,41 +1607,51 @@ msgstr "%s criado como %s\n"
 msgid "error creating temporary file %s\n"
 msgstr "erro ao criar o ficheiro temporário %s\n"
 
-#: lib/package.c:167 lib/package.c:238
+#: lib/package.c:179 lib/package.c:255
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr "a versão 1 dos pacotes não é suportada por esta versão do RPM\n"
 
-#: lib/package.c:188 lib/package.c:246
+#: lib/package.c:200 lib/package.c:263
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr "só os pacotes com versão <= 4 são suportados por esta versão do RPM\n"
 
-#: lib/package.c:224 lib/rpmchecksig.c:156 lib/rpmchecksig.c:522
+#: lib/package.c:241 lib/rpmchecksig.c:161 lib/rpmchecksig.c:541
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ":%s: o readLead falhou\n"
 
-#: lib/package.c:230
+#: lib/package.c:247
 #, fuzzy, c-format
 msgid "%s: bad magic\n"
 msgstr "Código de integridade inválido"
 
-#: lib/package.c:254 lib/rpmchecksig.c:174 lib/rpmchecksig.c:538
+#: lib/package.c:272 lib/rpmchecksig.c:179 lib/rpmchecksig.c:557
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: o rpmReadSignature falhou\n"
 
-#: lib/package.c:258 lib/rpmchecksig.c:178 lib/rpmchecksig.c:543
+#: lib/package.c:276 lib/rpmchecksig.c:183 lib/rpmchecksig.c:562
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Nenhuma assinatura disponível\n"
 
-#: lib/package.c:284
+#: lib/package.c:304 lib/rpmchecksig.c:462
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr ":%s: o readLead falhou\n"
 
-#: lib/package.c:303 lib/rpmchecksig.c:107 lib/rpmchecksig.c:466
+#. Parse the parameters from the OpenPGP packets that will be needed.
+#: lib/package.c:334 lib/rpmchecksig.c:631
+msgid "========== Header DSA signature\n"
+msgstr ""
+
+#. Parse the parameters from the OpenPGP packets that will be needed.
+#: lib/package.c:357
+msgid "========== Package DSA/RSA signature\n"
+msgstr ""
+
+#: lib/package.c:366 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: O fread falhou: %s\n"
@@ -2376,66 +2387,81 @@ msgstr "ficheiro db inválido %s\n"
 msgid "(added provide)"
 msgstr "%s: %-45s SI (oferecidos pelo db)\n"
 
-#: lib/rpmchecksig.c:49
+#: lib/rpmchecksig.c:51
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s: o acesso falhou: %s\n"
 
-#: lib/rpmchecksig.c:61
+#: lib/rpmchecksig.c:63
 msgid "makeTempFile failed\n"
 msgstr "o makeTempFile falhou\n"
 
-#: lib/rpmchecksig.c:101
+#: lib/rpmchecksig.c:104
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: O fwrite falhou: %s\n"
 
-#: lib/rpmchecksig.c:161
-#, c-format
-msgid "%s: Can't sign v1.0 RPM\n"
+#: lib/rpmchecksig.c:166
+#, fuzzy, c-format
+msgid "%s: Can't sign v1 packaging\n"
 msgstr "%s: Não consigo assinar o RPM v1.0\n"
 
-#: lib/rpmchecksig.c:165
-#, c-format
-msgid "%s: Can't re-sign v2.0 RPM\n"
+#: lib/rpmchecksig.c:170
+#, fuzzy, c-format
+msgid "%s: Can't re-sign v2 packaging\n"
 msgstr "%s: não consigo assinar de novo o RPM v2.0\n"
 
-#: lib/rpmchecksig.c:229
+#: lib/rpmchecksig.c:239
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: o writeLead falhou: %s\n"
 
-#: lib/rpmchecksig.c:235
+#: lib/rpmchecksig.c:245
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: o rpmWriteSignature falhou: %s\n"
 
-#: lib/rpmchecksig.c:528
+#: lib/rpmchecksig.c:476
+#, fuzzy, c-format
+msgid "%s: headerGetEntry failed\n"
+msgstr ":%s: o readLead falhou\n"
+
+#: lib/rpmchecksig.c:547
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: Nenhuma assinatura disponível (RPM v1.0)\n"
 
-#: lib/rpmchecksig.c:725
+#: lib/rpmchecksig.c:618
+#, fuzzy
+msgid "========== Package RSA signature\n"
+msgstr "========== a realizar o tsort nos pacotes\n"
+
+#: lib/rpmchecksig.c:637
+#, fuzzy
+msgid "========== Package DSA signature\n"
+msgstr "========== a realizar o tsort nos pacotes\n"
+
+#: lib/rpmchecksig.c:768
 msgid "NOT OK"
 msgstr "NÃO-OK"
 
-#: lib/rpmchecksig.c:726 lib/rpmchecksig.c:740
+#: lib/rpmchecksig.c:769 lib/rpmchecksig.c:783
 msgid " (MISSING KEYS:"
 msgstr " (FALTAM AS CHAVES:"
 
-#: lib/rpmchecksig.c:728 lib/rpmchecksig.c:742
+#: lib/rpmchecksig.c:771 lib/rpmchecksig.c:785
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:729 lib/rpmchecksig.c:743
+#: lib/rpmchecksig.c:772 lib/rpmchecksig.c:786
 msgid " (UNTRUSTED KEYS:"
 msgstr " (CHAVES SUSPEITAS:"
 
-#: lib/rpmchecksig.c:731 lib/rpmchecksig.c:745
+#: lib/rpmchecksig.c:774 lib/rpmchecksig.c:788
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:739
+#: lib/rpmchecksig.c:782
 msgid "OK"
 msgstr "OK"
 
@@ -2647,140 +2673,140 @@ msgstr "Não consigo ler o %s, a HOME é demasiado grande.\n"
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "Não consegui abrir o %s para leitura: %s.\n"
 
-#: lib/signature.c:117
+#: lib/signature.c:118
 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:126
+#: lib/signature.c:127
 #, 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:131
+#: lib/signature.c:132
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr "  Tamanho real: %12d\n"
 
-#: lib/signature.c:151
+#: lib/signature.c:152
 msgid "No signature\n"
 msgstr "Sem assinatura\n"
 
-#: lib/signature.c:155
+#: lib/signature.c:156
 msgid "Old PGP signature\n"
 msgstr "Assinatura PGP antiga\n"
 
-#: lib/signature.c:168
+#: lib/signature.c:169
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr "Assinatura (só interna) antiga! Como é que obteve isto!?\n"
 
-#: lib/signature.c:224
+#: lib/signature.c:225
 #, fuzzy, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "Tamanho da assinatura: %d\n"
 
-#: lib/signature.c:299 lib/signature.c:397 lib/signature.c:537
-#: lib/signature.c:569
+#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:656
+#: lib/signature.c:688
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "Não consegui executar o %s: %S\n"
 
-#: lib/signature.c:315
+#: lib/signature.c:322
 msgid "pgp failed\n"
 msgstr "o pgp falhou\n"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:322
+#: lib/signature.c:329
 msgid "pgp failed to write signature\n"
 msgstr "o pgp não conseguiu gravar a assinatura\n"
 
-#: lib/signature.c:327
+#: lib/signature.c:334
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr "tamanho da assinatura do PGP: %d\n"
 
-#: lib/signature.c:343 lib/signature.c:442
+#: lib/signature.c:350 lib/signature.c:450
 msgid "unable to read the signature\n"
 msgstr "incapaz de ler a assinatura\n"
 
-#: lib/signature.c:348
+#: lib/signature.c:355
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr "Obtive %d bytes da assinatura PGP\n"
 
-#: lib/signature.c:414
+#: lib/signature.c:422
 msgid "gpg failed\n"
 msgstr "o gpg falhou\n"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:421
+#: lib/signature.c:429
 msgid "gpg failed to write signature\n"
 msgstr "o gpg não conseguiu gravar a assinatura\n"
 
-#: lib/signature.c:426
+#: lib/signature.c:434
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr "Tamanho da assinatura do GPG: %d\n"
 
-#: lib/signature.c:447
+#: lib/signature.c:455
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr "Obtive %d bytes da assinatura do GPG\n"
 
-#: lib/signature.c:475
-msgid "Generating signature using PGP.\n"
-msgstr "A gerar a assinatura usando o PGP.\n"
-
-#: lib/signature.c:481
-msgid "Generating signature using GPG.\n"
-msgstr "A gerar a assinatura usando o PGP.\n"
-
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:574 lib/signature.c:627
+#: lib/signature.c:693 lib/signature.c:747
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "'Spec' %%_signature inválido no ficheiro de macros\n"
 
-#: lib/signature.c:607
+#: lib/signature.c:727
 #, 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:619
+#: lib/signature.c:739
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "Precisa definir o \"%%_pgp_name\" no seu ficheiro de macros\n"
 
-#: lib/signature.c:663
+#: lib/signature.c:783
 #, fuzzy
 msgid "Header+Payload size: "
 msgstr "Tamanho do cabeçalho demasiado grande"
 
-#: lib/signature.c:692
+#: lib/signature.c:823
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:732
+#: lib/signature.c:880
+msgid "Header SHA1 digest: "
+msgstr ""
+
+#: lib/signature.c:1042
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "ignorar as assinaturas de MD5"
 
-#: lib/signature.c:822
+#: lib/signature.c:1135
+msgid "Header "
+msgstr ""
+
+#: lib/signature.c:1136
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "Sem assinatura\n"
 
-#: lib/signature.c:886
+#: lib/signature.c:1214
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:906
+#: lib/signature.c:1240
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:910
+#: lib/signature.c:1244
 #, fuzzy, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "'Pad' ou preenchimento da assinatura: %d\n"
@@ -3053,155 +3079,155 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging"
 msgstr "gerar os cabeçalhos compatíveis com o formato do rpm[23]"
 
 #. @-modfilesys@
-#: rpmdb/rpmdb.c:129
+#: rpmdb/rpmdb.c:163
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr "dbiTagsInit: nome de opção não reconhecido: \"%s\" ignorado\n"
 
-#: rpmdb/rpmdb.c:387
+#: rpmdb/rpmdb.c:440
 #, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr "não consigo abrir o índice de %s usando o db%d - %s (%d)\n"
 
-#: rpmdb/rpmdb.c:409
+#: rpmdb/rpmdb.c:462
 #, c-format
 msgid "cannot open %s index\n"
 msgstr "não consigo abrir o índice do %s\n"
 
-#: rpmdb/rpmdb.c:501
+#: rpmdb/rpmdb.c:554
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "erro(%d) ao obter os registos \"%s\" do índice %s\n"
 
-#: rpmdb/rpmdb.c:632
+#: rpmdb/rpmdb.c:685
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "erro(%d) ao guardar o registo %s em %s\n"
 
-#: rpmdb/rpmdb.c:642
+#: rpmdb/rpmdb.c:695
 #, c-format
 msgid "error(%d) removing record %s from %s\n"
 msgstr "erro(%d) ao remover o registo %s do %s\n"
 
-#: rpmdb/rpmdb.c:906
+#: rpmdb/rpmdb.c:959
 msgid "no dbpath has been set\n"
 msgstr "não foi definido o dbpath\n"
 
-#: rpmdb/rpmdb.c:1054
+#: rpmdb/rpmdb.c:1107
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database\n"
 msgstr "está presente uma base de dados antiga; use o --rebuildb para gerar uma base de dados no novo formato\n"
 
 #. error
-#: rpmdb/rpmdb.c:1319
+#: rpmdb/rpmdb.c:1372
 #, c-format
 msgid "error(%d) counting packages\n"
 msgstr "erro(%d) ao contar os pacotes\n"
 
-#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3372
+#: rpmdb/rpmdb.c:2150 rpmdb/rpmdb.c:3502
 #, fuzzy, c-format
 msgid "record number %u in database is bad -- skipping.\n"
 msgstr "o número do registo %d na base de dados está errado -- a ignorar.\n"
 
-#: rpmdb/rpmdb.c:2150
+#: rpmdb/rpmdb.c:2203
 #, c-format
 msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2420
+#: rpmdb/rpmdb.c:2473
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "%s: não consigo ler o cabeçalho em 0x%x\n"
 
-#: rpmdb/rpmdb.c:2540
+#: rpmdb/rpmdb.c:2634
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "a remover o \"%s\" do índice %s.\n"
 
-#: rpmdb/rpmdb.c:2544
+#: rpmdb/rpmdb.c:2638
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "a remover %d registos do índice %s.\n"
 
-#: rpmdb/rpmdb.c:2714
+#: rpmdb/rpmdb.c:2808
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "erro(%d) ao criar uma nova instância do pacote\n"
 
-#: rpmdb/rpmdb.c:2873
+#: rpmdb/rpmdb.c:3003
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "a adicionar o \"%s\" ao índice %s.\n"
 
-#: rpmdb/rpmdb.c:2877
+#: rpmdb/rpmdb.c:3007
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "a adicionar %d registos ao índice %s.\n"
 
-#: rpmdb/rpmdb.c:3258
+#: rpmdb/rpmdb.c:3388
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr "a remover o %s depois duma reconstrução bem sucedida do db3.\n"
 
-#: rpmdb/rpmdb.c:3291
+#: rpmdb/rpmdb.c:3421
 msgid "no dbpath has been set"
 msgstr "não foi definido o dbpath"
 
-#: rpmdb/rpmdb.c:3318
+#: rpmdb/rpmdb.c:3448
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "a reconstruir a base de dados %s em %s\n"
 
-#: rpmdb/rpmdb.c:3322
+#: rpmdb/rpmdb.c:3452
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr "A base de dados temporária %s já existe\n"
 
-#: rpmdb/rpmdb.c:3328
+#: rpmdb/rpmdb.c:3458
 #, c-format
 msgid "creating directory %s\n"
 msgstr "a criar a directoria %s\n"
 
-#: rpmdb/rpmdb.c:3330
+#: rpmdb/rpmdb.c:3460
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr "a criar a directoria %s: %s\n"
 
-#: rpmdb/rpmdb.c:3337
+#: rpmdb/rpmdb.c:3467
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "a abrir a base de dados antiga com a dbapi %d\n"
 
-#: rpmdb/rpmdb.c:3348
+#: rpmdb/rpmdb.c:3478
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "a abrir a base de dados nova com a dbapi %d\n"
 
-#: rpmdb/rpmdb.c:3412
+#: rpmdb/rpmdb.c:3542
 #, fuzzy, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "não consigo adicionar o registo originalmente em %d\n"
 
-#: rpmdb/rpmdb.c:3430
+#: rpmdb/rpmdb.c:3560
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr "falhou a reconstrução da base de dados: a base de dados original mantém-se\n"
 
-#: rpmdb/rpmdb.c:3438
+#: rpmdb/rpmdb.c:3568
 msgid "failed to replace old database with new database!\n"
 msgstr "falhou a substituição da base de dados antiga pela nova!\n"
 
-#: rpmdb/rpmdb.c:3440
+#: rpmdb/rpmdb.c:3570
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "substituir os ficheiros em %s por ficheiros de %s a recuperar"
 
-#: rpmdb/rpmdb.c:3450
+#: rpmdb/rpmdb.c:3580
 #, c-format
 msgid "removing directory %s\n"
 msgstr "a remover a directoria %s\n"
 
-#: rpmdb/rpmdb.c:3452
+#: rpmdb/rpmdb.c:3582
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "falhou a remoção da directoria %s: %s\n"
@@ -3413,6 +3439,12 @@ msgstr "o porto do URL tem de ser um número\n"
 msgid "failed to create %s: %s\n"
 msgstr "não consegui criar o %s: %s\n"
 
+#~ msgid "Generating signature using PGP.\n"
+#~ msgstr "A gerar a assinatura usando o PGP.\n"
+
+#~ msgid "Generating signature using GPG.\n"
+#~ msgstr "A gerar a assinatura usando o PGP.\n"
+
 #~ msgid "no packages given for uninstall"
 #~ msgstr "não foram indicados pacote para desinstalar"
 
@@ -4214,9 +4246,6 @@ msgstr "não consegui criar o %s: %s\n"
 #~ msgid "locked  db index       %s/%s\n"
 #~ msgstr "tranquei o índice do db     %s/%s\n"
 
-#~ msgid "========== tsorting packages\n"
-#~ msgstr "========== a realizar o tsort nos pacotes\n"
-
 #~ msgid ""
 #~ "--notriggers may only be specified during package installation, erasure, "
 #~ "and verification"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index e4e5835bc..dd060497e 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-02-10 13:58-0500\n"
+"POT-Creation-Date: 2002-03-06 18:13-0500\n"
 
 #: build.c:36
 #, fuzzy
@@ -203,7 +203,7 @@ msgid "RPM version %s\n"
 msgstr "RPM verso %s\n"
 
 #: rpmqv.c:235
-msgid "Copyright (C) 1998-2000 - Red Hat, Inc."
+msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
 msgstr ""
 
 #: rpmqv.c:236
@@ -476,7 +476,7 @@ msgid "no arguments given"
 msgstr "no foi passado argumento para pesquisa"
 
 # , c-format
-#: build/build.c:125 build/pack.c:479
+#: build/build.c:125 build/pack.c:483
 #, fuzzy
 msgid "Unable to open temp file.\n"
 msgstr "No consegui abrir: %s\n"
@@ -857,7 +857,7 @@ msgid "readRPM: read %s: %s\n"
 msgstr "No consegui ler o arquivo spec de %s\n"
 
 # , c-format
-#: build/pack.c:305 build/pack.c:521
+#: build/pack.c:305 build/pack.c:529
 #, fuzzy, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "No consegui abrir: %s\n"
@@ -873,92 +873,92 @@ msgid "readRPM: reading header from %s\n"
 msgstr ""
 
 # , c-format
-#: build/pack.c:467
+#: build/pack.c:471
 #, fuzzy
 msgid "Unable to create immutable header region.\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:485
+#: build/pack.c:490
 #, fuzzy
 msgid "Unable to write temp header\n"
 msgstr "No consegui abrir: %s\n"
 
-#: build/pack.c:493
+#: build/pack.c:500
 msgid "Bad CSA data\n"
 msgstr ""
 
 # , c-format
-#: build/pack.c:528
+#: build/pack.c:536
 #, fuzzy
 msgid "Unable to write final header\n"
 msgstr "No consegui abrir: %s\n"
 
-#: build/pack.c:546
+#: build/pack.c:556
 #, fuzzy, c-format
 msgid "Generating signature: %d\n"
 msgstr "gere assinatura PGP"
 
 # , c-format
-#: build/pack.c:559
+#: build/pack.c:574
 #, fuzzy
 msgid "Unable to reload signature header.\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:567
+#: build/pack.c:582
 #, fuzzy, c-format
 msgid "Could not open %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:603 lib/psm.c:1444
+#: build/pack.c:618 lib/psm.c:1444
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:618
+#: build/pack.c:633
 #, fuzzy, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:628
+#: build/pack.c:644
 #, fuzzy, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:642
+#: build/pack.c:658
 #, fuzzy, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:652
+#: build/pack.c:668
 #, fuzzy, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: build/pack.c:658
+#: build/pack.c:674
 #, fuzzy, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: build/pack.c:683 lib/psm.c:1725
+#: build/pack.c:699 lib/psm.c:1725
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:750
+#: build/pack.c:766
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
 # , c-format
-#: build/pack.c:767
+#: build/pack.c:783
 #, fuzzy, c-format
 msgid "cannot create %s: %s\n"
 msgstr "No consegui abrir: %s\n"
@@ -1769,43 +1769,54 @@ msgstr "No consegui abrir: %s\n"
 msgid "error creating temporary file %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/package.c:167 lib/package.c:238
+#: lib/package.c:179 lib/package.c:255
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:188 lib/package.c:246
+#: lib/package.c:200 lib/package.c:263
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:224 lib/rpmchecksig.c:156 lib/rpmchecksig.c:522
+#: lib/package.c:241 lib/rpmchecksig.c:161 lib/rpmchecksig.c:541
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
 
-#: lib/package.c:230
+#: lib/package.c:247
 #, c-format
 msgid "%s: bad magic\n"
 msgstr ""
 
-#: lib/package.c:254 lib/rpmchecksig.c:174 lib/rpmchecksig.c:538
+#: lib/package.c:272 lib/rpmchecksig.c:179 lib/rpmchecksig.c:557
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/package.c:258 lib/rpmchecksig.c:178 lib/rpmchecksig.c:543
+#: lib/package.c:276 lib/rpmchecksig.c:183 lib/rpmchecksig.c:562
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
 # , c-format
-#: lib/package.c:284
+#: lib/package.c:304 lib/rpmchecksig.c:462
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "No consegui abrir: %s\n"
 
+#. Parse the parameters from the OpenPGP packets that will be needed.
+#: lib/package.c:334 lib/rpmchecksig.c:631
+#, fuzzy
+msgid "========== Header DSA signature\n"
+msgstr "gere assinatura PGP"
+
+#. Parse the parameters from the OpenPGP packets that will be needed.
+#: lib/package.c:357
+msgid "========== Package DSA/RSA signature\n"
+msgstr ""
+
 # , c-format
-#: lib/package.c:303 lib/rpmchecksig.c:107 lib/rpmchecksig.c:466
+#: lib/package.c:366 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
 #, fuzzy, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "No consegui abrir: %s\n"
@@ -2579,69 +2590,83 @@ msgid "(added provide)"
 msgstr ""
 
 # , c-format
-#: lib/rpmchecksig.c:49
+#: lib/rpmchecksig.c:51
 #, fuzzy, c-format
 msgid "%s: open failed: %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/rpmchecksig.c:61
+#: lib/rpmchecksig.c:63
 #, fuzzy
 msgid "makeTempFile failed\n"
 msgstr "Construo falhou.\n"
 
 # , c-format
-#: lib/rpmchecksig.c:101
+#: lib/rpmchecksig.c:104
 #, fuzzy, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/rpmchecksig.c:161
+#: lib/rpmchecksig.c:166
 #, c-format
-msgid "%s: Can't sign v1.0 RPM\n"
+msgid "%s: Can't sign v1 packaging\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:165
+#: lib/rpmchecksig.c:170
 #, c-format
-msgid "%s: Can't re-sign v2.0 RPM\n"
+msgid "%s: Can't re-sign v2 packaging\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:229
+#: lib/rpmchecksig.c:239
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
 # , c-format
-#: lib/rpmchecksig.c:235
+#: lib/rpmchecksig.c:245
 #, fuzzy, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/rpmchecksig.c:528
+# , c-format
+#: lib/rpmchecksig.c:476
+#, fuzzy, c-format
+msgid "%s: headerGetEntry failed\n"
+msgstr "No consegui abrir: %s\n"
+
+#: lib/rpmchecksig.c:547
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:725
+#: lib/rpmchecksig.c:618
+msgid "========== Package RSA signature\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:637
+msgid "========== Package DSA signature\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:768
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:726 lib/rpmchecksig.c:740
+#: lib/rpmchecksig.c:769 lib/rpmchecksig.c:783
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:728 lib/rpmchecksig.c:742
+#: lib/rpmchecksig.c:771 lib/rpmchecksig.c:785
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:729 lib/rpmchecksig.c:743
+#: lib/rpmchecksig.c:772 lib/rpmchecksig.c:786
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:731 lib/rpmchecksig.c:745
+#: lib/rpmchecksig.c:774 lib/rpmchecksig.c:788
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:739
+#: lib/rpmchecksig.c:782
 msgid "OK"
 msgstr ""
 
@@ -2872,148 +2897,146 @@ msgstr ""
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "No consegui abrir: %s\n"
 
-#: lib/signature.c:117
+#: lib/signature.c:118
 msgid "file is not regular -- skipping size check\n"
 msgstr ""
 
-#: lib/signature.c:126
+#: lib/signature.c:127
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:131
+#: lib/signature.c:132
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:151
+#: lib/signature.c:152
 msgid "No signature\n"
 msgstr ""
 
-#: lib/signature.c:155
+#: lib/signature.c:156
 #, fuzzy
 msgid "Old PGP signature\n"
 msgstr "gere assinatura PGP"
 
-#: lib/signature.c:168
+#: lib/signature.c:169
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr ""
 
-#: lib/signature.c:224
+#: lib/signature.c:225
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
 # , c-format
-#: lib/signature.c:299 lib/signature.c:397 lib/signature.c:537
-#: lib/signature.c:569
+#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:656
+#: lib/signature.c:688
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "No consegui ler o arquivo spec de %s\n"
 
-#: lib/signature.c:315
+#: lib/signature.c:322
 #, fuzzy
 msgid "pgp failed\n"
 msgstr "Construo falhou.\n"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:322
+#: lib/signature.c:329
 #, fuzzy
 msgid "pgp failed to write signature\n"
 msgstr "gere assinatura PGP"
 
-#: lib/signature.c:327
+#: lib/signature.c:334
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:343 lib/signature.c:442
+#: lib/signature.c:350 lib/signature.c:450
 #, fuzzy
 msgid "unable to read the signature\n"
 msgstr "gere assinatura PGP"
 
-#: lib/signature.c:348
+#: lib/signature.c:355
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:414
+#: lib/signature.c:422
 #, fuzzy
 msgid "gpg failed\n"
 msgstr "Construo falhou.\n"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:421
+#: lib/signature.c:429
 #, fuzzy
 msgid "gpg failed to write signature\n"
 msgstr "gere assinatura PGP"
 
-#: lib/signature.c:426
+#: lib/signature.c:434
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:447
+#: lib/signature.c:455
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:475
-#, fuzzy
-msgid "Generating signature using PGP.\n"
-msgstr "gere assinatura PGP"
-
-#: lib/signature.c:481
-#, fuzzy
-msgid "Generating signature using GPG.\n"
-msgstr "gere assinatura PGP"
-
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:574 lib/signature.c:627
+#: lib/signature.c:693 lib/signature.c:747
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:607
+#: lib/signature.c:727
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:619
+#: lib/signature.c:739
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:663
+#: lib/signature.c:783
 msgid "Header+Payload size: "
 msgstr ""
 
-#: lib/signature.c:692
+#: lib/signature.c:823
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:732
+#: lib/signature.c:880
+msgid "Header SHA1 digest: "
+msgstr ""
+
+#: lib/signature.c:1042
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "desconsidere quaisquer assinaturas MD5"
 
-#: lib/signature.c:822
+#: lib/signature.c:1135
+msgid "Header "
+msgstr ""
+
+#: lib/signature.c:1136
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "gere assinatura PGP"
 
-#: lib/signature.c:886
+#: lib/signature.c:1214
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:906
+#: lib/signature.c:1240
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:910
+#: lib/signature.c:1244
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
@@ -3293,154 +3316,154 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging"
 msgstr ""
 
 #. @-modfilesys@
-#: rpmdb/rpmdb.c:129
+#: rpmdb/rpmdb.c:163
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
 # , c-format
-#: rpmdb/rpmdb.c:387
+#: rpmdb/rpmdb.c:440
 #, fuzzy, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: rpmdb/rpmdb.c:409
+#: rpmdb/rpmdb.c:462
 #, fuzzy, c-format
 msgid "cannot open %s index\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: rpmdb/rpmdb.c:501
+#: rpmdb/rpmdb.c:554
 #, fuzzy, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: rpmdb/rpmdb.c:632
+#: rpmdb/rpmdb.c:685
 #, fuzzy, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: rpmdb/rpmdb.c:642
+#: rpmdb/rpmdb.c:695
 #, fuzzy, c-format
 msgid "error(%d) removing record %s from %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: rpmdb/rpmdb.c:906
+#: rpmdb/rpmdb.c:959
 msgid "no dbpath has been set\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1054
+#: rpmdb/rpmdb.c:1107
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database\n"
 msgstr ""
 
 #. error
-#: rpmdb/rpmdb.c:1319
+#: rpmdb/rpmdb.c:1372
 #, fuzzy, c-format
 msgid "error(%d) counting packages\n"
 msgstr "no foi passado pacote para instalao"
 
-#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3372
+#: rpmdb/rpmdb.c:2150 rpmdb/rpmdb.c:3502
 #, c-format
 msgid "record number %u in database is bad -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2150
+#: rpmdb/rpmdb.c:2203
 #, c-format
 msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2420
+#: rpmdb/rpmdb.c:2473
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "no foi passado pacote para desinstalao"
 
-#: rpmdb/rpmdb.c:2540
+#: rpmdb/rpmdb.c:2634
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
 # , c-format
-#: rpmdb/rpmdb.c:2544
+#: rpmdb/rpmdb.c:2638
 #, fuzzy, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "No consegui abrir: %s\n"
 
-#: rpmdb/rpmdb.c:2714
+#: rpmdb/rpmdb.c:2808
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "no foi passado pacote para instalao"
 
-#: rpmdb/rpmdb.c:2873
+#: rpmdb/rpmdb.c:3003
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
 # , c-format
-#: rpmdb/rpmdb.c:2877
+#: rpmdb/rpmdb.c:3007
 #, fuzzy, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "No consegui abrir: %s\n"
 
-#: rpmdb/rpmdb.c:3258
+#: rpmdb/rpmdb.c:3388
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3291
+#: rpmdb/rpmdb.c:3421
 msgid "no dbpath has been set"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3318
+#: rpmdb/rpmdb.c:3448
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "reconstrua o banco de dados a partir de um banco de dados existente"
 
-#: rpmdb/rpmdb.c:3322
+#: rpmdb/rpmdb.c:3452
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr ""
 
 # , c-format
-#: rpmdb/rpmdb.c:3328
+#: rpmdb/rpmdb.c:3458
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "No consegui abrir: %s\n"
 
 # , c-format
-#: rpmdb/rpmdb.c:3330
+#: rpmdb/rpmdb.c:3460
 #, fuzzy, c-format
 msgid "creating directory %s: %s\n"
 msgstr "No consegui abrir: %s\n"
 
-#: rpmdb/rpmdb.c:3337
+#: rpmdb/rpmdb.c:3467
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "reconstrua o banco de dados a partir de um banco de dados existente"
 
-#: rpmdb/rpmdb.c:3348
+#: rpmdb/rpmdb.c:3478
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "reconstrua o banco de dados a partir de um banco de dados existente"
 
-#: rpmdb/rpmdb.c:3412
+#: rpmdb/rpmdb.c:3542
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3430
+#: rpmdb/rpmdb.c:3560
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3438
+#: rpmdb/rpmdb.c:3568
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3440
+#: rpmdb/rpmdb.c:3570
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
@@ -3453,13 +3476,13 @@ msgstr ""
 # "Content-Type: text/plain; charset=ISO-8859-1\n"
 # "Content-Transfer-Encoding: 8-bit\n"
 # , c-format
-#: rpmdb/rpmdb.c:3450
+#: rpmdb/rpmdb.c:3580
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "RPM verso %s\n"
 
 # , c-format
-#: rpmdb/rpmdb.c:3452
+#: rpmdb/rpmdb.c:3582
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "No consegui abrir: %s\n"
@@ -3674,6 +3697,14 @@ msgstr ""
 msgid "failed to create %s: %s\n"
 msgstr "No consegui abrir o pipe tar: %s\n"
 
+#, fuzzy
+#~ msgid "Generating signature using PGP.\n"
+#~ msgstr "gere assinatura PGP"
+
+#, fuzzy
+#~ msgid "Generating signature using GPG.\n"
+#~ msgstr "gere assinatura PGP"
+
 #~ msgid "no packages given for uninstall"
 #~ msgstr "no foi passado pacote para desinstalao"
 
@@ -4697,10 +4728,6 @@ msgstr "No consegui abrir o pipe tar: %s\n"
 #~ msgstr "pesquise pacotes que fornecem a capacidade <i>"
 
 #, fuzzy
-#~ msgid "New Header signature\n"
-#~ msgstr "gere assinatura PGP"
-
-#, fuzzy
 #~ msgid "path %s is not relocateable for package %s-%s-%s"
 #~ msgstr "no foi passado pacote para instalao"
 
diff --git a/po/ro.po b/po/ro.po
index fd60367f4..b79a761ca 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-02-10 13:58-0500\n"
+"POT-Creation-Date: 2002-03-06 18:13-0500\n"
 "PO-Revision-Date: 1999-04-10 12:00+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
@@ -189,7 +189,7 @@ msgid "RPM version %s\n"
 msgstr ""
 
 #: rpmqv.c:235
-msgid "Copyright (C) 1998-2000 - Red Hat, Inc."
+msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
 msgstr ""
 
 #: rpmqv.c:236
@@ -423,7 +423,7 @@ msgstr ""
 msgid "no arguments given"
 msgstr ""
 
-#: build/build.c:125 build/pack.c:479
+#: build/build.c:125 build/pack.c:483
 msgid "Unable to open temp file.\n"
 msgstr ""
 
@@ -765,7 +765,7 @@ msgstr ""
 msgid "readRPM: read %s: %s\n"
 msgstr ""
 
-#: build/pack.c:305 build/pack.c:521
+#: build/pack.c:305 build/pack.c:529
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr ""
@@ -780,77 +780,77 @@ msgstr ""
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:467
+#: build/pack.c:471
 msgid "Unable to create immutable header region.\n"
 msgstr ""
 
-#: build/pack.c:485
+#: build/pack.c:490
 msgid "Unable to write temp header\n"
 msgstr ""
 
-#: build/pack.c:493
+#: build/pack.c:500
 msgid "Bad CSA data\n"
 msgstr ""
 
-#: build/pack.c:528
+#: build/pack.c:536
 msgid "Unable to write final header\n"
 msgstr ""
 
-#: build/pack.c:546
+#: build/pack.c:556
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr ""
 
-#: build/pack.c:559
+#: build/pack.c:574
 msgid "Unable to reload signature header.\n"
 msgstr ""
 
-#: build/pack.c:567
+#: build/pack.c:582
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:603 lib/psm.c:1444
+#: build/pack.c:618 lib/psm.c:1444
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
 
-#: build/pack.c:618
+#: build/pack.c:633
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr ""
 
-#: build/pack.c:628
+#: build/pack.c:644
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr ""
 
-#: build/pack.c:642
+#: build/pack.c:658
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:652
+#: build/pack.c:668
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr ""
 
-#: build/pack.c:658
+#: build/pack.c:674
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:683 lib/psm.c:1725
+#: build/pack.c:699 lib/psm.c:1725
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:750
+#: build/pack.c:766
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:767
+#: build/pack.c:783
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr ""
@@ -1582,41 +1582,51 @@ msgstr ""
 msgid "error creating temporary file %s\n"
 msgstr ""
 
-#: lib/package.c:167 lib/package.c:238
+#: lib/package.c:179 lib/package.c:255
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:188 lib/package.c:246
+#: lib/package.c:200 lib/package.c:263
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:224 lib/rpmchecksig.c:156 lib/rpmchecksig.c:522
+#: lib/package.c:241 lib/rpmchecksig.c:161 lib/rpmchecksig.c:541
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
 
-#: lib/package.c:230
+#: lib/package.c:247
 #, c-format
 msgid "%s: bad magic\n"
 msgstr ""
 
-#: lib/package.c:254 lib/rpmchecksig.c:174 lib/rpmchecksig.c:538
+#: lib/package.c:272 lib/rpmchecksig.c:179 lib/rpmchecksig.c:557
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/package.c:258 lib/rpmchecksig.c:178 lib/rpmchecksig.c:543
+#: lib/package.c:276 lib/rpmchecksig.c:183 lib/rpmchecksig.c:562
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/package.c:284
+#: lib/package.c:304 lib/rpmchecksig.c:462
 #, c-format
 msgid "%s: headerRead failed\n"
 msgstr ""
 
-#: lib/package.c:303 lib/rpmchecksig.c:107 lib/rpmchecksig.c:466
+#. Parse the parameters from the OpenPGP packets that will be needed.
+#: lib/package.c:334 lib/rpmchecksig.c:631
+msgid "========== Header DSA signature\n"
+msgstr ""
+
+#. Parse the parameters from the OpenPGP packets that will be needed.
+#: lib/package.c:357
+msgid "========== Package DSA/RSA signature\n"
+msgstr ""
+
+#: lib/package.c:366 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr ""
@@ -2320,66 +2330,79 @@ msgstr ""
 msgid "(added provide)"
 msgstr ""
 
-#: lib/rpmchecksig.c:49
+#: lib/rpmchecksig.c:51
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:61
+#: lib/rpmchecksig.c:63
 msgid "makeTempFile failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:101
+#: lib/rpmchecksig.c:104
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:161
+#: lib/rpmchecksig.c:166
 #, c-format
-msgid "%s: Can't sign v1.0 RPM\n"
+msgid "%s: Can't sign v1 packaging\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:165
+#: lib/rpmchecksig.c:170
 #, c-format
-msgid "%s: Can't re-sign v2.0 RPM\n"
+msgid "%s: Can't re-sign v2 packaging\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:229
+#: lib/rpmchecksig.c:239
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:235
+#: lib/rpmchecksig.c:245
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:528
+#: lib/rpmchecksig.c:476
+#, c-format
+msgid "%s: headerGetEntry failed\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:547
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:725
+#: lib/rpmchecksig.c:618
+msgid "========== Package RSA signature\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:637
+msgid "========== Package DSA signature\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:768
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:726 lib/rpmchecksig.c:740
+#: lib/rpmchecksig.c:769 lib/rpmchecksig.c:783
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:728 lib/rpmchecksig.c:742
+#: lib/rpmchecksig.c:771 lib/rpmchecksig.c:785
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:729 lib/rpmchecksig.c:743
+#: lib/rpmchecksig.c:772 lib/rpmchecksig.c:786
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:731 lib/rpmchecksig.c:745
+#: lib/rpmchecksig.c:774 lib/rpmchecksig.c:788
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:739
+#: lib/rpmchecksig.c:782
 msgid "OK"
 msgstr ""
 
@@ -2589,137 +2612,137 @@ msgstr ""
 msgid "Unable to open %s for reading: %s.\n"
 msgstr ""
 
-#: lib/signature.c:117
+#: lib/signature.c:118
 msgid "file is not regular -- skipping size check\n"
 msgstr ""
 
-#: lib/signature.c:126
+#: lib/signature.c:127
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:131
+#: lib/signature.c:132
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:151
+#: lib/signature.c:152
 msgid "No signature\n"
 msgstr ""
 
-#: lib/signature.c:155
+#: lib/signature.c:156
 msgid "Old PGP signature\n"
 msgstr ""
 
-#: lib/signature.c:168
+#: lib/signature.c:169
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr ""
 
-#: lib/signature.c:224
+#: lib/signature.c:225
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:299 lib/signature.c:397 lib/signature.c:537
-#: lib/signature.c:569
+#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:656
+#: lib/signature.c:688
 #, c-format
 msgid "Could not exec %s: %s\n"
 msgstr ""
 
-#: lib/signature.c:315
+#: lib/signature.c:322
 msgid "pgp failed\n"
 msgstr ""
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:322
+#: lib/signature.c:329
 msgid "pgp failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:327
+#: lib/signature.c:334
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:343 lib/signature.c:442
+#: lib/signature.c:350 lib/signature.c:450
 msgid "unable to read the signature\n"
 msgstr ""
 
-#: lib/signature.c:348
+#: lib/signature.c:355
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:414
+#: lib/signature.c:422
 msgid "gpg failed\n"
 msgstr ""
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:421
+#: lib/signature.c:429
 msgid "gpg failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:426
+#: lib/signature.c:434
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:447
+#: lib/signature.c:455
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:475
-msgid "Generating signature using PGP.\n"
-msgstr ""
-
-#: lib/signature.c:481
-msgid "Generating signature using GPG.\n"
-msgstr ""
-
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:574 lib/signature.c:627
+#: lib/signature.c:693 lib/signature.c:747
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:607
+#: lib/signature.c:727
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:619
+#: lib/signature.c:739
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:663
+#: lib/signature.c:783
 msgid "Header+Payload size: "
 msgstr ""
 
-#: lib/signature.c:692
+#: lib/signature.c:823
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:732
+#: lib/signature.c:880
+msgid "Header SHA1 digest: "
+msgstr ""
+
+#: lib/signature.c:1042
 msgid "V3 RSA/MD5 signature: "
 msgstr ""
 
-#: lib/signature.c:822
+#: lib/signature.c:1135
+msgid "Header "
+msgstr ""
+
+#: lib/signature.c:1136
 msgid "V3 DSA signature: "
 msgstr ""
 
-#: lib/signature.c:886
+#: lib/signature.c:1214
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:906
+#: lib/signature.c:1240
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:910
+#: lib/signature.c:1244
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
@@ -2986,155 +3009,155 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging"
 msgstr ""
 
 #. @-modfilesys@
-#: rpmdb/rpmdb.c:129
+#: rpmdb/rpmdb.c:163
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:387
+#: rpmdb/rpmdb.c:440
 #, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:409
+#: rpmdb/rpmdb.c:462
 #, c-format
 msgid "cannot open %s index\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:501
+#: rpmdb/rpmdb.c:554
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:632
+#: rpmdb/rpmdb.c:685
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:642
+#: rpmdb/rpmdb.c:695
 #, c-format
 msgid "error(%d) removing record %s from %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:906
+#: rpmdb/rpmdb.c:959
 msgid "no dbpath has been set\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1054
+#: rpmdb/rpmdb.c:1107
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database\n"
 msgstr ""
 
 #. error
-#: rpmdb/rpmdb.c:1319
+#: rpmdb/rpmdb.c:1372
 #, c-format
 msgid "error(%d) counting packages\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3372
+#: rpmdb/rpmdb.c:2150 rpmdb/rpmdb.c:3502
 #, c-format
 msgid "record number %u in database is bad -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2150
+#: rpmdb/rpmdb.c:2203
 #, c-format
 msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2420
+#: rpmdb/rpmdb.c:2473
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2540
+#: rpmdb/rpmdb.c:2634
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2544
+#: rpmdb/rpmdb.c:2638
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2714
+#: rpmdb/rpmdb.c:2808
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2873
+#: rpmdb/rpmdb.c:3003
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2877
+#: rpmdb/rpmdb.c:3007
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3258
+#: rpmdb/rpmdb.c:3388
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3291
+#: rpmdb/rpmdb.c:3421
 msgid "no dbpath has been set"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3318
+#: rpmdb/rpmdb.c:3448
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3322
+#: rpmdb/rpmdb.c:3452
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3328
+#: rpmdb/rpmdb.c:3458
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3330
+#: rpmdb/rpmdb.c:3460
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3337
+#: rpmdb/rpmdb.c:3467
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3348
+#: rpmdb/rpmdb.c:3478
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3412
+#: rpmdb/rpmdb.c:3542
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3430
+#: rpmdb/rpmdb.c:3560
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3438
+#: rpmdb/rpmdb.c:3568
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3440
+#: rpmdb/rpmdb.c:3570
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3450
+#: rpmdb/rpmdb.c:3580
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3452
+#: rpmdb/rpmdb.c:3582
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
diff --git a/po/rpm.pot b/po/rpm.pot
index 54218ea05..afd232cd3 100644
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-02-10 13:58-0500\n"
+"POT-Creation-Date: 2002-03-06 18:13-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -194,7 +194,7 @@ msgid "RPM version %s\n"
 msgstr ""
 
 #: rpmqv.c:235
-msgid "Copyright (C) 1998-2000 - Red Hat, Inc."
+msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
 msgstr ""
 
 #: rpmqv.c:236
@@ -428,7 +428,7 @@ msgstr ""
 msgid "no arguments given"
 msgstr ""
 
-#: build/build.c:125 build/pack.c:479
+#: build/build.c:125 build/pack.c:483
 msgid "Unable to open temp file.\n"
 msgstr ""
 
@@ -770,7 +770,7 @@ msgstr ""
 msgid "readRPM: read %s: %s\n"
 msgstr ""
 
-#: build/pack.c:305 build/pack.c:521
+#: build/pack.c:305 build/pack.c:529
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr ""
@@ -785,77 +785,77 @@ msgstr ""
 msgid "readRPM: reading header from %s\n"
 msgstr ""
 
-#: build/pack.c:467
+#: build/pack.c:471
 msgid "Unable to create immutable header region.\n"
 msgstr ""
 
-#: build/pack.c:485
+#: build/pack.c:490
 msgid "Unable to write temp header\n"
 msgstr ""
 
-#: build/pack.c:493
+#: build/pack.c:500
 msgid "Bad CSA data\n"
 msgstr ""
 
-#: build/pack.c:528
+#: build/pack.c:536
 msgid "Unable to write final header\n"
 msgstr ""
 
-#: build/pack.c:546
+#: build/pack.c:556
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr ""
 
-#: build/pack.c:559
+#: build/pack.c:574
 msgid "Unable to reload signature header.\n"
 msgstr ""
 
-#: build/pack.c:567
+#: build/pack.c:582
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: build/pack.c:603 lib/psm.c:1444
+#: build/pack.c:618 lib/psm.c:1444
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr ""
 
-#: build/pack.c:618
+#: build/pack.c:633
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr ""
 
-#: build/pack.c:628
+#: build/pack.c:644
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr ""
 
-#: build/pack.c:642
+#: build/pack.c:658
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:652
+#: build/pack.c:668
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr ""
 
-#: build/pack.c:658
+#: build/pack.c:674
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr ""
 
-#: build/pack.c:683 lib/psm.c:1725
+#: build/pack.c:699 lib/psm.c:1725
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:750
+#: build/pack.c:766
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:767
+#: build/pack.c:783
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr ""
@@ -1587,41 +1587,51 @@ msgstr ""
 msgid "error creating temporary file %s\n"
 msgstr ""
 
-#: lib/package.c:167 lib/package.c:238
+#: lib/package.c:179 lib/package.c:255
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:188 lib/package.c:246
+#: lib/package.c:200 lib/package.c:263
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 
-#: lib/package.c:224 lib/rpmchecksig.c:156 lib/rpmchecksig.c:522
+#: lib/package.c:241 lib/rpmchecksig.c:161 lib/rpmchecksig.c:541
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr ""
 
-#: lib/package.c:230
+#: lib/package.c:247
 #, c-format
 msgid "%s: bad magic\n"
 msgstr ""
 
-#: lib/package.c:254 lib/rpmchecksig.c:174 lib/rpmchecksig.c:538
+#: lib/package.c:272 lib/rpmchecksig.c:179 lib/rpmchecksig.c:557
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr ""
 
-#: lib/package.c:258 lib/rpmchecksig.c:178 lib/rpmchecksig.c:543
+#: lib/package.c:276 lib/rpmchecksig.c:183 lib/rpmchecksig.c:562
 #, c-format
 msgid "%s: No signature available\n"
 msgstr ""
 
-#: lib/package.c:284
+#: lib/package.c:304 lib/rpmchecksig.c:462
 #, c-format
 msgid "%s: headerRead failed\n"
 msgstr ""
 
-#: lib/package.c:303 lib/rpmchecksig.c:107 lib/rpmchecksig.c:466
+#. Parse the parameters from the OpenPGP packets that will be needed.
+#: lib/package.c:334 lib/rpmchecksig.c:631
+msgid "========== Header DSA signature\n"
+msgstr ""
+
+#. Parse the parameters from the OpenPGP packets that will be needed.
+#: lib/package.c:357
+msgid "========== Package DSA/RSA signature\n"
+msgstr ""
+
+#: lib/package.c:366 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr ""
@@ -2325,66 +2335,79 @@ msgstr ""
 msgid "(added provide)"
 msgstr ""
 
-#: lib/rpmchecksig.c:49
+#: lib/rpmchecksig.c:51
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:61
+#: lib/rpmchecksig.c:63
 msgid "makeTempFile failed\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:101
+#: lib/rpmchecksig.c:104
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:161
+#: lib/rpmchecksig.c:166
 #, c-format
-msgid "%s: Can't sign v1.0 RPM\n"
+msgid "%s: Can't sign v1 packaging\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:165
+#: lib/rpmchecksig.c:170
 #, c-format
-msgid "%s: Can't re-sign v2.0 RPM\n"
+msgid "%s: Can't re-sign v2 packaging\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:229
+#: lib/rpmchecksig.c:239
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:235
+#: lib/rpmchecksig.c:245
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:528
+#: lib/rpmchecksig.c:476
+#, c-format
+msgid "%s: headerGetEntry failed\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:547
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr ""
 
-#: lib/rpmchecksig.c:725
+#: lib/rpmchecksig.c:618
+msgid "========== Package RSA signature\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:637
+msgid "========== Package DSA signature\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:768
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:726 lib/rpmchecksig.c:740
+#: lib/rpmchecksig.c:769 lib/rpmchecksig.c:783
 msgid " (MISSING KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:728 lib/rpmchecksig.c:742
+#: lib/rpmchecksig.c:771 lib/rpmchecksig.c:785
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:729 lib/rpmchecksig.c:743
+#: lib/rpmchecksig.c:772 lib/rpmchecksig.c:786
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:731 lib/rpmchecksig.c:745
+#: lib/rpmchecksig.c:774 lib/rpmchecksig.c:788
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:739
+#: lib/rpmchecksig.c:782
 msgid "OK"
 msgstr ""
 
@@ -2594,137 +2617,137 @@ msgstr ""
 msgid "Unable to open %s for reading: %s.\n"
 msgstr ""
 
-#: lib/signature.c:117
+#: lib/signature.c:118
 msgid "file is not regular -- skipping size check\n"
 msgstr ""
 
-#: lib/signature.c:126
+#: lib/signature.c:127
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:131
+#: lib/signature.c:132
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:151
+#: lib/signature.c:152
 msgid "No signature\n"
 msgstr ""
 
-#: lib/signature.c:155
+#: lib/signature.c:156
 msgid "Old PGP signature\n"
 msgstr ""
 
-#: lib/signature.c:168
+#: lib/signature.c:169
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr ""
 
-#: lib/signature.c:224
+#: lib/signature.c:225
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:299 lib/signature.c:397 lib/signature.c:537
-#: lib/signature.c:569
+#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:656
+#: lib/signature.c:688
 #, c-format
 msgid "Could not exec %s: %s\n"
 msgstr ""
 
-#: lib/signature.c:315
+#: lib/signature.c:322
 msgid "pgp failed\n"
 msgstr ""
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:322
+#: lib/signature.c:329
 msgid "pgp failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:327
+#: lib/signature.c:334
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:343 lib/signature.c:442
+#: lib/signature.c:350 lib/signature.c:450
 msgid "unable to read the signature\n"
 msgstr ""
 
-#: lib/signature.c:348
+#: lib/signature.c:355
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:414
+#: lib/signature.c:422
 msgid "gpg failed\n"
 msgstr ""
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:421
+#: lib/signature.c:429
 msgid "gpg failed to write signature\n"
 msgstr ""
 
-#: lib/signature.c:426
+#: lib/signature.c:434
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:447
+#: lib/signature.c:455
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:475
-msgid "Generating signature using PGP.\n"
-msgstr ""
-
-#: lib/signature.c:481
-msgid "Generating signature using GPG.\n"
-msgstr ""
-
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:574 lib/signature.c:627
+#: lib/signature.c:693 lib/signature.c:747
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:607
+#: lib/signature.c:727
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:619
+#: lib/signature.c:739
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr ""
 
-#: lib/signature.c:663
+#: lib/signature.c:783
 msgid "Header+Payload size: "
 msgstr ""
 
-#: lib/signature.c:692
+#: lib/signature.c:823
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:732
+#: lib/signature.c:880
+msgid "Header SHA1 digest: "
+msgstr ""
+
+#: lib/signature.c:1042
 msgid "V3 RSA/MD5 signature: "
 msgstr ""
 
-#: lib/signature.c:822
+#: lib/signature.c:1135
+msgid "Header "
+msgstr ""
+
+#: lib/signature.c:1136
 msgid "V3 DSA signature: "
 msgstr ""
 
-#: lib/signature.c:886
+#: lib/signature.c:1214
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:906
+#: lib/signature.c:1240
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:910
+#: lib/signature.c:1244
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
@@ -2991,155 +3014,155 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging"
 msgstr ""
 
 #. @-modfilesys@
-#: rpmdb/rpmdb.c:129
+#: rpmdb/rpmdb.c:163
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:387
+#: rpmdb/rpmdb.c:440
 #, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:409
+#: rpmdb/rpmdb.c:462
 #, c-format
 msgid "cannot open %s index\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:501
+#: rpmdb/rpmdb.c:554
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:632
+#: rpmdb/rpmdb.c:685
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:642
+#: rpmdb/rpmdb.c:695
 #, c-format
 msgid "error(%d) removing record %s from %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:906
+#: rpmdb/rpmdb.c:959
 msgid "no dbpath has been set\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:1054
+#: rpmdb/rpmdb.c:1107
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database\n"
 msgstr ""
 
 #. error
-#: rpmdb/rpmdb.c:1319
+#: rpmdb/rpmdb.c:1372
 #, c-format
 msgid "error(%d) counting packages\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3372
+#: rpmdb/rpmdb.c:2150 rpmdb/rpmdb.c:3502
 #, c-format
 msgid "record number %u in database is bad -- skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2150
+#: rpmdb/rpmdb.c:2203
 #, c-format
 msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2420
+#: rpmdb/rpmdb.c:2473
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2540
+#: rpmdb/rpmdb.c:2634
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2544
+#: rpmdb/rpmdb.c:2638
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2714
+#: rpmdb/rpmdb.c:2808
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2873
+#: rpmdb/rpmdb.c:3003
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2877
+#: rpmdb/rpmdb.c:3007
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3258
+#: rpmdb/rpmdb.c:3388
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3291
+#: rpmdb/rpmdb.c:3421
 msgid "no dbpath has been set"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3318
+#: rpmdb/rpmdb.c:3448
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3322
+#: rpmdb/rpmdb.c:3452
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3328
+#: rpmdb/rpmdb.c:3458
 #, c-format
 msgid "creating directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3330
+#: rpmdb/rpmdb.c:3460
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3337
+#: rpmdb/rpmdb.c:3467
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3348
+#: rpmdb/rpmdb.c:3478
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3412
+#: rpmdb/rpmdb.c:3542
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3430
+#: rpmdb/rpmdb.c:3560
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3438
+#: rpmdb/rpmdb.c:3568
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3440
+#: rpmdb/rpmdb.c:3570
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3450
+#: rpmdb/rpmdb.c:3580
 #, c-format
 msgid "removing directory %s\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3452
+#: rpmdb/rpmdb.c:3582
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr ""
diff --git a/po/ru.po b/po/ru.po
index 743f7f787..17ef22d75 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-02-10 13:58-0500\n"
+"POT-Creation-Date: 2002-03-06 18:13-0500\n"
 "PO-Revision-Date: 2001-08-29 13:55-0400\n"
 "Last-Translator: Eugene Kanter <eugene@blackcatlinux.com>\n"
 "Language-Team:  Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
@@ -192,7 +192,8 @@ msgid "RPM version %s\n"
 msgstr "RPM ×ÅÒÓÉÑ %s\n"
 
 #: rpmqv.c:235
-msgid "Copyright (C) 1998-2000 - Red Hat, Inc."
+#, fuzzy
+msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
 msgstr "Copyright (C) 1998-2000 - Red Hat, Inc."
 
 #: rpmqv.c:236
@@ -444,7 +445,7 @@ msgstr "ÎÅÏÖÉÄÁÎÎÙÅ ÁÒÇÕÍÅÎÔÙ ÄÌÑ --querytags "
 msgid "no arguments given"
 msgstr "ÎÅ ÚÁÄÁÎÙ ÁÒÇÕÍÅÎÔÙ ÚÁĞÒÏÓÁ"
 
-#: build/build.c:125 build/pack.c:479
+#: build/build.c:125 build/pack.c:483
 msgid "Unable to open temp file.\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ×ÒÅÍÅÎÎÙÊ ÆÁÊÌ.\n"
 
@@ -789,7 +790,7 @@ msgstr "readRPM: ÏÔËÒÙÔÉÅ %s: %s\n"
 msgid "readRPM: read %s: %s\n"
 msgstr "readRPM: ŞÔÅÎÉÅ %s: %s\n"
 
-#: build/pack.c:305 build/pack.c:521
+#: build/pack.c:305 build/pack.c:529
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: ÏÛÉÂËÁ Fseek: %s\n"
@@ -804,77 +805,77 @@ msgstr "readRPM: %s  ÎÅ Ñ×ÌÑÅÔÓÑ ĞÁËÅÔÏÍ RPM\n"
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: ŞÉÔÁÅÔÓÑ ÚÁÇÏÌÏ×ÏË ÉÚ %s\n"
 
-#: build/pack.c:467
+#: build/pack.c:471
 msgid "Unable to create immutable header region.\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ĞÏÍÅÓÔÉÔØ ÚÁÇÏÌÏ×ÏË × ÎÅÒĞÅÒÙ×ÎÕÀ ÏÂÌÁÓÔØ ĞÁÍÑÔÉ.\n"
 
-#: build/pack.c:485
+#: build/pack.c:490
 msgid "Unable to write temp header\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁĞÉÓÁÔØ ×ÒÅÍÅÎÎÙÊ ÚÁÇÏÌÏ×ÏË\n"
 
-#: build/pack.c:493
+#: build/pack.c:500
 msgid "Bad CSA data\n"
 msgstr "îÅ×ÅÒÎÙÅ ÄÁÎÎÙÅ CSA\n"
 
-#: build/pack.c:528
+#: build/pack.c:536
 msgid "Unable to write final header\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁĞÉÓÁÔØ ÏËÏÎŞÁÔÅÌØÎÙÊ ÚÁÇÏÌÏ×ÏË\n"
 
-#: build/pack.c:546
+#: build/pack.c:556
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "çÅÎÅÒÉÒÕÅÔÓÑ ĞÏÄĞÉÓØ: %d\n"
 
-#: build/pack.c:559
+#: build/pack.c:574
 msgid "Unable to reload signature header.\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ĞÅÒÅÚÁÇÒÕÚÉÔØ ÚÁÇÏÌÏ×ÏË ĞÏÄĞÉÓÉ.\n"
 
-#: build/pack.c:567
+#: build/pack.c:582
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s: %s\n"
 
-#: build/pack.c:603 lib/psm.c:1444
+#: build/pack.c:618 lib/psm.c:1444
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁĞÉÓÁÔØ ĞÁËÅÔ: %s\n"
 
-#: build/pack.c:618
+#: build/pack.c:633
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÃÅÌØ ĞÏÄĞÉÓÉ %s: %s\n"
 
-#: build/pack.c:628
+#: build/pack.c:644
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ĞÒÏŞÉÔÁÔØ ÚÁÇÏÌÏ×ÏË ÉÚ %s: %s\n"
 
-#: build/pack.c:642
+#: build/pack.c:658
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁĞÉÓÁÔØ ÚÁÇÏÌÏ×ÏË × %s: %s\n"
 
-#: build/pack.c:652
+#: build/pack.c:668
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ĞÒÏŞÉÔÁÔØ ÓÏÄÅÒÖÉÍÏÅ ÉÚ %s: %s\n"
 
-#: build/pack.c:658
+#: build/pack.c:674
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁĞÉÓÁÔØ ÓÏÄÅÒÖÉÍÏÅ × %s: %s\n"
 
-#: build/pack.c:683 lib/psm.c:1725
+#: build/pack.c:699 lib/psm.c:1725
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "úÁĞÉÓÁÎ: %s\n"
 
-#: build/pack.c:750
+#: build/pack.c:766
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÉÍÑ ÆÁÊÌÁ ÄÌÑ ĞÁËÅÔÁ %s: %s\n"
 
-#: build/pack.c:767
+#: build/pack.c:783
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ %s: %s\n"
@@ -1630,41 +1631,51 @@ msgstr "%s ÓÏÚÄÁÎ ËÁË %s\n"
 msgid "error creating temporary file %s\n"
 msgstr "ÏÛÉÂËÁ ÓÏÚÄÁÎÉÑ ×ÒÅÍÅÎÎÏÇÏ ÆÁÊÌÁ %s\n"
 
-#: lib/package.c:167 lib/package.c:238
+#: lib/package.c:179 lib/package.c:255
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr "ĞÁËÅÔÙ ×ÅÒÓÉÉ 1 ÎÅ ĞÏÄÄÅÒÖÉ×ÁÀÔÓÑ ÜÔÏÊ ×ÅÒÓÉÅÊ RPM\n"
 
-#: lib/package.c:188 lib/package.c:246
+#: lib/package.c:200 lib/package.c:263
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr "ÜÔÁ ×ÅÒÓÉÑ RPM ĞÏÄÄÅÒÖÉ×ÁÅÔ ÔÏÌØËÏ ĞÁËÅÔÙ ×ÅÒÓÉÉ <= 4\n"
 
-#: lib/package.c:224 lib/rpmchecksig.c:156 lib/rpmchecksig.c:522
+#: lib/package.c:241 lib/rpmchecksig.c:161 lib/rpmchecksig.c:541
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: ÏÛÉÂËÁ readLead\n"
 
-#: lib/package.c:230
+#: lib/package.c:247
 #, fuzzy, c-format
 msgid "%s: bad magic\n"
 msgstr "îÅ×ÅÒÎÙÊ magic"
 
-#: lib/package.c:254 lib/rpmchecksig.c:174 lib/rpmchecksig.c:538
+#: lib/package.c:272 lib/rpmchecksig.c:179 lib/rpmchecksig.c:557
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: ÏÛÉÂËÁ rpmReadSignature\n"
 
-#: lib/package.c:258 lib/rpmchecksig.c:178 lib/rpmchecksig.c:543
+#: lib/package.c:276 lib/rpmchecksig.c:183 lib/rpmchecksig.c:562
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: ğÏÄĞÉÓØ ÎÅÄÏÓÔÕĞÎÁ\n"
 
-#: lib/package.c:284
+#: lib/package.c:304 lib/rpmchecksig.c:462
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: ÏÛÉÂËÁ readLead\n"
 
-#: lib/package.c:303 lib/rpmchecksig.c:107 lib/rpmchecksig.c:466
+#. Parse the parameters from the OpenPGP packets that will be needed.
+#: lib/package.c:334 lib/rpmchecksig.c:631
+msgid "========== Header DSA signature\n"
+msgstr ""
+
+#. Parse the parameters from the OpenPGP packets that will be needed.
+#: lib/package.c:357
+msgid "========== Package DSA/RSA signature\n"
+msgstr ""
+
+#: lib/package.c:366 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: ÏÛÉÂËÁ Fread: %s\n"
@@ -2395,66 +2406,79 @@ msgstr "ÎÅ×ÅÒÎÙÊ ÆÁÊÌ ÂÁÚÙ ÄÁÎÎÙÈ %s\n"
 msgid "(added provide)"
 msgstr "%s: %-45s YES (db provides)\n"
 
-#: lib/rpmchecksig.c:49
+#: lib/rpmchecksig.c:51
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s: ÏÛÉÂËÁ ÏÔËÒÙÔÉÑ: %s\n"
 
-#: lib/rpmchecksig.c:61
+#: lib/rpmchecksig.c:63
 msgid "makeTempFile failed\n"
 msgstr "ÏÛÉÂËÁ makeTempFile\n"
 
-#: lib/rpmchecksig.c:101
+#: lib/rpmchecksig.c:104
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: ÏÛÉÂËÁ Fwrite: %s\n"
 
-#: lib/rpmchecksig.c:161
-#, c-format
-msgid "%s: Can't sign v1.0 RPM\n"
+#: lib/rpmchecksig.c:166
+#, fuzzy, c-format
+msgid "%s: Can't sign v1 packaging\n"
 msgstr "%s: îÅ ÍÏÇÕ ĞÏÄĞÉÓÁÔØ RPM v1.0\n"
 
-#: lib/rpmchecksig.c:165
-#, c-format
-msgid "%s: Can't re-sign v2.0 RPM\n"
+#: lib/rpmchecksig.c:170
+#, fuzzy, c-format
+msgid "%s: Can't re-sign v2 packaging\n"
 msgstr "%s: îÅ ÍÏÇÕ ĞÅÒÅĞÏÄĞÉÓÁÔØ RPM v2.0\n"
 
-#: lib/rpmchecksig.c:229
+#: lib/rpmchecksig.c:239
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: ÏÛÉÂËÁ writeLead: %s\n"
 
-#: lib/rpmchecksig.c:235
+#: lib/rpmchecksig.c:245
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: ÏÛÉÂËÁ rpmWriteSignature: %s\n"
 
-#: lib/rpmchecksig.c:528
+#: lib/rpmchecksig.c:476
+#, fuzzy, c-format
+msgid "%s: headerGetEntry failed\n"
+msgstr "%s: ÏÛÉÂËÁ readLead\n"
+
+#: lib/rpmchecksig.c:547
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: ğÏÄĞÉÓÉ ÎÅÔ (RPM v1.0)\n"
 
-#: lib/rpmchecksig.c:725
+#: lib/rpmchecksig.c:618
+msgid "========== Package RSA signature\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:637
+msgid "========== Package DSA signature\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:768
 msgid "NOT OK"
 msgstr "îå Oë"
 
-#: lib/rpmchecksig.c:726 lib/rpmchecksig.c:740
+#: lib/rpmchecksig.c:769 lib/rpmchecksig.c:783
 msgid " (MISSING KEYS:"
 msgstr " (ïôóõôóô÷õàô ëìàşé:"
 
-#: lib/rpmchecksig.c:728 lib/rpmchecksig.c:742
+#: lib/rpmchecksig.c:771 lib/rpmchecksig.c:785
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:729 lib/rpmchecksig.c:743
+#: lib/rpmchecksig.c:772 lib/rpmchecksig.c:786
 msgid " (UNTRUSTED KEYS:"
 msgstr " (îåô äï÷åòéñ ë ëìàşáí:"
 
-#: lib/rpmchecksig.c:731 lib/rpmchecksig.c:745
+#: lib/rpmchecksig.c:774 lib/rpmchecksig.c:788
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:739
+#: lib/rpmchecksig.c:782
 msgid "OK"
 msgstr "Oë"
 
@@ -2666,141 +2690,141 @@ msgstr "îÅ×ÏÚÍÏÖÎÏ ĞÒÏŞÉÔÁÔØ %s, ÚÎÁŞÅÎÉÅ HOME ÓÌÉÛËÏÍ ×ÅÌÉËÏ.\n"
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s ÄÌÑ ŞÔÅÎÉÑ: %s.\n"
 
-#: lib/signature.c:117
+#: lib/signature.c:118
 msgid "file is not regular -- skipping size check\n"
 msgstr "ÎÅÏÂÙŞÎÙÊ ÆÁÊÌ -- ĞÒÏĞÕÓËÁÀ ĞÒÏ×ÅÒËÕ ÒÁÚÍÅÒÁ\n"
 
-#: lib/signature.c:126
+#: lib/signature.c:127
 #, 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:131
+#: lib/signature.c:132
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr "æÁËÔÉŞÅÓËÉÊ ÒÁÚÍÅÒ: %12d\n"
 
-#: lib/signature.c:151
+#: lib/signature.c:152
 msgid "No signature\n"
 msgstr "ğÏÄĞÉÓÉ ÎÅÔ\n"
 
-#: lib/signature.c:155
+#: lib/signature.c:156
 msgid "Old PGP signature\n"
 msgstr "óÔÁÒÁÑ ĞÏÄĞÉÓØ PGP\n"
 
-#: lib/signature.c:168
+#: lib/signature.c:169
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr ""
 "óÔÁÒÁÑ (ÔÏÌØËÏ ÄÌÑ ×ÎÕÔÒÅÎÎÅÇÏ ÉÓĞÏÌØÚÏ×ÁÎÉÑ) ĞÏÄĞÉÓØ! çÄÅ ×Ù üôï ×ÚÑÌÉ!?\n"
 
-#: lib/signature.c:224
+#: lib/signature.c:225
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "ğÏÄĞÉÓØ: ÒÁÚÍÅÒ(%d)+ÚÁĞÏÌÎÅÎÉÅ(%d)\n"
 
-#: lib/signature.c:299 lib/signature.c:397 lib/signature.c:537
-#: lib/signature.c:569
+#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:656
+#: lib/signature.c:688
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ×ÙÌÎÉÔØ %s: %s\n"
 
-#: lib/signature.c:315
+#: lib/signature.c:322
 msgid "pgp failed\n"
 msgstr "ÏÛÉÂËÁ pgp\n"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:322
+#: lib/signature.c:329
 msgid "pgp failed to write signature\n"
 msgstr "ÏÛÉÂËÁ pgp ĞÒÉ ÚÁĞÉÓÉ ĞÏÄĞÉÓÉ\n"
 
-#: lib/signature.c:327
+#: lib/signature.c:334
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr "òÁÚÍÅÒ ĞÏÄĞÉÓÉ PGP: %d\n"
 
-#: lib/signature.c:343 lib/signature.c:442
+#: lib/signature.c:350 lib/signature.c:450
 msgid "unable to read the signature\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ĞÒÏŞÅÓÔØ ĞÏÄĞÉÓØ\n"
 
-#: lib/signature.c:348
+#: lib/signature.c:355
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr "ğÏÌÕŞÅÎÏ %d ÂÁÊÔ ĞÏÄĞÉÓÉ PGP\n"
 
-#: lib/signature.c:414
+#: lib/signature.c:422
 msgid "gpg failed\n"
 msgstr "ÏÛÉÂËÁ gpg\n"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:421
+#: lib/signature.c:429
 msgid "gpg failed to write signature\n"
 msgstr "ÏÛÉÂËÁ gpg ĞÒÉ ÚÁĞÉÓÉ ĞÏÄĞÉÓÉ\n"
 
-#: lib/signature.c:426
+#: lib/signature.c:434
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr "òÁÚÍÅÒ ĞÏÄĞÉÓÉ GPG: %d\n"
 
-#: lib/signature.c:447
+#: lib/signature.c:455
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr "ğÏÌÕŞÅÎÏ %d ÂÁÊÔ ĞÏÄĞÉÓÉ GPG\n"
 
-#: lib/signature.c:475
-msgid "Generating signature using PGP.\n"
-msgstr "çÅÎÅÒÉÒÕÅÔÓÑ ĞÏÄĞÉÓØ PGP.\n"
-
-#: lib/signature.c:481
-msgid "Generating signature using GPG.\n"
-msgstr "çÅÎÅÒÉÒÕÅÔÓÑ ĞÏÄĞÉÓØ GPG.\n"
-
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:574 lib/signature.c:627
+#: lib/signature.c:693 lib/signature.c:747
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "îÅ×ÅÒÎÁÑ ÓĞÅÃÉÆÉËÁÃÉÑ %%_signature × ÍÁËÒÏÆÁÊÌÅ\n"
 
-#: lib/signature.c:607
+#: lib/signature.c:727
 #, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "÷Ù ÄÏÌÖÎÙ ÕÓÔÁÎÏ×ÉÔØ \"%%_gpg_name\" × ×ÁÛÅÍ ÍÁËÒÏÆÁÊÌÅ\n"
 
-#: lib/signature.c:619
+#: lib/signature.c:739
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "÷Ù ÄÏÌÖÎÙ ÕÓÔÁÎÏ×ÉÔØ \"%%_pgp_name\" × ×ÁÛÅÍ ÍÁËÒÏÆÁÊÌÅ\n"
 
-#: lib/signature.c:663
+#: lib/signature.c:783
 #, fuzzy
 msgid "Header+Payload size: "
 msgstr "úÁÇÏÌÏ×ÏË ÓÌÉÛËÏÍ ×ÅÌÉË"
 
-#: lib/signature.c:692
+#: lib/signature.c:823
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:732
+#: lib/signature.c:880
+msgid "Header SHA1 digest: "
+msgstr ""
+
+#: lib/signature.c:1042
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "ĞÒÏĞÕÓÔÉÔØ ×ÓÅ MD5-ĞÏÄĞÉÓÉ"
 
-#: lib/signature.c:822
+#: lib/signature.c:1135
+msgid "Header "
+msgstr ""
+
+#: lib/signature.c:1136
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "ğÏÄĞÉÓÉ ÎÅÔ\n"
 
-#: lib/signature.c:886
+#: lib/signature.c:1214
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:906
+#: lib/signature.c:1240
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:910
+#: lib/signature.c:1244
 #, fuzzy, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "ğÏÄĞÉÓØ: ÒÁÚÍÅÒ(%d)+ÚÁĞÏÌÎÅÎÉÅ(%d)\n"
@@ -3079,41 +3103,41 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging"
 msgstr "ÓÏÚÄÁÔØ ÚÁÇÏÌÏ×ËÉ, ÓÏ×ÍÅÓÔÉÍÙÅ Ó (ÕÓÔÁÒÅ×ÛÉÍÉ) ĞÁËÅÔÁÍÉ rpm[23]"
 
 #. @-modfilesys@
-#: rpmdb/rpmdb.c:129
+#: rpmdb/rpmdb.c:163
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr "dbiTagsInit: ÉÍÑ ËÌÀŞÁ \"%s\" ÎÅ ÉÚ×ÅÓÔÎÏ, ÉÇÎÏÒÉÒÕÅÔÓÑ\n"
 
-#: rpmdb/rpmdb.c:387
+#: rpmdb/rpmdb.c:440
 #, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÉÎÄÅËÓ %s ÉÓĞÏÌØÚÕÑ db%d - %s (%d)\n"
 
-#: rpmdb/rpmdb.c:409
+#: rpmdb/rpmdb.c:462
 #, c-format
 msgid "cannot open %s index\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÉÎÄÅËÓ %s\n"
 
-#: rpmdb/rpmdb.c:501
+#: rpmdb/rpmdb.c:554
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "ÏÛÉÂËÁ(%d) ĞÏÌÕŞÅÎÉÑ ÚÁĞÉÓÅÊ \"%s\" ÉÚ ÉÎÄÅËÓÁ %s\n"
 
-#: rpmdb/rpmdb.c:632
+#: rpmdb/rpmdb.c:685
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "ÏÛÉÂËÁ(%d) ÚÁĞÉÓÉ ÚÁĞÉÓÉ %s × %s\n"
 
-#: rpmdb/rpmdb.c:642
+#: rpmdb/rpmdb.c:695
 #, c-format
 msgid "error(%d) removing record %s from %s\n"
 msgstr "ÏÛÉÂËÁ(%d) ÕÄÁÌÅÎÉÑ ÚÁĞÉÓÉ %s ÉÚ %s\n"
 
-#: rpmdb/rpmdb.c:906
+#: rpmdb/rpmdb.c:959
 msgid "no dbpath has been set\n"
 msgstr "ĞÁÒÁÍÅÔÅÒ dbpath ÎÅ ÕÓÔÁÎÏ×ÌÅÎ\n"
 
-#: rpmdb/rpmdb.c:1054
+#: rpmdb/rpmdb.c:1107
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database\n"
@@ -3122,115 +3146,115 @@ msgstr ""
 "ÂÁÚÙ ÄÁÎÎÙÈ ÎÏ×ÏÇÏ ÆÏÒÍÁÔÁ\n"
 
 #. error
-#: rpmdb/rpmdb.c:1319
+#: rpmdb/rpmdb.c:1372
 #, c-format
 msgid "error(%d) counting packages\n"
 msgstr "ÏÛÉÂËÁ(%d) ĞÒÉ ĞÏÄÓŞ£ÔÅ ĞÁËÅÔÏ×\n"
 
-#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3372
+#: rpmdb/rpmdb.c:2150 rpmdb/rpmdb.c:3502
 #, c-format
 msgid "record number %u in database is bad -- skipping.\n"
 msgstr "ÚÁĞÉÓØ ÎÏÍÅÒ %u × ÂÁÚÅ ÄÁÎÎÙÈ ÎÅ×ÅÒÎÁ, ĞÒÏĞÕÓËÁÅÔÓÑ.\n"
 
-#: rpmdb/rpmdb.c:2150
+#: rpmdb/rpmdb.c:2203
 #, c-format
 msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
 msgstr "rpmdb: ĞÏÌÕŞÅÎ ĞÏ×ÒÅÖÄÅÎÎÙÊ ÚÁÇÏÌÏ×ÏË #%u, ĞÒÏĞÕÓËÁÅÔÓÑ.\n"
 
-#: rpmdb/rpmdb.c:2420
+#: rpmdb/rpmdb.c:2473
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ĞÒÏŞÅÓÔØ ÚÁÇÏÌÏ×ÏË × 0x%x\n"
 
-#: rpmdb/rpmdb.c:2540
+#: rpmdb/rpmdb.c:2634
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "ÕÄÁÌÑÅÔÓÑ \"%s\" ÉÚ ÉÎÄÅËÓÁ %s.\n"
 
-#: rpmdb/rpmdb.c:2544
+#: rpmdb/rpmdb.c:2638
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "ÕÄÁÌÑÅÔÓÑ %d ÚÁĞÉÓÅÊ ÉÚ ÉÎÄÅËÓÁ %s.\n"
 
-#: rpmdb/rpmdb.c:2714
+#: rpmdb/rpmdb.c:2808
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "ÏÛÉÂËÁ(%d) ÒÅÚÅÒ×ÉÒÏ×ÁÎÉÑ ĞÁÍÑÔÉ ÄÌÑ ÏÂÒÁÚÁ ÎÏ×ÏÇÏ ĞÁËÅÔÁ\n"
 
-#: rpmdb/rpmdb.c:2873
+#: rpmdb/rpmdb.c:3003
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "ÄÏÂÁ×ÌÑÅÔÓÑ \"%s\" × ÉÎÄÅËÓ %s.\n"
 
-#: rpmdb/rpmdb.c:2877
+#: rpmdb/rpmdb.c:3007
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "ÄÏÂÁ×ÌÑÅÔÓÑ %d ÚÁĞÉÓÅÊ × ÉÎÄÅËÓ %s\n"
 
-#: rpmdb/rpmdb.c:3258
+#: rpmdb/rpmdb.c:3388
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr "ÕÄÁÌÑÅÔÓÑ %s ĞÏÓÌÅ ÕÓĞÅÛÎÏÇÏ ÚÁ×ÅÒÛÅÎÉÑ ĞÅÒÅÉÎÄÅËÁÃÉÉ ÂÁÚÙ × db3.\n"
 
-#: rpmdb/rpmdb.c:3291
+#: rpmdb/rpmdb.c:3421
 msgid "no dbpath has been set"
 msgstr "ĞÁÒÁÍÅÔÅÒ dbpath ÎÅ ÕÓÔÁÎÏ×ÌÅÎ"
 
-#: rpmdb/rpmdb.c:3318
+#: rpmdb/rpmdb.c:3448
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "ĞÅÒÅÓÔÒÁÉ×ÁÅÔÓÑ ÂÁÚÁ ÄÁÎÎÙÈ %s × %s\n"
 
-#: rpmdb/rpmdb.c:3322
+#: rpmdb/rpmdb.c:3452
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr "×ÒÅÍÅÎÎÁÑ ÂÁÚÁ ÄÁÎÎÙÈ %s ÕÖÅ ÓÕİÅÓÔ×ÕÅÔ\n"
 
-#: rpmdb/rpmdb.c:3328
+#: rpmdb/rpmdb.c:3458
 #, c-format
 msgid "creating directory %s\n"
 msgstr "ÓÏÚÄÁ£ÔÓÑ ËÁÔÁÌÏÇ %s\n"
 
-#: rpmdb/rpmdb.c:3330
+#: rpmdb/rpmdb.c:3460
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr "ÓÏÚÄÁ£ÔÓÑ ËÁÔÁÌÏÇ %s: %s\n"
 
-#: rpmdb/rpmdb.c:3337
+#: rpmdb/rpmdb.c:3467
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "ÏÔËÒÙ×ÁÅÔÓÑ ÓÔÁÒÁÑ ÂÁÚÁ ÄÁÎÎÙÈ ŞÅÒÅÚ dbapi %d\n"
 
-#: rpmdb/rpmdb.c:3348
+#: rpmdb/rpmdb.c:3478
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "ÏÔËÒÙ×ÁÅÔÓÑ ÎÏ×ÁÑ ÂÁÚÁ ÄÁÎÎÙÈ ŞÅÒÅÚ dbapi %d\n"
 
-#: rpmdb/rpmdb.c:3412
+#: rpmdb/rpmdb.c:3542
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÄÏÂÁ×ÉÔØ ÚÁĞÉÓØ (ĞÅÒ×ÏÎÁŞÁÌØÎÏ × %u)\n"
 
-#: rpmdb/rpmdb.c:3430
+#: rpmdb/rpmdb.c:3560
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 "ĞÅÒÅÓÔÒÏÅÎÉÅ ÂÁÚÙ ÄÁÎÎÙÈ ÎÅ ÕÄÁÌÏÓØ, ÓÔÁÒÁÑ ÂÁÚÁ ÄÁÎÎÙÈ ÏÓÔÁÅÔÓÑ ÎÁ ÍÅÓÔÅ\n"
 
-#: rpmdb/rpmdb.c:3438
+#: rpmdb/rpmdb.c:3568
 msgid "failed to replace old database with new database!\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁÍÅÎÉÔØ ÓÔÁÒÕÀ ÂÁÚÕ ÄÁÎÎÙÈ ÎÁ ÎÏ×ÕÀ!\n"
 
-#: rpmdb/rpmdb.c:3440
+#: rpmdb/rpmdb.c:3570
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "ÆÁÊÌÙ × %s ÚÁÍÅÎÑÀÔÓÑ ÆÁÊÌÁÍÉ ÉÚ %s ÄÌÑ ×ÏÓÓÔÁÎÏ×ÌÅÎÉÑ"
 
-#: rpmdb/rpmdb.c:3450
+#: rpmdb/rpmdb.c:3580
 #, c-format
 msgid "removing directory %s\n"
 msgstr "ÕÄÁÌÑÅÔÓÑ ËÁÔÁÌÏÇ %s\n"
 
-#: rpmdb/rpmdb.c:3452
+#: rpmdb/rpmdb.c:3582
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "ÏÛÉÂËÁ ÕÄÁÌÅÎÉÑ ËÁÔÁÌÏÇÁ %s: %s\n"
@@ -3442,6 +3466,12 @@ msgstr "url ĞÏÒÔ ÄÏÌÖÅÎ ÂÙÔØ ŞÉÓÌÏÍ\n"
 msgid "failed to create %s: %s\n"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ %s: %s\n"
 
+#~ msgid "Generating signature using PGP.\n"
+#~ msgstr "çÅÎÅÒÉÒÕÅÔÓÑ ĞÏÄĞÉÓØ PGP.\n"
+
+#~ msgid "Generating signature using GPG.\n"
+#~ msgstr "çÅÎÅÒÉÒÕÅÔÓÑ ĞÏÄĞÉÓØ GPG.\n"
+
 #~ msgid "no packages given for uninstall"
 #~ msgstr "ÎÅ ÚÁÄÁÎÙ ĞÁËÅÔÙ ÄÌÑ ÕÄÁÌÅÎÉÑ"
 
diff --git a/po/sk.po b/po/sk.po
index a6d2aaeac..42e7e773d 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-02-10 13:58-0500\n"
+"POT-Creation-Date: 2002-03-06 18:13-0500\n"
 "PO-Revision-Date: 1999-04-08 21:37+02:00\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
@@ -193,7 +193,7 @@ msgstr "RPM verzia %s\n"
 
 #: rpmqv.c:235
 #, fuzzy
-msgid "Copyright (C) 1998-2000 - Red Hat, Inc."
+msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
 msgstr "Copyright (C) 1998 - Red Hat Software"
 
 #: rpmqv.c:236
@@ -445,7 +445,7 @@ msgstr "neoèakávané argumenty pre --querytags"
 msgid "no arguments given"
 msgstr "neboli zadané ¾iadne argumenty pre otázku"
 
-#: build/build.c:125 build/pack.c:479
+#: build/build.c:125 build/pack.c:483
 #, fuzzy
 msgid "Unable to open temp file.\n"
 msgstr "Nie je mo¾né otvori» doèasnı súbor"
@@ -800,7 +800,7 @@ msgstr "readRPM: otvorenie %s: %s\n"
 msgid "readRPM: read %s: %s\n"
 msgstr "readRPM: èítanie %s: %s\n"
 
-#: build/pack.c:305 build/pack.c:521
+#: build/pack.c:305 build/pack.c:529
 #, fuzzy, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: readLead zlyhalo\n"
@@ -815,82 +815,82 @@ msgstr "readRPM: %s nie je RPM balík\n"
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: èítanie hlavièky %s\n"
 
-#: build/pack.c:467
+#: build/pack.c:471
 #, fuzzy
 msgid "Unable to create immutable header region.\n"
 msgstr "Nie je mo¾né preèíta» ikonu: %s"
 
-#: build/pack.c:485
+#: build/pack.c:490
 #, fuzzy
 msgid "Unable to write temp header\n"
 msgstr "Nie je mo¾né zapísa» %s"
 
-#: build/pack.c:493
+#: build/pack.c:500
 #, fuzzy
 msgid "Bad CSA data\n"
 msgstr "Chybné CSA dáta"
 
-#: build/pack.c:528
+#: build/pack.c:536
 #, fuzzy
 msgid "Unable to write final header\n"
 msgstr "Nie je mo¾né zapísa» %s"
 
-#: build/pack.c:546
+#: build/pack.c:556
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "Vytvára sa PGP podpis: %d\n"
 
-#: build/pack.c:559
+#: build/pack.c:574
 #, fuzzy
 msgid "Unable to reload signature header.\n"
 msgstr "Nie je mo¾né preèíta» ikonu: %s"
 
-#: build/pack.c:567
+#: build/pack.c:582
 #, fuzzy, c-format
 msgid "Could not open %s: %s\n"
 msgstr "Otvorenie %s zlyhalo\n"
 
-#: build/pack.c:603 lib/psm.c:1444
+#: build/pack.c:618 lib/psm.c:1444
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Nie je mo¾né zapísa» balík: %s"
 
-#: build/pack.c:618
+#: build/pack.c:633
 #, fuzzy, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "Nie je preèíta» sigtarget: %s"
 
-#: build/pack.c:628
+#: build/pack.c:644
 #, fuzzy, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "Nie je mo¾né preèíta» ikonu: %s"
 
-#: build/pack.c:642
+#: build/pack.c:658
 #, fuzzy, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "Nie je mo¾né zapísa» balík: %s"
 
-#: build/pack.c:652
+#: build/pack.c:668
 #, fuzzy, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "Nie je mo¾né preèíta» ikonu: %s"
 
-#: build/pack.c:658
+#: build/pack.c:674
 #, fuzzy, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Nie je mo¾né zapísa» balík: %s"
 
-#: build/pack.c:683 lib/psm.c:1725
+#: build/pack.c:699 lib/psm.c:1725
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Zapísané: %s\n"
 
-#: build/pack.c:750
+#: build/pack.c:766
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr "Nie je mo¾né vytvori» meno vıstupného súboru pre balík %s: %s\n"
 
-#: build/pack.c:767
+#: build/pack.c:783
 #, fuzzy, c-format
 msgid "cannot create %s: %s\n"
 msgstr "nie je mo¾né zapísa» do %s: "
@@ -1650,43 +1650,54 @@ msgstr "varovanie: %s vytvorené ako %s"
 msgid "error creating temporary file %s\n"
 msgstr "chyba pri vytváraní doèasného súboru %s"
 
-#: lib/package.c:167 lib/package.c:238
+#: lib/package.c:179 lib/package.c:255
 #, fuzzy
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr "táto verzia RPM podporuje iba balíky s hlavnım èíslom <= 3"
 
-#: lib/package.c:188 lib/package.c:246
+#: lib/package.c:200 lib/package.c:263
 #, fuzzy
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr "táto verzia RPM podporuje iba balíky s hlavnım èíslom <= 3"
 
-#: lib/package.c:224 lib/rpmchecksig.c:156 lib/rpmchecksig.c:522
+#: lib/package.c:241 lib/rpmchecksig.c:161 lib/rpmchecksig.c:541
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: readLead zlyhalo\n"
 
-#: lib/package.c:230
+#: lib/package.c:247
 #, fuzzy, c-format
 msgid "%s: bad magic\n"
 msgstr "Chybné magické èíslo"
 
-#: lib/package.c:254 lib/rpmchecksig.c:174 lib/rpmchecksig.c:538
+#: lib/package.c:272 lib/rpmchecksig.c:179 lib/rpmchecksig.c:557
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: rpmReadSignature zlyhalo\n"
 
-#: lib/package.c:258 lib/rpmchecksig.c:178 lib/rpmchecksig.c:543
+#: lib/package.c:276 lib/rpmchecksig.c:183 lib/rpmchecksig.c:562
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Podpis nie je k dispozícii\n"
 
-#: lib/package.c:284
+#: lib/package.c:304 lib/rpmchecksig.c:462
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: readLead zlyhalo\n"
 
-#: lib/package.c:303 lib/rpmchecksig.c:107 lib/rpmchecksig.c:466
+#. Parse the parameters from the OpenPGP packets that will be needed.
+#: lib/package.c:334 lib/rpmchecksig.c:631
+#, fuzzy
+msgid "========== Header DSA signature\n"
+msgstr "Nová hlavièka podpisu\n"
+
+#. Parse the parameters from the OpenPGP packets that will be needed.
+#: lib/package.c:357
+msgid "========== Package DSA/RSA signature\n"
+msgstr ""
+
+#: lib/package.c:366 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
 #, fuzzy, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: readLead zlyhalo\n"
@@ -2448,67 +2459,80 @@ msgstr "chybnı stav súboru: %s"
 msgid "(added provide)"
 msgstr "Poskytuje:"
 
-#: lib/rpmchecksig.c:49
+#: lib/rpmchecksig.c:51
 #, fuzzy, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s: otvorenie zlyhalo\n"
 
-#: lib/rpmchecksig.c:61
+#: lib/rpmchecksig.c:63
 #, fuzzy
 msgid "makeTempFile failed\n"
 msgstr "vykonanie zlyhalo\n"
 
-#: lib/rpmchecksig.c:101
+#: lib/rpmchecksig.c:104
 #, fuzzy, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: readLead zlyhalo\n"
 
-#: lib/rpmchecksig.c:161
-#, c-format
-msgid "%s: Can't sign v1.0 RPM\n"
+#: lib/rpmchecksig.c:166
+#, fuzzy, c-format
+msgid "%s: Can't sign v1 packaging\n"
 msgstr "%s: Nie je mo¾né podpísa» v1.0 RPM\n"
 
-#: lib/rpmchecksig.c:165
-#, c-format
-msgid "%s: Can't re-sign v2.0 RPM\n"
+#: lib/rpmchecksig.c:170
+#, fuzzy, c-format
+msgid "%s: Can't re-sign v2 packaging\n"
 msgstr "%s: Nie je mo¾né znovu podpísa» v2.0 RPM\n"
 
-#: lib/rpmchecksig.c:229
+#: lib/rpmchecksig.c:239
 #, fuzzy, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: readLead zlyhalo\n"
 
-#: lib/rpmchecksig.c:235
+#: lib/rpmchecksig.c:245
 #, fuzzy, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmReadSignature zlyhalo\n"
 
-#: lib/rpmchecksig.c:528
+#: lib/rpmchecksig.c:476
+#, fuzzy, c-format
+msgid "%s: headerGetEntry failed\n"
+msgstr "%s: readLead zlyhalo\n"
+
+#: lib/rpmchecksig.c:547
 #, 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:725
+#: lib/rpmchecksig.c:618
+msgid "========== Package RSA signature\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:637
+msgid "========== Package DSA signature\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:768
 msgid "NOT OK"
 msgstr "NIE JE V PORIADKU"
 
-#: lib/rpmchecksig.c:726 lib/rpmchecksig.c:740
+#: lib/rpmchecksig.c:769 lib/rpmchecksig.c:783
 msgid " (MISSING KEYS:"
 msgstr " (CHİBAJÚCE K¥ÚÈE):"
 
-#: lib/rpmchecksig.c:728 lib/rpmchecksig.c:742
+#: lib/rpmchecksig.c:771 lib/rpmchecksig.c:785
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:729 lib/rpmchecksig.c:743
+#: lib/rpmchecksig.c:772 lib/rpmchecksig.c:786
 msgid " (UNTRUSTED KEYS:"
 msgstr " (NEDÔVERUJE SA K¥ÚÈOM: "
 
-#: lib/rpmchecksig.c:731 lib/rpmchecksig.c:745
+#: lib/rpmchecksig.c:774 lib/rpmchecksig.c:788
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:739
+#: lib/rpmchecksig.c:782
 msgid "OK"
 msgstr "V PORIADKU"
 
@@ -2719,148 +2743,146 @@ msgstr ""
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "Nie je mo¾né otvori» %s pre èítanie: %s."
 
-#: lib/signature.c:117
+#: lib/signature.c:118
 msgid "file is not regular -- skipping size check\n"
 msgstr "nejde o be¾nı súbor - kontrola veµkosti vynechaná\n"
 
-#: lib/signature.c:126
+#: lib/signature.c:127
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:131
+#: lib/signature.c:132
 #, fuzzy, c-format
 msgid "  Actual size: %12d\n"
 msgstr "Veµkos» podpisu:   %d\n"
 
-#: lib/signature.c:151
+#: lib/signature.c:152
 msgid "No signature\n"
 msgstr "Podpis nie je k dispozícii\n"
 
-#: lib/signature.c:155
+#: lib/signature.c:156
 msgid "Old PGP signature\n"
 msgstr "Starı PGP podpis\n"
 
-#: lib/signature.c:168
+#: lib/signature.c:169
 #, 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:224
+#: lib/signature.c:225
 #, fuzzy, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "Veµkos» podpisu:   %d\n"
 
-#: lib/signature.c:299 lib/signature.c:397 lib/signature.c:537
-#: lib/signature.c:569
+#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:656
+#: lib/signature.c:688
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "Nie je mo¾né spusti» %s"
 
-#: lib/signature.c:315
+#: lib/signature.c:322
 #, fuzzy
 msgid "pgp failed\n"
 msgstr "pgp zlyhalo"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:322
+#: lib/signature.c:329
 #, fuzzy
 msgid "pgp failed to write signature\n"
 msgstr "pgp sa nepodarilo zapísa» podpis"
 
-#: lib/signature.c:327
+#: lib/signature.c:334
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr "Veµkos» PGP podpisu: %d\n"
 
-#: lib/signature.c:343 lib/signature.c:442
+#: lib/signature.c:350 lib/signature.c:450
 #, fuzzy
 msgid "unable to read the signature\n"
 msgstr "nie je mo¾né preèíta» podpis"
 
-#: lib/signature.c:348
+#: lib/signature.c:355
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr "Preèítanı PGP podpis obsahuje %d bajtov\n"
 
-#: lib/signature.c:414
+#: lib/signature.c:422
 #, fuzzy
 msgid "gpg failed\n"
 msgstr "gpg zlyhalo"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:421
+#: lib/signature.c:429
 #, fuzzy
 msgid "gpg failed to write signature\n"
 msgstr "gpg sa nepodarilo zapísa» podpis"
 
-#: lib/signature.c:426
+#: lib/signature.c:434
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr "Veµkos» GPG podpisu: %d\n"
 
-#: lib/signature.c:447
+#: lib/signature.c:455
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr "Preèítanı GPG podpis obsahuje %d bajtov\n"
 
-#: lib/signature.c:475
-#, fuzzy
-msgid "Generating signature using PGP.\n"
-msgstr "Vytvára sa PGP podpis: %d\n"
-
-#: lib/signature.c:481
-#, fuzzy
-msgid "Generating signature using GPG.\n"
-msgstr "Vytvára sa PGP podpis: %d\n"
-
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:574 lib/signature.c:627
+#: lib/signature.c:693 lib/signature.c:747
 #, fuzzy, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "Chybná ¹pecifikácia %%_signature v makro-súbore.\n"
 
-#: lib/signature.c:607
+#: lib/signature.c:727
 #, 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:619
+#: lib/signature.c:739
 #, fuzzy, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "Musíte nastavi» \"%%pgp_name\" vo va¹om makro-súbore"
 
-#: lib/signature.c:663
+#: lib/signature.c:783
 #, fuzzy
 msgid "Header+Payload size: "
 msgstr "Priveµká hlavièka"
 
-#: lib/signature.c:692
+#: lib/signature.c:823
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:732
+#: lib/signature.c:880
+msgid "Header SHA1 digest: "
+msgstr ""
+
+#: lib/signature.c:1042
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "vynecha» akékoµvek MD5 podpisy"
 
-#: lib/signature.c:822
+#: lib/signature.c:1135
+msgid "Header "
+msgstr ""
+
+#: lib/signature.c:1136
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "Podpis nie je k dispozícii\n"
 
-#: lib/signature.c:886
+#: lib/signature.c:1214
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:906
+#: lib/signature.c:1240
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:910
+#: lib/signature.c:1244
 #, fuzzy, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Doplnenie podpisu: %d\n"
@@ -3136,42 +3158,42 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging"
 msgstr ""
 
 #. @-modfilesys@
-#: rpmdb/rpmdb.c:129
+#: rpmdb/rpmdb.c:163
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:387
+#: rpmdb/rpmdb.c:440
 #, fuzzy, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr "nie je mo¾né otvori» %s na %s:%d"
 
-#: rpmdb/rpmdb.c:409
+#: rpmdb/rpmdb.c:462
 #, fuzzy, c-format
 msgid "cannot open %s index\n"
 msgstr "nie je mo¾né otvori» %s\n"
 
-#: rpmdb/rpmdb.c:501
+#: rpmdb/rpmdb.c:554
 #, fuzzy, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "chyba pri naèítaní záznamu %s z %s"
 
-#: rpmdb/rpmdb.c:632
+#: rpmdb/rpmdb.c:685
 #, fuzzy, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "chyba pri zápise záznamu %s do %s"
 
-#: rpmdb/rpmdb.c:642
+#: rpmdb/rpmdb.c:695
 #, fuzzy, c-format
 msgid "error(%d) removing record %s from %s\n"
 msgstr "chyba pri odstraòovaní záznamu %s z %s"
 
-#: rpmdb/rpmdb.c:906
+#: rpmdb/rpmdb.c:959
 #, fuzzy
 msgid "no dbpath has been set\n"
 msgstr "nebola nastavená ¾iadna dbpath"
 
-#: rpmdb/rpmdb.c:1054
+#: rpmdb/rpmdb.c:1107
 #, fuzzy
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
@@ -3181,115 +3203,115 @@ msgstr ""
 "databázy v novom formáte"
 
 #. error
-#: rpmdb/rpmdb.c:1319
+#: rpmdb/rpmdb.c:1372
 #, fuzzy, c-format
 msgid "error(%d) counting packages\n"
 msgstr "chyba pri hµadaní balíka %s\n"
 
-#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3372
+#: rpmdb/rpmdb.c:2150 rpmdb/rpmdb.c:3502
 #, fuzzy, c-format
 msgid "record number %u in database is bad -- skipping.\n"
 msgstr "záznam èíslo %d v databáze je chybnı -- bol vynechanı"
 
-#: rpmdb/rpmdb.c:2150
+#: rpmdb/rpmdb.c:2203
 #, c-format
 msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2420
+#: rpmdb/rpmdb.c:2473
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "nie je mo¾né preèíta» hlavièku na %d pre vyhµadanie"
 
-#: rpmdb/rpmdb.c:2540
+#: rpmdb/rpmdb.c:2634
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "odstraòuje sa index skupín\n"
 
-#: rpmdb/rpmdb.c:2544
+#: rpmdb/rpmdb.c:2638
 #, fuzzy, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "odstraòuje sa index názvov\n"
 
-#: rpmdb/rpmdb.c:2714
+#: rpmdb/rpmdb.c:2808
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "chyba pri hµadaní balíka %s\n"
 
-#: rpmdb/rpmdb.c:2873
+#: rpmdb/rpmdb.c:3003
 #, fuzzy, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "premenováva sa %s na %s\n"
 
-#: rpmdb/rpmdb.c:2877
+#: rpmdb/rpmdb.c:3007
 #, fuzzy, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "premenováva sa %s na %s\n"
 
-#: rpmdb/rpmdb.c:3258
+#: rpmdb/rpmdb.c:3388
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3291
+#: rpmdb/rpmdb.c:3421
 msgid "no dbpath has been set"
 msgstr "nebola nastavená ¾iadna dbpath"
 
-#: rpmdb/rpmdb.c:3318
+#: rpmdb/rpmdb.c:3448
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "znovu sa vytvára databáza v adresári %s\n"
 
-#: rpmdb/rpmdb.c:3322
+#: rpmdb/rpmdb.c:3452
 #, fuzzy, c-format
 msgid "temporary database %s already exists\n"
 msgstr "doèasná databáza %s u¾ existuje"
 
-#: rpmdb/rpmdb.c:3328
+#: rpmdb/rpmdb.c:3458
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "vytvára sa adresár %s\n"
 
-#: rpmdb/rpmdb.c:3330
+#: rpmdb/rpmdb.c:3460
 #, fuzzy, c-format
 msgid "creating directory %s: %s\n"
 msgstr "vytvára sa adresár %s\n"
 
-#: rpmdb/rpmdb.c:3337
+#: rpmdb/rpmdb.c:3467
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "otvára sa stará databáza\n"
 
-#: rpmdb/rpmdb.c:3348
+#: rpmdb/rpmdb.c:3478
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "otvára sa nová databáza\n"
 
-#: rpmdb/rpmdb.c:3412
+#: rpmdb/rpmdb.c:3542
 #, fuzzy, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "nie je mo¾né prida» záznam pôvodne na %d"
 
-#: rpmdb/rpmdb.c:3430
+#: rpmdb/rpmdb.c:3560
 #, fuzzy
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr "nepodarilo sa znovu vytvori» databázu; zostáva pôvodná\n"
 
-#: rpmdb/rpmdb.c:3438
+#: rpmdb/rpmdb.c:3568
 msgid "failed to replace old database with new database!\n"
 msgstr "nepodarilo sa nahradi» starú databázu novou!\n"
 
-#: rpmdb/rpmdb.c:3440
+#: rpmdb/rpmdb.c:3570
 #, fuzzy, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "nahradí súbory v %s súbormi z %s kvôli obnove"
 
-#: rpmdb/rpmdb.c:3450
+#: rpmdb/rpmdb.c:3580
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "vytvára sa adresár %s\n"
 
-#: rpmdb/rpmdb.c:3452
+#: rpmdb/rpmdb.c:3582
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "nepodarilo sa odstráni» adresár %s: %s\n"
@@ -3505,6 +3527,14 @@ msgstr "url port musí by» èíslo\n"
 msgid "failed to create %s: %s\n"
 msgstr "nepodarilo sa vytvori» %s\n"
 
+#, fuzzy
+#~ msgid "Generating signature using PGP.\n"
+#~ msgstr "Vytvára sa PGP podpis: %d\n"
+
+#, fuzzy
+#~ msgid "Generating signature using GPG.\n"
+#~ msgstr "Vytvára sa PGP podpis: %d\n"
+
 #~ msgid "no packages given for uninstall"
 #~ msgstr "neboli zadané ¾iadne balíky pre odin¹talovanie"
 
@@ -4677,9 +4707,6 @@ msgstr "nepodarilo sa vytvori» %s\n"
 #~ msgid "expected size   : %d\n"
 #~ msgstr "oèakávaná veµkos»: %d\n"
 
-#~ msgid "New Header signature\n"
-#~ msgstr "Nová hlavièka podpisu\n"
-
 #, fuzzy
 #~ msgid "path %s is not relocateable for package %s-%s-%s"
 #~ msgstr "balík %s nie je nain¹talovanı\n"
diff --git a/po/sl.po b/po/sl.po
index 902fa2224..e5bc4255d 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.225 2002/02/10 21:14:18 jbj Exp $
+# $Id: sl.po,v 1.226 2002/03/06 23:18:03 jbj Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-02-10 13:58-0500\n"
+"POT-Creation-Date: 2002-03-06 18:13-0500\n"
 "PO-Revision-Date: 2000-10-08 19:05+0200\n"
 "Last-Translator: Grega Fajdiga <gregor.fajdiga@telemach.net>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -197,7 +197,7 @@ msgstr "RPM razlièica %s\n"
 
 #: rpmqv.c:235
 #, fuzzy
-msgid "Copyright (C) 1998-2000 - Red Hat, Inc."
+msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
 msgstr "Copyright (C) 1998 - Red Hat Software"
 
 #: rpmqv.c:236
@@ -443,7 +443,7 @@ msgstr "neprièakovani argumenti za --querytags "
 msgid "no arguments given"
 msgstr "argumenti za poizvedbo niso podani"
 
-#: build/build.c:125 build/pack.c:479
+#: build/build.c:125 build/pack.c:483
 #, fuzzy
 msgid "Unable to open temp file.\n"
 msgstr "Zaèasne datoteke ni mo¾no odpreti"
@@ -798,7 +798,7 @@ msgstr "readRPM: odpiranje %s: %s\n"
 msgid "readRPM: read %s: %s\n"
 msgstr "readRPM: branje %s: %s\n"
 
-#: build/pack.c:305 build/pack.c:521
+#: build/pack.c:305 build/pack.c:529
 #, fuzzy, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: branje Fread je bilo neuspe¹no: %s\n"
@@ -813,82 +813,82 @@ msgstr "readRPM: %s ni paket tipa RPM\n"
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: branje glave %s\n"
 
-#: build/pack.c:467
+#: build/pack.c:471
 #, fuzzy
 msgid "Unable to create immutable header region.\n"
 msgstr "Ikone %s ni mo¾no prebrati: %s"
 
-#: build/pack.c:485
+#: build/pack.c:490
 #, fuzzy
 msgid "Unable to write temp header\n"
 msgstr "Ni mo¾no zapisati paketa %s: %s"
 
-#: build/pack.c:493
+#: build/pack.c:500
 #, fuzzy
 msgid "Bad CSA data\n"
 msgstr "Po¹kodovani podatki CSA"
 
-#: build/pack.c:528
+#: build/pack.c:536
 #, fuzzy
 msgid "Unable to write final header\n"
 msgstr "Ni mo¾no zapisati paketa %s: %s"
 
-#: build/pack.c:546
+#: build/pack.c:556
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "Izdelujemo podpis: %d\n"
 
-#: build/pack.c:559
+#: build/pack.c:574
 #, fuzzy
 msgid "Unable to reload signature header.\n"
 msgstr "Ikone %s ni mo¾no prebrati: %s"
 
-#: build/pack.c:567
+#: build/pack.c:582
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr "Ni mo¾no odpreti %s: %s\n"
 
-#: build/pack.c:603 lib/psm.c:1444
+#: build/pack.c:618 lib/psm.c:1444
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Ni mo¾no zapisati paketa: %s"
 
-#: build/pack.c:618
+#: build/pack.c:633
 #, fuzzy, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "Ciljnega podpisa %s ni mo¾no odpreti: %s"
 
-#: build/pack.c:628
+#: build/pack.c:644
 #, fuzzy, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "Ikone %s ni mo¾no prebrati: %s"
 
-#: build/pack.c:642
+#: build/pack.c:658
 #, fuzzy, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "Ni mo¾no zapisati paketa %s: %s"
 
-#: build/pack.c:652
+#: build/pack.c:668
 #, fuzzy, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "Ikone %s ni mo¾no prebrati: %s"
 
-#: build/pack.c:658
+#: build/pack.c:674
 #, fuzzy, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Ni mo¾no zapisati paketa %s: %s"
 
-#: build/pack.c:683 lib/psm.c:1725
+#: build/pack.c:699 lib/psm.c:1725
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Zapisano: %s\n"
 
-#: build/pack.c:750
+#: build/pack.c:766
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr "Neuspe¹no ustvarjanje izhodne datoteke za paket %s: %s\n"
 
-#: build/pack.c:767
+#: build/pack.c:783
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr "ni mo¾no ustvariti %s: %s\n"
@@ -1651,43 +1651,54 @@ msgstr "opozorilo: %s ustvarjen kot %s"
 msgid "error creating temporary file %s\n"
 msgstr "napaka pri ustvarjanju zaèasne datoteke %s"
 
-#: lib/package.c:167 lib/package.c:238
+#: lib/package.c:179 lib/package.c:255
 #, fuzzy
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr "ta razlièica RPM podpira samo pakete z glavnim ¹tevilom razlièice <= 3"
 
-#: lib/package.c:188 lib/package.c:246
+#: lib/package.c:200 lib/package.c:263
 #, fuzzy
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr "ta razlièica RPM podpira samo pakete z glavnim ¹tevilom razlièice <=4"
 
-#: lib/package.c:224 lib/rpmchecksig.c:156 lib/rpmchecksig.c:522
+#: lib/package.c:241 lib/rpmchecksig.c:161 lib/rpmchecksig.c:541
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: readLead je bil neuspe¹en\n"
 
-#: lib/package.c:230
+#: lib/package.c:247
 #, fuzzy, c-format
 msgid "%s: bad magic\n"
 msgstr "Napaèno magièno ¹tevilo"
 
-#: lib/package.c:254 lib/rpmchecksig.c:174 lib/rpmchecksig.c:538
+#: lib/package.c:272 lib/rpmchecksig.c:179 lib/rpmchecksig.c:557
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: rpmReadSignature je bil neuspe¹en\n"
 
-#: lib/package.c:258 lib/rpmchecksig.c:178 lib/rpmchecksig.c:543
+#: lib/package.c:276 lib/rpmchecksig.c:183 lib/rpmchecksig.c:562
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Podpis ni na voljo\n"
 
-#: lib/package.c:284
+#: lib/package.c:304 lib/rpmchecksig.c:462
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: readLead je bil neuspe¹en\n"
 
-#: lib/package.c:303 lib/rpmchecksig.c:107 lib/rpmchecksig.c:466
+#. Parse the parameters from the OpenPGP packets that will be needed.
+#: lib/package.c:334 lib/rpmchecksig.c:631
+#, fuzzy
+msgid "========== Header DSA signature\n"
+msgstr "Podpis v novi glavi\n"
+
+#. Parse the parameters from the OpenPGP packets that will be needed.
+#: lib/package.c:357
+msgid "========== Package DSA/RSA signature\n"
+msgstr ""
+
+#: lib/package.c:366 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: branje Fread je bilo neuspe¹no: %s\n"
@@ -2447,66 +2458,79 @@ msgstr "po¹kodovana zbirka podatkov %s"
 msgid "(added provide)"
 msgstr "%s: %-45s DA (db ponudbe)\n"
 
-#: lib/rpmchecksig.c:49
+#: lib/rpmchecksig.c:51
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s: odpiranje je bilo neuspe¹no: %s\n"
 
-#: lib/rpmchecksig.c:61
+#: lib/rpmchecksig.c:63
 msgid "makeTempFile failed\n"
 msgstr "makeTempFile je bil neuspe¹en\n"
 
-#: lib/rpmchecksig.c:101
+#: lib/rpmchecksig.c:104
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: pisanje Fwrite je bilo neuspe¹no: %s\n"
 
-#: lib/rpmchecksig.c:161
-#, c-format
-msgid "%s: Can't sign v1.0 RPM\n"
+#: lib/rpmchecksig.c:166
+#, fuzzy, c-format
+msgid "%s: Can't sign v1 packaging\n"
 msgstr "%s: Podpis RPM v1.0 ni mo¾en\n"
 
-#: lib/rpmchecksig.c:165
-#, c-format
-msgid "%s: Can't re-sign v2.0 RPM\n"
+#: lib/rpmchecksig.c:170
+#, fuzzy, c-format
+msgid "%s: Can't re-sign v2 packaging\n"
 msgstr "%s: Sprememba podpisa RPM v2.0 ni mo¾na\n"
 
-#: lib/rpmchecksig.c:229
+#: lib/rpmchecksig.c:239
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: writeLead je bil neuspe¹en: %s\n"
 
-#: lib/rpmchecksig.c:235
+#: lib/rpmchecksig.c:245
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmWriteSignature je bilo neuspe¹no: %s\n"
 
-#: lib/rpmchecksig.c:528
+#: lib/rpmchecksig.c:476
+#, fuzzy, c-format
+msgid "%s: headerGetEntry failed\n"
+msgstr "%s: readLead je bil neuspe¹en\n"
+
+#: lib/rpmchecksig.c:547
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: Podpis ni na voljo (RPM v1.0)\n"
 
-#: lib/rpmchecksig.c:725
+#: lib/rpmchecksig.c:618
+msgid "========== Package RSA signature\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:637
+msgid "========== Package DSA signature\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:768
 msgid "NOT OK"
 msgstr "NI DOBRO"
 
-#: lib/rpmchecksig.c:726 lib/rpmchecksig.c:740
+#: lib/rpmchecksig.c:769 lib/rpmchecksig.c:783
 msgid " (MISSING KEYS:"
 msgstr " (MANJKAJOÈI KLJUÈI:"
 
-#: lib/rpmchecksig.c:728 lib/rpmchecksig.c:742
+#: lib/rpmchecksig.c:771 lib/rpmchecksig.c:785
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:729 lib/rpmchecksig.c:743
+#: lib/rpmchecksig.c:772 lib/rpmchecksig.c:786
 msgid " (UNTRUSTED KEYS:"
 msgstr " (NEPREVERJENI KLJUÈI:"
 
-#: lib/rpmchecksig.c:731 lib/rpmchecksig.c:745
+#: lib/rpmchecksig.c:774 lib/rpmchecksig.c:788
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:739
+#: lib/rpmchecksig.c:782
 msgid "OK"
 msgstr "V REDU"
 
@@ -2719,146 +2743,146 @@ msgstr "Ni mo¾no prebrati %s, HOME je prevelik."
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "%s ni mo¾no odpreti za branje: %s."
 
-#: lib/signature.c:117
+#: lib/signature.c:118
 msgid "file is not regular -- skipping size check\n"
 msgstr "datoteka ni navadna datoteka -- preskakujemo preverjanje velikosti\n"
 
-#: lib/signature.c:126
+#: lib/signature.c:127
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:131
+#: lib/signature.c:132
 #, fuzzy, c-format
 msgid "  Actual size: %12d\n"
 msgstr "Dol¾. podpisa : %d\n"
 
-#: lib/signature.c:151
+#: lib/signature.c:152
 msgid "No signature\n"
 msgstr "Podpis manjka\n"
 
-#: lib/signature.c:155
+#: lib/signature.c:156
 msgid "Old PGP signature\n"
 msgstr "Stari podpis PGP\n"
 
-#: lib/signature.c:168
+#: lib/signature.c:169
 #, 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:224
+#: lib/signature.c:225
 #, fuzzy, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "Dol¾. podpisa : %d\n"
 
-#: lib/signature.c:299 lib/signature.c:397 lib/signature.c:537
-#: lib/signature.c:569
+#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:656
+#: lib/signature.c:688
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "Ni mo¾no izvesti %s: %s"
 
-#: lib/signature.c:315
+#: lib/signature.c:322
 #, fuzzy
 msgid "pgp failed\n"
 msgstr "pgp je bil neuspe¹en"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:322
+#: lib/signature.c:329
 #, fuzzy
 msgid "pgp failed to write signature\n"
 msgstr "pgp je bil neuspe¹en pri zapisu podpisa"
 
-#: lib/signature.c:327
+#: lib/signature.c:334
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr "Dol¾. podpisa PGP: %d\n"
 
-#: lib/signature.c:343 lib/signature.c:442
+#: lib/signature.c:350 lib/signature.c:450
 #, fuzzy
 msgid "unable to read the signature\n"
 msgstr "branje podpisa je bilo neuspe¹no"
 
-#: lib/signature.c:348
+#: lib/signature.c:355
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr "Prebrano %d bajtov podpisa PGP\n"
 
-#: lib/signature.c:414
+#: lib/signature.c:422
 #, fuzzy
 msgid "gpg failed\n"
 msgstr "gpg je bil neuspe¹en"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:421
+#: lib/signature.c:429
 #, fuzzy
 msgid "gpg failed to write signature\n"
 msgstr "gpg je boil neuspe¹en pri zapisu podpisa"
 
-#: lib/signature.c:426
+#: lib/signature.c:434
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr "Dol¾. podpisa GnuPG: %d\n"
 
-#: lib/signature.c:447
+#: lib/signature.c:455
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr "Prebrano %d bajtov podpisa GnuPG\n"
 
-#: lib/signature.c:475
-msgid "Generating signature using PGP.\n"
-msgstr "Ustvarjanje podpisa s PGP.\n"
-
-#: lib/signature.c:481
-msgid "Generating signature using GPG.\n"
-msgstr "Ustvarjanje podpisa z GnuPG.\n"
-
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:574 lib/signature.c:627
+#: lib/signature.c:693 lib/signature.c:747
 #, fuzzy, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "Neveljaven %%_signature v makro-datoteki.\n"
 
-#: lib/signature.c:607
+#: lib/signature.c:727
 #, fuzzy, c-format
 msgid "You must set \"%%_gpg_name\" in your macro file\n"
 msgstr "V makrodatoteki morate nastaviti \"%%_pgp_name\""
 
-#: lib/signature.c:619
+#: lib/signature.c:739
 #, fuzzy, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "V makrodatoteki morate nastaviti \"%%_pgp_name\""
 
-#: lib/signature.c:663
+#: lib/signature.c:783
 #, fuzzy
 msgid "Header+Payload size: "
 msgstr "Glava je predolga"
 
-#: lib/signature.c:692
+#: lib/signature.c:823
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:732
+#: lib/signature.c:880
+msgid "Header SHA1 digest: "
+msgstr ""
+
+#: lib/signature.c:1042
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "preskoèi vse podpise MD5"
 
-#: lib/signature.c:822
+#: lib/signature.c:1135
+msgid "Header "
+msgstr ""
+
+#: lib/signature.c:1136
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "Podpis manjka\n"
 
-#: lib/signature.c:886
+#: lib/signature.c:1214
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:906
+#: lib/signature.c:1240
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:910
+#: lib/signature.c:1244
 #, fuzzy, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Dol¾. polnila : %d\n"
@@ -3138,42 +3162,42 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging"
 msgstr ""
 
 #. @-modfilesys@
-#: rpmdb/rpmdb.c:129
+#: rpmdb/rpmdb.c:163
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr "dbiTagsInit: neprepoznano ime znaèke: \"%s\" prezrto\n"
 
-#: rpmdb/rpmdb.c:387
+#: rpmdb/rpmdb.c:440
 #, fuzzy, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr "ni mo¾no odpreti kazala %s z uporabo db%d - %s (%d)"
 
-#: rpmdb/rpmdb.c:409
+#: rpmdb/rpmdb.c:462
 #, fuzzy, c-format
 msgid "cannot open %s index\n"
 msgstr "ni mo¾no odpreti kazala %s:"
 
-#: rpmdb/rpmdb.c:501
+#: rpmdb/rpmdb.c:554
 #, fuzzy, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "napaka(%d) pri branju zapisov \"%s\" iz kazala %s"
 
-#: rpmdb/rpmdb.c:632
+#: rpmdb/rpmdb.c:685
 #, fuzzy, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "napaka(%d) pri pisanju zapisa %s v %s"
 
-#: rpmdb/rpmdb.c:642
+#: rpmdb/rpmdb.c:695
 #, fuzzy, c-format
 msgid "error(%d) removing record %s from %s\n"
 msgstr "napaka(%d) pri brisanju zapisa %s iz %s"
 
-#: rpmdb/rpmdb.c:906
+#: rpmdb/rpmdb.c:959
 #, fuzzy
 msgid "no dbpath has been set\n"
 msgstr "dbpath ni nastavljena"
 
-#: rpmdb/rpmdb.c:1054
+#: rpmdb/rpmdb.c:1107
 #, fuzzy
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
@@ -3182,117 +3206,117 @@ msgstr ""
 "da bi staro obliko zbirke podatkov pretvorili v novo po¾enite --rebuilddb"
 
 #. error
-#: rpmdb/rpmdb.c:1319
+#: rpmdb/rpmdb.c:1372
 #, fuzzy, c-format
 msgid "error(%d) counting packages\n"
 msgstr "napaka(%d) pri ¹tetju paketov"
 
-#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3372
+#: rpmdb/rpmdb.c:2150 rpmdb/rpmdb.c:3502
 #, fuzzy, c-format
 msgid "record number %u in database is bad -- skipping.\n"
 msgstr "zapis ¹t. %d v zbirki je po¹kodovan -- preskoèeno."
 
-#: rpmdb/rpmdb.c:2150
+#: rpmdb/rpmdb.c:2203
 #, c-format
 msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2420
+#: rpmdb/rpmdb.c:2473
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "%s: ni mo¾no prebrati glave pri 0x%x"
 
-#: rpmdb/rpmdb.c:2540
+#: rpmdb/rpmdb.c:2634
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "odstranjevanje \"%s\" iz kazala %s.\n"
 
-#: rpmdb/rpmdb.c:2544
+#: rpmdb/rpmdb.c:2638
 #, fuzzy, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "odstranjevanje %d vnosov iz kazala %s\n"
 
-#: rpmdb/rpmdb.c:2714
+#: rpmdb/rpmdb.c:2808
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "napaka(%d) pri iskanju paketa %s\n"
 
-#: rpmdb/rpmdb.c:2873
+#: rpmdb/rpmdb.c:3003
 #, fuzzy, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "dodajanje \"%s\" v kazalo %s.\n"
 
-#: rpmdb/rpmdb.c:2877
+#: rpmdb/rpmdb.c:3007
 #, fuzzy, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "dodajanje %d vnosov v kazalo %s.\n"
 
-#: rpmdb/rpmdb.c:3258
+#: rpmdb/rpmdb.c:3388
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3291
+#: rpmdb/rpmdb.c:3421
 msgid "no dbpath has been set"
 msgstr "dbpath ni nastavljena"
 
-#: rpmdb/rpmdb.c:3318
+#: rpmdb/rpmdb.c:3448
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "ponovna izgradnja podatkovne zbirke %s v %s\n"
 
-#: rpmdb/rpmdb.c:3322
+#: rpmdb/rpmdb.c:3452
 #, fuzzy, c-format
 msgid "temporary database %s already exists\n"
 msgstr "zaèasna podatkovna zbirka %s ¾e obstaja"
 
-#: rpmdb/rpmdb.c:3328
+#: rpmdb/rpmdb.c:3458
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "ustvarjanje imenika: %s\n"
 
-#: rpmdb/rpmdb.c:3330
+#: rpmdb/rpmdb.c:3460
 #, fuzzy, c-format
 msgid "creating directory %s: %s\n"
 msgstr "ustvarjanje imenika: %s\n"
 
-#: rpmdb/rpmdb.c:3337
+#: rpmdb/rpmdb.c:3467
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "odpiranje stare podatkovne zbirke\n"
 
-#: rpmdb/rpmdb.c:3348
+#: rpmdb/rpmdb.c:3478
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "odpiramo nove podatkovne zbirke z dbapi %d\n"
 
-#: rpmdb/rpmdb.c:3412
+#: rpmdb/rpmdb.c:3542
 #, fuzzy, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "zapisa ni mo¾no dodati na %d"
 
-#: rpmdb/rpmdb.c:3430
+#: rpmdb/rpmdb.c:3560
 #, fuzzy
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 "ponovna izgradnja podatkovne zbirke je bila neuspe¹na; stara ostaja na\n"
 "istem mestu\n"
 
-#: rpmdb/rpmdb.c:3438
+#: rpmdb/rpmdb.c:3568
 msgid "failed to replace old database with new database!\n"
 msgstr "zamenjava stare podatkovne zbirke z novo je bila neuspe¹na!\n"
 
-#: rpmdb/rpmdb.c:3440
+#: rpmdb/rpmdb.c:3570
 #, fuzzy, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "poskus povrnitve z nadomestitvijo datotek v %s z datotekami v %s"
 
-#: rpmdb/rpmdb.c:3450
+#: rpmdb/rpmdb.c:3580
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "odstranjevanje imenika: %s\n"
 
-#: rpmdb/rpmdb.c:3452
+#: rpmdb/rpmdb.c:3582
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "neuspe¹na odstranitev imenika %s: %s\n"
@@ -3508,6 +3532,12 @@ msgstr "vrata URL morajo biti ¹tevilka\n"
 msgid "failed to create %s: %s\n"
 msgstr "neuspe¹no ustvarjanje %s: %s\n"
 
+#~ msgid "Generating signature using PGP.\n"
+#~ msgstr "Ustvarjanje podpisa s PGP.\n"
+
+#~ msgid "Generating signature using GPG.\n"
+#~ msgstr "Ustvarjanje podpisa z GnuPG.\n"
+
 #~ msgid "no packages given for uninstall"
 #~ msgstr "paketi katere bi bilo potrebno odstraniti niso navedeni"
 
@@ -4766,9 +4796,6 @@ msgstr "neuspe¹no ustvarjanje %s: %s\n"
 #~ msgid "undefined identifier"
 #~ msgstr "nedefiniran identifikator"
 
-#~ msgid "New Header signature\n"
-#~ msgstr "Podpis v novi glavi\n"
-
 #~ msgid "sigsize         : %d\n"
 #~ msgstr "dol¾ina podpisa : %d\n"
 
diff --git a/po/sr.po b/po/sr.po
index f932d9a8e..0fea6c439 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-02-10 13:58-0500\n"
+"POT-Creation-Date: 2002-03-06 18:13-0500\n"
 "Content-Type: text/plain; charset=\n"
 "Date: 1998-05-02 21:41:47-0400\n"
 
@@ -188,7 +188,7 @@ msgid "RPM version %s\n"
 msgstr "RPM verzija %s\n"
 
 #: rpmqv.c:235
-msgid "Copyright (C) 1998-2000 - Red Hat, Inc."
+msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
 msgstr ""
 
 #: rpmqv.c:236
@@ -340,23 +340,19 @@ msgstr "--justdb mo¾ete koristiti samo kod instalacije i brisanja paketa"
 msgid ""
 "--nodeps may only be specified during package building, rebuilding, "
 "recompilation, installation,erasure, and verification"
-msgstr ""
-"--nodeps mo¾ete koristiti samo kod instalacije, uklanjanja ili provere paketa"
+msgstr "--nodeps mo¾ete koristiti samo kod instalacije, uklanjanja ili provere paketa"
 
 #: rpmqv.c:814
 msgid ""
 "--test may only be specified during package installation, erasure, and "
 "building"
-msgstr ""
-"--test mo¾ete koristiti samo kod instalacije, uklanjanja ili kreiranja paketa"
+msgstr "--test mo¾ete koristiti samo kod instalacije, uklanjanja ili kreiranja paketa"
 
 #: rpmqv.c:819
 msgid ""
 "--root (-r) may only be specified during installation, erasure, querying, "
 "and database rebuilds"
-msgstr ""
-"--root (-r) mo¾ete navesti samo kod instalacije, uklanjanja, upita ili "
-"rekreiranja baze podataka"
+msgstr "--root (-r) mo¾ete navesti samo kod instalacije, uklanjanja, upita ili rekreiranja baze podataka"
 
 #: rpmqv.c:831
 msgid "arguments to --root (-r) must begin with a /"
@@ -440,7 +436,7 @@ msgstr "neoèekivani argumenti za --querytags"
 msgid "no arguments given"
 msgstr "nedostaju argumenti za upit"
 
-#: build/build.c:125 build/pack.c:479
+#: build/build.c:125 build/pack.c:483
 #, fuzzy
 msgid "Unable to open temp file.\n"
 msgstr "Ne mogu da otvorim %s za èitanje: %s"
@@ -788,7 +784,7 @@ msgstr "neuspelo otvaranje %s: %s"
 msgid "readRPM: read %s: %s\n"
 msgstr "Neuspelo èitanje %s: %s."
 
-#: build/pack.c:305 build/pack.c:521
+#: build/pack.c:305 build/pack.c:529
 #, fuzzy, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: Neuspeo 'readLead'\n"
@@ -803,81 +799,81 @@ msgstr "gre¹ka: èini se da %s nije RPM paket\n"
 msgid "readRPM: reading header from %s\n"
 msgstr "gre¹ka kod uzimanja sloga %s iz %s"
 
-#: build/pack.c:467
+#: build/pack.c:471
 #, fuzzy
 msgid "Unable to create immutable header region.\n"
 msgstr "Ne mogu da upi¹em %s"
 
-#: build/pack.c:485
+#: build/pack.c:490
 #, fuzzy
 msgid "Unable to write temp header\n"
 msgstr "Ne mogu da upi¹em %s"
 
-#: build/pack.c:493
+#: build/pack.c:500
 msgid "Bad CSA data\n"
 msgstr ""
 
-#: build/pack.c:528
+#: build/pack.c:536
 #, fuzzy
 msgid "Unable to write final header\n"
 msgstr "Ne mogu da upi¹em %s"
 
-#: build/pack.c:546
+#: build/pack.c:556
 #, fuzzy, c-format
 msgid "Generating signature: %d\n"
 msgstr "napravi PGP potpis"
 
-#: build/pack.c:559
+#: build/pack.c:574
 #, fuzzy
 msgid "Unable to reload signature header.\n"
 msgstr "Ne mogu da upi¹em %s"
 
-#: build/pack.c:567
+#: build/pack.c:582
 #, fuzzy, c-format
 msgid "Could not open %s: %s\n"
 msgstr "neuspelo otvaranje %s\n"
 
-#: build/pack.c:603 lib/psm.c:1444
+#: build/pack.c:618 lib/psm.c:1444
 #, fuzzy, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Ne mogu da upi¹em %s"
 
-#: build/pack.c:618
+#: build/pack.c:633
 #, fuzzy, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "Ne mogu da upi¹em %s"
 
-#: build/pack.c:628
+#: build/pack.c:644
 #, fuzzy, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "Ne mogu da upi¹em %s"
 
-#: build/pack.c:642
+#: build/pack.c:658
 #, fuzzy, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "Ne mogu da upi¹em %s"
 
-#: build/pack.c:652
+#: build/pack.c:668
 #, fuzzy, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "Ne mogu da upi¹em %s"
 
-#: build/pack.c:658
+#: build/pack.c:674
 #, fuzzy, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Ne mogu da upi¹em %s"
 
-#: build/pack.c:683 lib/psm.c:1725
+#: build/pack.c:699 lib/psm.c:1725
 #, c-format
 msgid "Wrote: %s\n"
 msgstr ""
 
-#: build/pack.c:750
+#: build/pack.c:766
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr ""
 
-#: build/pack.c:767
+#: build/pack.c:783
 #, fuzzy, c-format
 msgid "cannot create %s: %s\n"
 msgstr "Ne mogu da otvorim datoteku %s: "
@@ -1638,43 +1634,54 @@ msgstr "Ne mogu da otvorim datoteku %s: "
 msgid "error creating temporary file %s\n"
 msgstr "gre¹ka kod kreiranja direktorijuma %s: %s"
 
-#: lib/package.c:167 lib/package.c:238
+#: lib/package.c:179 lib/package.c:255
 #, fuzzy
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr "samo paketi sa glavnim brojevima <= 3 su podr¾ani u ovoj verziji RPM-a"
 
-#: lib/package.c:188 lib/package.c:246
+#: lib/package.c:200 lib/package.c:263
 #, fuzzy
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr "samo paketi sa glavnim brojevima <= 3 su podr¾ani u ovoj verziji RPM-a"
 
-#: lib/package.c:224 lib/rpmchecksig.c:156 lib/rpmchecksig.c:522
+#: lib/package.c:241 lib/rpmchecksig.c:161 lib/rpmchecksig.c:541
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: Neuspeo 'readLead'\n"
 
-#: lib/package.c:230
+#: lib/package.c:247
 #, c-format
 msgid "%s: bad magic\n"
 msgstr ""
 
-#: lib/package.c:254 lib/rpmchecksig.c:174 lib/rpmchecksig.c:538
+#: lib/package.c:272 lib/rpmchecksig.c:179 lib/rpmchecksig.c:557
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: Neuspelo 'rpmReadSignature'\n"
 
-#: lib/package.c:258 lib/rpmchecksig.c:178 lib/rpmchecksig.c:543
+#: lib/package.c:276 lib/rpmchecksig.c:183 lib/rpmchecksig.c:562
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Potpis nije na raspolaganju\n"
 
-#: lib/package.c:284
+#: lib/package.c:304 lib/rpmchecksig.c:462
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: Neuspeo 'readLead'\n"
 
-#: lib/package.c:303 lib/rpmchecksig.c:107 lib/rpmchecksig.c:466
+#. Parse the parameters from the OpenPGP packets that will be needed.
+#: lib/package.c:334 lib/rpmchecksig.c:631
+#, fuzzy
+msgid "========== Header DSA signature\n"
+msgstr "ne mogu da proèitam potpis"
+
+#. Parse the parameters from the OpenPGP packets that will be needed.
+#: lib/package.c:357
+msgid "========== Package DSA/RSA signature\n"
+msgstr ""
+
+#: lib/package.c:366 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
 #, fuzzy, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Neuspeo 'readLead'\n"
@@ -1706,16 +1713,13 @@ msgstr ""
 
 #: lib/poptI.c:110
 msgid "install all files, even configurations which might otherwise be skipped"
-msgstr ""
-"instaliraj sve datoteke, èak i konfiguracije koje bi inaèe bile preskoèene"
+msgstr "instaliraj sve datoteke, èak i konfiguracije koje bi inaèe bile preskoèene"
 
 #: lib/poptI.c:114
 msgid ""
 "remove all packages which match <package> (normally an error is generated if "
 "<package> specified multiple packages)"
-msgstr ""
-"ukloni sve pakete koji odgovaraju <paketu> (normalno, javlja se gre¹ka ako "
-"<paket> oznaèava vi¹e paketa)"
+msgstr "ukloni sve pakete koji odgovaraju <paketu> (normalno, javlja se gre¹ka ako <paket> oznaèava vi¹e paketa)"
 
 #: lib/poptI.c:120 lib/poptI.c:171
 #, fuzzy
@@ -1852,8 +1856,7 @@ msgstr "nemoj izvr¹iti nijedan instalacioni skript"
 msgid ""
 "upgrade to an old version of the package (--force on upgrades does this "
 "automatically)"
-msgstr ""
-"a¾uriraj na staru verziju paketa (--force kod a¾uriranja ovo radi automatski)"
+msgstr "a¾uriraj na staru verziju paketa (--force kod a¾uriranja ovo radi automatski)"
 
 #: lib/poptI.c:207
 msgid "print percentages as package installs"
@@ -2441,68 +2444,81 @@ msgstr "neuspelo otvaranje %s: %s"
 msgid "(added provide)"
 msgstr "datoteka %s ne pripada nijednom paketu\n"
 
-#: lib/rpmchecksig.c:49
+#: lib/rpmchecksig.c:51
 #, fuzzy, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s: Neuspelo otvaranje\n"
 
-#: lib/rpmchecksig.c:61
+#: lib/rpmchecksig.c:63
 #, fuzzy
 msgid "makeTempFile failed\n"
 msgstr "%s: Neuspelo otvaranje\n"
 
-#: lib/rpmchecksig.c:101
+#: lib/rpmchecksig.c:104
 #, fuzzy, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: Neuspeo 'readLead'\n"
 
-#: lib/rpmchecksig.c:161
-#, c-format
-msgid "%s: Can't sign v1.0 RPM\n"
+#: lib/rpmchecksig.c:166
+#, fuzzy, c-format
+msgid "%s: Can't sign v1 packaging\n"
 msgstr "%s: Ne mogu da potpi¹em v1.0 RPM\n"
 
-#: lib/rpmchecksig.c:165
-#, c-format
-msgid "%s: Can't re-sign v2.0 RPM\n"
+#: lib/rpmchecksig.c:170
+#, fuzzy, c-format
+msgid "%s: Can't re-sign v2 packaging\n"
 msgstr "%s: Ne mogu da ponovo potpi¹em v2.0 RPM\n"
 
-#: lib/rpmchecksig.c:229
+#: lib/rpmchecksig.c:239
 #, fuzzy, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: Neuspeo 'readLead'\n"
 
-#: lib/rpmchecksig.c:235
+#: lib/rpmchecksig.c:245
 #, fuzzy, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: Neuspelo 'rpmReadSignature'\n"
 
-#: lib/rpmchecksig.c:528
+#: lib/rpmchecksig.c:476
+#, fuzzy, c-format
+msgid "%s: headerGetEntry failed\n"
+msgstr "%s: Neuspeo 'readLead'\n"
+
+#: lib/rpmchecksig.c:547
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: Potpis nije na raspolaganju (RPM v1.0)\n"
 
-#: lib/rpmchecksig.c:725
+#: lib/rpmchecksig.c:618
+msgid "========== Package RSA signature\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:637
+msgid "========== Package DSA signature\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:768
 msgid "NOT OK"
 msgstr ""
 
-#: lib/rpmchecksig.c:726 lib/rpmchecksig.c:740
+#: lib/rpmchecksig.c:769 lib/rpmchecksig.c:783
 #, fuzzy
 msgid " (MISSING KEYS:"
 msgstr " (NEDOSTAJUÆI KLJUÈEVI)"
 
-#: lib/rpmchecksig.c:728 lib/rpmchecksig.c:742
+#: lib/rpmchecksig.c:771 lib/rpmchecksig.c:785
 msgid ") "
 msgstr ""
 
-#: lib/rpmchecksig.c:729 lib/rpmchecksig.c:743
+#: lib/rpmchecksig.c:772 lib/rpmchecksig.c:786
 msgid " (UNTRUSTED KEYS:"
 msgstr ""
 
-#: lib/rpmchecksig.c:731 lib/rpmchecksig.c:745
+#: lib/rpmchecksig.c:774 lib/rpmchecksig.c:788
 msgid ")"
 msgstr ""
 
-#: lib/rpmchecksig.c:739
+#: lib/rpmchecksig.c:782
 msgid "OK"
 msgstr ""
 
@@ -2714,149 +2730,147 @@ msgstr ""
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "Ne mogu da otvorim %s za èitanje: %s"
 
-#: lib/signature.c:117
+#: lib/signature.c:118
 msgid "file is not regular -- skipping size check\n"
 msgstr ""
 
-#: lib/signature.c:126
+#: lib/signature.c:127
 #, c-format
 msgid "Expected size: %12d = lead(%d)+sigs(%d)+pad(%d)+data(%d)\n"
 msgstr ""
 
-#: lib/signature.c:131
+#: lib/signature.c:132
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr ""
 
-#: lib/signature.c:151
+#: lib/signature.c:152
 #, fuzzy
 msgid "No signature\n"
 msgstr "%s: Potpis nije na raspolaganju\n"
 
-#: lib/signature.c:155
+#: lib/signature.c:156
 #, fuzzy
 msgid "Old PGP signature\n"
 msgstr "napravi PGP potpis"
 
-#: lib/signature.c:168
+#: lib/signature.c:169
 #, fuzzy
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr "Stari (interni) potpis!  Odakle vam!?"
 
-#: lib/signature.c:224
+#: lib/signature.c:225
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr ""
 
-#: lib/signature.c:299 lib/signature.c:397 lib/signature.c:537
-#: lib/signature.c:569
+#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:656
+#: lib/signature.c:688
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "Ne mogu da izvr¹im PGP"
 
-#: lib/signature.c:315
+#: lib/signature.c:322
 #, fuzzy
 msgid "pgp failed\n"
 msgstr "PGP omanuo"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:322
+#: lib/signature.c:329
 #, fuzzy
 msgid "pgp failed to write signature\n"
 msgstr "PGP nije uspeo da zapi¹e potpis"
 
-#: lib/signature.c:327
+#: lib/signature.c:334
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:343 lib/signature.c:442
+#: lib/signature.c:350 lib/signature.c:450
 #, fuzzy
 msgid "unable to read the signature\n"
 msgstr "ne mogu da proèitam potpis"
 
-#: lib/signature.c:348
+#: lib/signature.c:355
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr ""
 
-#: lib/signature.c:414
+#: lib/signature.c:422
 #, fuzzy
 msgid "gpg failed\n"
 msgstr "PGP omanuo"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:421
+#: lib/signature.c:429
 #, fuzzy
 msgid "gpg failed to write signature\n"
 msgstr "PGP nije uspeo da zapi¹e potpis"
 
-#: lib/signature.c:426
+#: lib/signature.c:434
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr ""
 
-#: lib/signature.c:447
+#: lib/signature.c:455
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr ""
 
-#: lib/signature.c:475
-#, fuzzy
-msgid "Generating signature using PGP.\n"
-msgstr "napravi PGP potpis"
-
-#: lib/signature.c:481
-#, fuzzy
-msgid "Generating signature using GPG.\n"
-msgstr "napravi PGP potpis"
-
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:574 lib/signature.c:627
+#: lib/signature.c:693 lib/signature.c:747
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr ""
 
-#: lib/signature.c:607
+#: lib/signature.c:727
 #, 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:619
+#: lib/signature.c:739
 #, fuzzy, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "Morate podesiti \"pgp_name:\" u va¹oj rpmrc datoteci"
 
-#: lib/signature.c:663
+#: lib/signature.c:783
 msgid "Header+Payload size: "
 msgstr ""
 
-#: lib/signature.c:692
+#: lib/signature.c:823
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:732
+#: lib/signature.c:880
+msgid "Header SHA1 digest: "
+msgstr ""
+
+#: lib/signature.c:1042
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "preskoèi sve MD5 potpise"
 
-#: lib/signature.c:822
+#: lib/signature.c:1135
+msgid "Header "
+msgstr ""
+
+#: lib/signature.c:1136
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "%s: Potpis nije na raspolaganju\n"
 
-#: lib/signature.c:886
+#: lib/signature.c:1214
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:906
+#: lib/signature.c:1240
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:910
+#: lib/signature.c:1244
 #, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr ""
@@ -3127,156 +3141,156 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging"
 msgstr ""
 
 #. @-modfilesys@
-#: rpmdb/rpmdb.c:129
+#: rpmdb/rpmdb.c:163
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:387
+#: rpmdb/rpmdb.c:440
 #, fuzzy, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr "Ne mogu da otvorim datoteku %s: "
 
-#: rpmdb/rpmdb.c:409
+#: rpmdb/rpmdb.c:462
 #, fuzzy, c-format
 msgid "cannot open %s index\n"
 msgstr "gre¹ka: ne mogu da otvorim %s\n"
 
-#: rpmdb/rpmdb.c:501
+#: rpmdb/rpmdb.c:554
 #, fuzzy, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "gre¹ka kod uzimanja sloga %s iz %s"
 
-#: rpmdb/rpmdb.c:632
+#: rpmdb/rpmdb.c:685
 #, fuzzy, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "gre¹ka zapisivanja sloga %s u %s"
 
-#: rpmdb/rpmdb.c:642
+#: rpmdb/rpmdb.c:695
 #, fuzzy, c-format
 msgid "error(%d) removing record %s from %s\n"
 msgstr "gre¹ka uklanjanja sloga %s u %s"
 
-#: rpmdb/rpmdb.c:906
+#: rpmdb/rpmdb.c:959
 #, fuzzy
 msgid "no dbpath has been set\n"
 msgstr "dbpath nije odreğen"
 
-#: rpmdb/rpmdb.c:1054
+#: rpmdb/rpmdb.c:1107
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database\n"
 msgstr ""
 
 #. error
-#: rpmdb/rpmdb.c:1319
+#: rpmdb/rpmdb.c:1372
 #, fuzzy, c-format
 msgid "error(%d) counting packages\n"
 msgstr "gre¹ka kod potrage za paketom %s\n"
 
-#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3372
+#: rpmdb/rpmdb.c:2150 rpmdb/rpmdb.c:3502
 #, fuzzy, c-format
 msgid "record number %u in database is bad -- skipping.\n"
 msgstr "slog broj %d u bazi podataka je neispravan -- preskaèem ga"
 
-#: rpmdb/rpmdb.c:2150
+#: rpmdb/rpmdb.c:2203
 #, c-format
 msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2420
+#: rpmdb/rpmdb.c:2473
 #, fuzzy, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "ne mogu da proèitam zaglavlje na %d za proveru"
 
-#: rpmdb/rpmdb.c:2540
+#: rpmdb/rpmdb.c:2634
 #, fuzzy, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "gre¹ka uklanjanja sloga %s u %s"
 
-#: rpmdb/rpmdb.c:2544
+#: rpmdb/rpmdb.c:2638
 #, fuzzy, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "gre¹ka uklanjanja sloga %s u %s"
 
-#: rpmdb/rpmdb.c:2714
+#: rpmdb/rpmdb.c:2808
 #, fuzzy, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "gre¹ka kod potrage za paketom %s\n"
 
-#: rpmdb/rpmdb.c:2873
+#: rpmdb/rpmdb.c:3003
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:2877
+#: rpmdb/rpmdb.c:3007
 #, fuzzy, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "gre¹ka uklanjanja sloga %s u %s"
 
-#: rpmdb/rpmdb.c:3258
+#: rpmdb/rpmdb.c:3388
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3291
+#: rpmdb/rpmdb.c:3421
 msgid "no dbpath has been set"
 msgstr "dbpath nije odreğen"
 
-#: rpmdb/rpmdb.c:3318
+#: rpmdb/rpmdb.c:3448
 #, fuzzy, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "rekreiraj bazu podataka iz postojeæe baze"
 
-#: rpmdb/rpmdb.c:3322
+#: rpmdb/rpmdb.c:3452
 #, fuzzy, c-format
 msgid "temporary database %s already exists\n"
 msgstr "privremena baza podataka %s veæ postoji"
 
-#: rpmdb/rpmdb.c:3328
+#: rpmdb/rpmdb.c:3458
 #, fuzzy, c-format
 msgid "creating directory %s\n"
 msgstr "gre¹ka kod kreiranja direktorijuma %s: %s"
 
-#: rpmdb/rpmdb.c:3330
+#: rpmdb/rpmdb.c:3460
 #, fuzzy, c-format
 msgid "creating directory %s: %s\n"
 msgstr "gre¹ka kod kreiranja direktorijuma %s: %s"
 
-#: rpmdb/rpmdb.c:3337
+#: rpmdb/rpmdb.c:3467
 #, fuzzy, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "rekreiraj bazu podataka iz postojeæe baze"
 
-#: rpmdb/rpmdb.c:3348
+#: rpmdb/rpmdb.c:3478
 #, fuzzy, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "rekreiraj bazu podataka iz postojeæe baze"
 
-#: rpmdb/rpmdb.c:3412
+#: rpmdb/rpmdb.c:3542
 #, fuzzy, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "ne mogu da dodam slog originalno na %d"
 
-#: rpmdb/rpmdb.c:3430
+#: rpmdb/rpmdb.c:3560
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3438
+#: rpmdb/rpmdb.c:3568
 msgid "failed to replace old database with new database!\n"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3440
+#: rpmdb/rpmdb.c:3570
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr ""
 
-#: rpmdb/rpmdb.c:3450
+#: rpmdb/rpmdb.c:3580
 #, fuzzy, c-format
 msgid "removing directory %s\n"
 msgstr "gre¹ka kod kreiranja direktorijuma %s: %s"
 
-#: rpmdb/rpmdb.c:3452
+#: rpmdb/rpmdb.c:3582
 #, fuzzy, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "neuspelo otvaranje %s: %s"
@@ -3499,6 +3513,14 @@ msgstr "gre¹ka: FTP port mora biti broj\n"
 msgid "failed to create %s: %s\n"
 msgstr "neuspelo kreiranje %s\n"
 
+#, fuzzy
+#~ msgid "Generating signature using PGP.\n"
+#~ msgstr "napravi PGP potpis"
+
+#, fuzzy
+#~ msgid "Generating signature using GPG.\n"
+#~ msgstr "napravi PGP potpis"
+
 #~ msgid "no packages given for uninstall"
 #~ msgstr "neodstaje paket za deinstalaciju"
 
@@ -3707,9 +3729,7 @@ msgstr "neuspelo kreiranje %s\n"
 #, fuzzy
 #~ msgid ""
 #~ "   Install, upgrade and query (with -p) allow URL's to be used in place"
-#~ msgstr ""
-#~ "   instaliranje, pobolj¹avanja i upit (sa -p) dozvoljavaju kori¹æenje URL-"
-#~ "ova"
+#~ msgstr "   instaliranje, pobolj¹avanja i upit (sa -p) dozvoljavaju kori¹æenje URL-ova"
 
 #, fuzzy
 #~ msgid "   of file names as well as the following options:"
@@ -3811,9 +3831,7 @@ msgstr "neuspelo kreiranje %s\n"
 #~ msgid ""
 #~ "show all verifiable information for each file (must be used with -l, -c, "
 #~ "or -d)"
-#~ msgstr ""
-#~ "poka¾i sve informacije koje se mogu proveriti za svaku datoteku (mora se "
-#~ "koristiti sa -l, -c ili -d)"
+#~ msgstr "poka¾i sve informacije koje se mogu proveriti za svaku datoteku (mora se koristiti sa -l, -c ili -d)"
 
 #~ msgid "list capabilities package provides"
 #~ msgstr "poka¾i koja svojstva donosi paket"
@@ -3828,9 +3846,7 @@ msgstr "neuspelo kreiranje %s\n"
 #~ msgid ""
 #~ "verify a package installation using the same same package specification "
 #~ "options as -q"
-#~ msgstr ""
-#~ "proveri instalaciju paketa koristeæi iste opcije za odreğenje paketa kao "
-#~ "i -q"
+#~ msgstr "proveri instalaciju paketa koristeæi iste opcije za odreğenje paketa kao i -q"
 
 #~ msgid "do not verify file attributes"
 #~ msgstr "nemoj proveravati atribute datoteke"
@@ -3951,16 +3967,12 @@ msgstr "neuspelo kreiranje %s\n"
 #~ msgid ""
 #~ "set the file permissions to those in the package database using the same "
 #~ "package specification options as -q"
-#~ msgstr ""
-#~ "postavi dozvole datoteke kao one u bazi podataka paketa koristeæi iste "
-#~ "opcije za odreğenje datoteka kao i -q"
+#~ msgstr "postavi dozvole datoteke kao one u bazi podataka paketa koristeæi iste opcije za odreğenje datoteka kao i -q"
 
 #~ msgid ""
 #~ "set the file owner and group to those in the package database using the "
 #~ "same package specification options as -q"
-#~ msgstr ""
-#~ "postavi vlasnika i grupu datoteke kao i one u bazi podataka paketa "
-#~ "koristeæi iste opcije za odreğenje datoteka kao i -q"
+#~ msgstr "postavi vlasnika i grupu datoteke kao i one u bazi podataka paketa koristeæi iste opcije za odreğenje datoteka kao i -q"
 
 #~ msgid "-u and --uninstall are deprecated and no longer work.\n"
 #~ msgstr "-u i --uninstall nisu vi¹e podr¾ani i ne rade vi¹e.\n"
@@ -3972,9 +3984,7 @@ msgstr "neuspelo kreiranje %s\n"
 #~ msgid ""
 #~ "script disabling options may only be specified during package "
 #~ "installation, erasure, and verification"
-#~ msgstr ""
-#~ "--noscripsts mo¾ete koristiti samo kod instalacije, uklanjanja ili "
-#~ "provere paketa"
+#~ msgstr "--noscripsts mo¾ete koristiti samo kod instalacije, uklanjanja ili provere paketa"
 
 #, fuzzy
 #~ msgid "--apply may only be specified during package installation"
@@ -3998,13 +4008,11 @@ msgstr "neuspelo kreiranje %s\n"
 
 #, fuzzy
 #~ msgid "Could not run pgp.  Use --nopgp to skip PGP checks.\n"
-#~ msgstr ""
-#~ "Ne mogu da pokrenem pgp. Koristite --nopgp da preskoèite PGP proveru."
+#~ msgstr "Ne mogu da pokrenem pgp. Koristite --nopgp da preskoèite PGP proveru."
 
 #, fuzzy
 #~ msgid "Could not run gpg.  Use --nogpg to skip GPG checks.\n"
-#~ msgstr ""
-#~ "Ne mogu da pokrenem pgp. Koristite --nopgp da preskoèite PGP proveru."
+#~ msgstr "Ne mogu da pokrenem pgp. Koristite --nopgp da preskoèite PGP proveru."
 
 #, fuzzy
 #~ msgid "generate GPG/PGP signature"
@@ -4046,9 +4054,7 @@ msgstr "neuspelo kreiranje %s\n"
 #~ msgid ""
 #~ "  Install, upgrade and query (with -p) modes allow URL's to be used in "
 #~ "place"
-#~ msgstr ""
-#~ "   instaliranje, pobolj¹avanja i upit (sa -p) dozvoljavaju kori¹æenje URL-"
-#~ "ova"
+#~ msgstr "   instaliranje, pobolj¹avanja i upit (sa -p) dozvoljavaju kori¹æenje URL-ova"
 
 #, fuzzy
 #~ msgid "  of file names as well as the following options:"
@@ -4206,9 +4212,7 @@ msgstr "neuspelo kreiranje %s\n"
 #~ msgid ""
 #~ "--notriggers may only be specified during package installation, erasure, "
 #~ "and verification"
-#~ msgstr ""
-#~ "--nodeps mo¾ete koristiti samo kod instalacije, uklanjanja ili provere "
-#~ "paketa"
+#~ msgstr "--nodeps mo¾ete koristiti samo kod instalacije, uklanjanja ili provere paketa"
 
 #, fuzzy
 #~ msgid "       %s {--initdb}   [--dbpath <dir>]\n"
@@ -4412,10 +4416,6 @@ msgstr "neuspelo kreiranje %s\n"
 #~ msgstr "%s: Neuspelo otvaranje\n"
 
 #, fuzzy
-#~ msgid "New Header signature\n"
-#~ msgstr "ne mogu da proèitam potpis"
-
-#, fuzzy
 #~ msgid "path %s is not relocateable for package %s-%s-%s"
 #~ msgstr "paket %s nije instaliran\n"
 
@@ -4466,12 +4466,10 @@ msgstr "neuspelo kreiranje %s\n"
 #~ msgstr "nemoj proveravati operativni sistem za paket"
 
 #~ msgid "--build (-b) requires one of a,b,i,c,p,l as its sole argument"
-#~ msgstr ""
-#~ "--build (-b) zahteva jedan od sledeæih podargumenata: a,b,i,c,p ili l"
+#~ msgstr "--build (-b) zahteva jedan od sledeæih podargumenata: a,b,i,c,p ili l"
 
 #~ msgid "--tarbuild (-t) requires one of a,b,i,c,p,l as its sole argument"
-#~ msgstr ""
-#~ "--tarbuild (-t) zahteva jedan od sledeæih podargumenata: a,b,c,i,p ili l"
+#~ msgstr "--tarbuild (-t) zahteva jedan od sledeæih podargumenata: a,b,c,i,p ili l"
 
 #~ msgid "arguments to --dbpath must begin with a /"
 #~ msgstr "argumenti za --dbpath moraju poèeti znakom '/'"
@@ -4482,17 +4480,13 @@ msgstr "neuspelo kreiranje %s\n"
 #~ msgid ""
 #~ "ftp options can only be used during package queries, installs, and "
 #~ "upgrades"
-#~ msgstr ""
-#~ "opcije za FTP se mogu koristiti samo kod upita, instalacije ili "
-#~ "a¾uriranja paketa"
+#~ msgstr "opcije za FTP se mogu koristiti samo kod upita, instalacije ili a¾uriranja paketa"
 
 #, fuzzy
 #~ msgid ""
 #~ "http options can only be used during package queries, installs, and "
 #~ "upgrades"
-#~ msgstr ""
-#~ "opcije za FTP se mogu koristiti samo kod upita, instalacije ili "
-#~ "a¾uriranja paketa"
+#~ msgstr "opcije za FTP se mogu koristiti samo kod upita, instalacije ili a¾uriranja paketa"
 
 #~ msgid "relocate files even though the package doesn't allow it"
 #~ msgstr "premesti datoteke èak iako paket to ne dozvoljava"
@@ -4797,33 +4791,25 @@ msgstr "neuspelo kreiranje %s\n"
 #~ msgid ""
 #~ "--noscripts may only be specified during package installation and "
 #~ "uninstallation"
-#~ msgstr ""
-#~ "--noscripsts mo¾ete koristiti samo kod instalacije, uklanjanja ili "
-#~ "provere paketa"
+#~ msgstr "--noscripsts mo¾ete koristiti samo kod instalacije, uklanjanja ili provere paketa"
 
 #, fuzzy
 #~ msgid ""
 #~ "--nodeps may only be specified during package installation, "
 #~ "uninstallation, and verification"
-#~ msgstr ""
-#~ "--nodeps mo¾ete koristiti samo kod instalacije, uklanjanja ili provere "
-#~ "paketa"
+#~ msgstr "--nodeps mo¾ete koristiti samo kod instalacije, uklanjanja ili provere paketa"
 
 #, fuzzy
 #~ msgid ""
 #~ "--test may only be specified during package installation, uninstallation, "
 #~ "and building"
-#~ msgstr ""
-#~ "--test mo¾ete koristiti samo kod instalacije, uklanjanja ili kreiranja "
-#~ "paketa"
+#~ msgstr "--test mo¾ete koristiti samo kod instalacije, uklanjanja ili kreiranja paketa"
 
 #, fuzzy
 #~ msgid ""
 #~ "--root (-r) may only be specified during installation, uninstallation, "
 #~ "querying, and database rebuilds"
-#~ msgstr ""
-#~ "--root (-r) mo¾ete navesti samo kod instalacije, uklanjanja, upita ili "
-#~ "rekreiranja baze podataka"
+#~ msgstr "--root (-r) mo¾ete navesti samo kod instalacije, uklanjanja, upita ili rekreiranja baze podataka"
 
 #, fuzzy
 #~ msgid "--clean may only be used during package building"
diff --git a/po/sv.po b/po/sv.po
index c3df9802f..ae711245e 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-02-10 13:58-0500\n"
+"POT-Creation-Date: 2002-03-06 18:13-0500\n"
 "PO-Revision-Date: 2001-09-12 14:18+0200\n"
 "Last-Translator: Göran Uddeborg <goeran@uddeborg.pp.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -189,7 +189,8 @@ msgid "RPM version %s\n"
 msgstr "RPM version %s\n"
 
 #: rpmqv.c:235
-msgid "Copyright (C) 1998-2000 - Red Hat, Inc."
+#, fuzzy
+msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
 msgstr "Copyright © 1998-2000 - Red Hat, Inc."
 
 #: rpmqv.c:236
@@ -435,7 +436,7 @@ msgstr "oväntade argument till --querytags "
 msgid "no arguments given"
 msgstr "inga parametrar angivna för fråga"
 
-#: build/build.c:125 build/pack.c:479
+#: build/build.c:125 build/pack.c:483
 msgid "Unable to open temp file.\n"
 msgstr "Kan inte öppna temporär fil.\n"
 
@@ -780,7 +781,7 @@ msgstr "readRPM: öppna %s: %s\n"
 msgid "readRPM: read %s: %s\n"
 msgstr "readRPM: läs %s: %s\n"
 
-#: build/pack.c:305 build/pack.c:521
+#: build/pack.c:305 build/pack.c:529
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: Fseek misslyckades: %s\n"
@@ -795,77 +796,77 @@ msgstr "readRPM: %s är inte ett RPM-paket\n"
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: läser huvud från %s\n"
 
-#: build/pack.c:467
+#: build/pack.c:471
 msgid "Unable to create immutable header region.\n"
 msgstr "Kan inte skapa oföränderlig huvudregion.\n"
 
-#: build/pack.c:485
+#: build/pack.c:490
 msgid "Unable to write temp header\n"
 msgstr "Kan inte skriva temporärhuvud\n"
 
-#: build/pack.c:493
+#: build/pack.c:500
 msgid "Bad CSA data\n"
 msgstr "Felaktig CSA-data\n"
 
-#: build/pack.c:528
+#: build/pack.c:536
 msgid "Unable to write final header\n"
 msgstr "Kan inte skriva slutligt huvud\n"
 
-#: build/pack.c:546
+#: build/pack.c:556
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "Genererar signatur: %d\n"
 
-#: build/pack.c:559
+#: build/pack.c:574
 msgid "Unable to reload signature header.\n"
 msgstr "Kan inte läsa om signaturhuvud.\n"
 
-#: build/pack.c:567
+#: build/pack.c:582
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr "Kunde inte öppna %s: %s\n"
 
-#: build/pack.c:603 lib/psm.c:1444
+#: build/pack.c:618 lib/psm.c:1444
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "Kunde inte skriva paket: %s\n"
 
-#: build/pack.c:618
+#: build/pack.c:633
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "Kan inte läsa signaturen %s: %s\n"
 
-#: build/pack.c:628
+#: build/pack.c:644
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "Kan inte läsa huvud från %s: %s\n"
 
-#: build/pack.c:642
+#: build/pack.c:658
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "Kan inte skriva huvud till %s: %s\n"
 
-#: build/pack.c:652
+#: build/pack.c:668
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "Kan inte läsa last från %s: %s\n"
 
-#: build/pack.c:658
+#: build/pack.c:674
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "Kan inte skriva last till %s: %s\n"
 
-#: build/pack.c:683 lib/psm.c:1725
+#: build/pack.c:699 lib/psm.c:1725
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Skrev: %s\n"
 
-#: build/pack.c:750
+#: build/pack.c:766
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr "Kunde inte generera utfilnamn för paketet %s: %s\n"
 
-#: build/pack.c:767
+#: build/pack.c:783
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr "kan inte skapa %s: %s\n"
@@ -1614,41 +1615,51 @@ msgstr "%s skapades som %s\n"
 msgid "error creating temporary file %s\n"
 msgstr "fel när tämporärfil %s skapades\n"
 
-#: lib/package.c:167 lib/package.c:238
+#: lib/package.c:179 lib/package.c:255
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr "paket med versionsnummer 1 stöds inte av denna version av RPM\n"
 
-#: lib/package.c:188 lib/package.c:246
+#: lib/package.c:200 lib/package.c:263
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr "endast paket med huvudnummer <= 4 stöds av denna version av RPM\n"
 
-#: lib/package.c:224 lib/rpmchecksig.c:156 lib/rpmchecksig.c:522
+#: lib/package.c:241 lib/rpmchecksig.c:161 lib/rpmchecksig.c:541
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: readLead misslyckades\n"
 
-#: lib/package.c:230
+#: lib/package.c:247
 #, fuzzy, c-format
 msgid "%s: bad magic\n"
 msgstr "Felaktigt magiskt tal"
 
-#: lib/package.c:254 lib/rpmchecksig.c:174 lib/rpmchecksig.c:538
+#: lib/package.c:272 lib/rpmchecksig.c:179 lib/rpmchecksig.c:557
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: rpmReadSignature misslyckades\n"
 
-#: lib/package.c:258 lib/rpmchecksig.c:178 lib/rpmchecksig.c:543
+#: lib/package.c:276 lib/rpmchecksig.c:183 lib/rpmchecksig.c:562
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: Ingen signatur tillgänglig\n"
 
-#: lib/package.c:284
+#: lib/package.c:304 lib/rpmchecksig.c:462
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: readLead misslyckades\n"
 
-#: lib/package.c:303 lib/rpmchecksig.c:107 lib/rpmchecksig.c:466
+#. Parse the parameters from the OpenPGP packets that will be needed.
+#: lib/package.c:334 lib/rpmchecksig.c:631
+msgid "========== Header DSA signature\n"
+msgstr ""
+
+#. Parse the parameters from the OpenPGP packets that will be needed.
+#: lib/package.c:357
+msgid "========== Package DSA/RSA signature\n"
+msgstr ""
+
+#: lib/package.c:366 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Fread misslyckades: %s\n"
@@ -2379,66 +2390,79 @@ msgstr "felaktig db-fil %s\n"
 msgid "(added provide)"
 msgstr "%s: %-45s JA (db-tillhandahållande)\n"
 
-#: lib/rpmchecksig.c:49
+#: lib/rpmchecksig.c:51
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s: open misslyckades: %s\n"
 
-#: lib/rpmchecksig.c:61
+#: lib/rpmchecksig.c:63
 msgid "makeTempFile failed\n"
 msgstr "makeTempFile misslyckades\n"
 
-#: lib/rpmchecksig.c:101
+#: lib/rpmchecksig.c:104
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: Fwrite misslyckades: %s\n"
 
-#: lib/rpmchecksig.c:161
-#, c-format
-msgid "%s: Can't sign v1.0 RPM\n"
+#: lib/rpmchecksig.c:166
+#, fuzzy, c-format
+msgid "%s: Can't sign v1 packaging\n"
 msgstr "%s: Kan inte signera v1.0 RPM\n"
 
-#: lib/rpmchecksig.c:165
-#, c-format
-msgid "%s: Can't re-sign v2.0 RPM\n"
+#: lib/rpmchecksig.c:170
+#, fuzzy, c-format
+msgid "%s: Can't re-sign v2 packaging\n"
 msgstr "%s: Kan inte signera om v2.0 RPM\n"
 
-#: lib/rpmchecksig.c:229
+#: lib/rpmchecksig.c:239
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: writeLead misslyckades: %s\n"
 
-#: lib/rpmchecksig.c:235
+#: lib/rpmchecksig.c:245
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmWriteSignature misslyckades: %s\n"
 
-#: lib/rpmchecksig.c:528
+#: lib/rpmchecksig.c:476
+#, fuzzy, c-format
+msgid "%s: headerGetEntry failed\n"
+msgstr "%s: readLead misslyckades\n"
+
+#: lib/rpmchecksig.c:547
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: Ingen signatur tillgänglig (v1.0 RPM)\n"
 
-#: lib/rpmchecksig.c:725
+#: lib/rpmchecksig.c:618
+msgid "========== Package RSA signature\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:637
+msgid "========== Package DSA signature\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:768
 msgid "NOT OK"
 msgstr "EJ OK"
 
-#: lib/rpmchecksig.c:726 lib/rpmchecksig.c:740
+#: lib/rpmchecksig.c:769 lib/rpmchecksig.c:783
 msgid " (MISSING KEYS:"
 msgstr " (SAKNADE NYCKLAR:"
 
-#: lib/rpmchecksig.c:728 lib/rpmchecksig.c:742
+#: lib/rpmchecksig.c:771 lib/rpmchecksig.c:785
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:729 lib/rpmchecksig.c:743
+#: lib/rpmchecksig.c:772 lib/rpmchecksig.c:786
 msgid " (UNTRUSTED KEYS:"
 msgstr " (EJ BETRODDA NYCKLAR:"
 
-#: lib/rpmchecksig.c:731 lib/rpmchecksig.c:745
+#: lib/rpmchecksig.c:774 lib/rpmchecksig.c:788
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:739
+#: lib/rpmchecksig.c:782
 msgid "OK"
 msgstr "OK"
 
@@ -2650,142 +2674,142 @@ msgstr "Kan inte läsa %s, HOME är för stor.\n"
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "Kan inte öppna %s för läsning: %s.\n"
 
-#: lib/signature.c:117
+#: lib/signature.c:118
 msgid "file is not regular -- skipping size check\n"
 msgstr "filen är inte en vanlig fil -- hoppar över storlekskontroll\n"
 
-#: lib/signature.c:126
+#: lib/signature.c:127
 #, 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:131
+#: lib/signature.c:132
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr "  Faktisk storlek: %12d\n"
 
-#: lib/signature.c:151
+#: lib/signature.c:152
 msgid "No signature\n"
 msgstr "Ingen signatur\n"
 
-#: lib/signature.c:155
+#: lib/signature.c:156
 msgid "Old PGP signature\n"
 msgstr "Gammal PGP-signatur\n"
 
-#: lib/signature.c:168
+#: lib/signature.c:169
 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:224
+#: lib/signature.c:225
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "Signatur: storlek(%d)+utfyllnad(%d)\n"
 
-#: lib/signature.c:299 lib/signature.c:397 lib/signature.c:537
-#: lib/signature.c:569
+#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:656
+#: lib/signature.c:688
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "Kunde inte köra %s: %s\n"
 
-#: lib/signature.c:315
+#: lib/signature.c:322
 msgid "pgp failed\n"
 msgstr "pgp misslyckades\n"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:322
+#: lib/signature.c:329
 msgid "pgp failed to write signature\n"
 msgstr "pgp misslyckades att skriva en signatur\n"
 
-#: lib/signature.c:327
+#: lib/signature.c:334
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr "PGP signaturstorlek: %d\n"
 
-#: lib/signature.c:343 lib/signature.c:442
+#: lib/signature.c:350 lib/signature.c:450
 msgid "unable to read the signature\n"
 msgstr "kan inte läsa signaturen\n"
 
-#: lib/signature.c:348
+#: lib/signature.c:355
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr "Fick %d byte PGP-signatur\n"
 
-#: lib/signature.c:414
+#: lib/signature.c:422
 msgid "gpg failed\n"
 msgstr "gpg misslyckades\n"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:421
+#: lib/signature.c:429
 msgid "gpg failed to write signature\n"
 msgstr "gpg kunde inte skriva signatur\n"
 
-#: lib/signature.c:426
+#: lib/signature.c:434
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr "GPG-signaturstorlek: %d\n"
 
-#: lib/signature.c:447
+#: lib/signature.c:455
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr "Fick %d byte GPG-signatur\n"
 
-#: lib/signature.c:475
-msgid "Generating signature using PGP.\n"
-msgstr "Genererar signatur med PGP.\n"
-
-#: lib/signature.c:481
-msgid "Generating signature using GPG.\n"
-msgstr "Genererar signatur med GPG.\n"
-
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:574 lib/signature.c:627
+#: lib/signature.c:693 lib/signature.c:747
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "Felaktig %%_signature-spec i makrofil\n"
 
-#: lib/signature.c:607
+#: lib/signature.c:727
 #, 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:619
+#: lib/signature.c:739
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "Du måste sätta \"%%_pgp_name\" i din makrofil\n"
 
-#: lib/signature.c:663
+#: lib/signature.c:783
 #, fuzzy
 msgid "Header+Payload size: "
 msgstr "Huvudstorleken för stor"
 
-#: lib/signature.c:692
+#: lib/signature.c:823
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:732
+#: lib/signature.c:880
+msgid "Header SHA1 digest: "
+msgstr ""
+
+#: lib/signature.c:1042
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "hoppa över eventuella MD5-signaturer"
 
-#: lib/signature.c:822
+#: lib/signature.c:1135
+msgid "Header "
+msgstr ""
+
+#: lib/signature.c:1136
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "Ingen signatur\n"
 
-#: lib/signature.c:886
+#: lib/signature.c:1214
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:906
+#: lib/signature.c:1240
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:910
+#: lib/signature.c:1244
 #, fuzzy, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "Signatur: storlek(%d)+utfyllnad(%d)\n"
@@ -3060,41 +3084,41 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging"
 msgstr "generera huvuden kompatibla med (äldre) rpm[23]-paketering"
 
 #. @-modfilesys@
-#: rpmdb/rpmdb.c:129
+#: rpmdb/rpmdb.c:163
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr "dbiTagsInit: okänt taggnamn: \"%s\" ignorerat\n"
 
-#: rpmdb/rpmdb.c:387
+#: rpmdb/rpmdb.c:440
 #, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr "kan inte öppna %s-indexet med db%d - %s (%d)\n"
 
-#: rpmdb/rpmdb.c:409
+#: rpmdb/rpmdb.c:462
 #, c-format
 msgid "cannot open %s index\n"
 msgstr "kan inte öppna %s-indexet\n"
 
-#: rpmdb/rpmdb.c:501
+#: rpmdb/rpmdb.c:554
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "fel(%d) när \"%s\"-poster hämtades från %s-indexet\n"
 
-#: rpmdb/rpmdb.c:632
+#: rpmdb/rpmdb.c:685
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "fel(%d) när post %s sparades i %s\n"
 
-#: rpmdb/rpmdb.c:642
+#: rpmdb/rpmdb.c:695
 #, c-format
 msgid "error(%d) removing record %s from %s\n"
 msgstr "fel(%d) när post %s togs bort ur %s\n"
 
-#: rpmdb/rpmdb.c:906
+#: rpmdb/rpmdb.c:959
 msgid "no dbpath has been set\n"
 msgstr "ingen dbpath har satts\n"
 
-#: rpmdb/rpmdb.c:1054
+#: rpmdb/rpmdb.c:1107
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database\n"
@@ -3103,114 +3127,114 @@ msgstr ""
 "i nytt format\n"
 
 #. error
-#: rpmdb/rpmdb.c:1319
+#: rpmdb/rpmdb.c:1372
 #, c-format
 msgid "error(%d) counting packages\n"
 msgstr "fel(%d) när paket räknades\n"
 
-#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3372
+#: rpmdb/rpmdb.c:2150 rpmdb/rpmdb.c:3502
 #, c-format
 msgid "record number %u in database is bad -- skipping.\n"
 msgstr "post nummer %u i databasen är felaktig -- hoppar över.\n"
 
-#: rpmdb/rpmdb.c:2150
+#: rpmdb/rpmdb.c:2203
 #, c-format
 msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
 msgstr "rpmdb: skadad huvudinstans #%u hämtad, hoppar över.\n"
 
-#: rpmdb/rpmdb.c:2420
+#: rpmdb/rpmdb.c:2473
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "%s: kan inte läsa huvud vid 0x%x\n"
 
-#: rpmdb/rpmdb.c:2540
+#: rpmdb/rpmdb.c:2634
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "tar bort \"%s\" från %s-indexet.\n"
 
-#: rpmdb/rpmdb.c:2544
+#: rpmdb/rpmdb.c:2638
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "tar bort %d poster från %s-indexet.\n"
 
-#: rpmdb/rpmdb.c:2714
+#: rpmdb/rpmdb.c:2808
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "fel(%d) vid allokering av ny paketinstans\n"
 
-#: rpmdb/rpmdb.c:2873
+#: rpmdb/rpmdb.c:3003
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "lägger till \"%s\" till %s-indexet.\n"
 
-#: rpmdb/rpmdb.c:2877
+#: rpmdb/rpmdb.c:3007
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "lägger till %d poster till %s-indexet.\n"
 
-#: rpmdb/rpmdb.c:3258
+#: rpmdb/rpmdb.c:3388
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr "tar bort %s efter lyckad db3-ombyggnad.\n"
 
-#: rpmdb/rpmdb.c:3291
+#: rpmdb/rpmdb.c:3421
 msgid "no dbpath has been set"
 msgstr "ingen dbpath har satts"
 
-#: rpmdb/rpmdb.c:3318
+#: rpmdb/rpmdb.c:3448
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "bygger om databas %s till %s\n"
 
-#: rpmdb/rpmdb.c:3322
+#: rpmdb/rpmdb.c:3452
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr "tillfällig databas %s existerar redan\n"
 
-#: rpmdb/rpmdb.c:3328
+#: rpmdb/rpmdb.c:3458
 #, c-format
 msgid "creating directory %s\n"
 msgstr "skapar katalog %s\n"
 
-#: rpmdb/rpmdb.c:3330
+#: rpmdb/rpmdb.c:3460
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr "skapar katalog %s: %s\n"
 
-#: rpmdb/rpmdb.c:3337
+#: rpmdb/rpmdb.c:3467
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "öppnar gammal databas med dbapi %d\n"
 
-#: rpmdb/rpmdb.c:3348
+#: rpmdb/rpmdb.c:3478
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "öppnar ny databas med dbapi %d\n"
 
-#: rpmdb/rpmdb.c:3412
+#: rpmdb/rpmdb.c:3542
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "kan inte lägga till post ursprungligen vid %u\n"
 
-#: rpmdb/rpmdb.c:3430
+#: rpmdb/rpmdb.c:3560
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr "kunde inte bygga om databasen: orginaldatabasen finns kvar\n"
 
-#: rpmdb/rpmdb.c:3438
+#: rpmdb/rpmdb.c:3568
 msgid "failed to replace old database with new database!\n"
 msgstr "kunde inte ersätta gammal databas med ny databas!\n"
 
-#: rpmdb/rpmdb.c:3440
+#: rpmdb/rpmdb.c:3570
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "byt ut filer i %s med filer från %s för att återställa"
 
-#: rpmdb/rpmdb.c:3450
+#: rpmdb/rpmdb.c:3580
 #, c-format
 msgid "removing directory %s\n"
 msgstr "tar bort katalog %s\n"
 
-#: rpmdb/rpmdb.c:3452
+#: rpmdb/rpmdb.c:3582
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "kunde inte ta bort katalogen %s: %s\n"
@@ -3422,6 +3446,12 @@ msgstr "url-port måste vara ett tal\n"
 msgid "failed to create %s: %s\n"
 msgstr "kunde inte skapa %s: %s\n"
 
+#~ msgid "Generating signature using PGP.\n"
+#~ msgstr "Genererar signatur med PGP.\n"
+
+#~ msgid "Generating signature using GPG.\n"
+#~ msgstr "Genererar signatur med GPG.\n"
+
 #~ msgid "no packages given for uninstall"
 #~ msgstr "inga paket angivna för avinstallation"
 
diff --git a/po/tr.po b/po/tr.po
index a1282c214..43ed396bf 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
-"POT-Creation-Date: 2002-02-10 13:58-0500\n"
+"POT-Creation-Date: 2002-03-06 18:13-0500\n"
 "PO-Revision-Date: 2001-07-05 08:02+300\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -191,7 +191,8 @@ msgid "RPM version %s\n"
 msgstr "RPM Sürüm %s\n"
 
 #: rpmqv.c:235
-msgid "Copyright (C) 1998-2000 - Red Hat, Inc."
+#, fuzzy
+msgid "Copyright (C) 1998-2002 - Red Hat, Inc."
 msgstr "Copyright (C) 1998 - 2000 - Red Hat, Inc."
 
 #: rpmqv.c:236
@@ -442,7 +443,7 @@ msgstr "--querytags ile beklenmeyen girdiler"
 msgid "no arguments given"
 msgstr "sorgulama için hiç argüman belirtilmedi"
 
-#: build/build.c:125 build/pack.c:479
+#: build/build.c:125 build/pack.c:483
 msgid "Unable to open temp file.\n"
 msgstr "Geçici dosya açılamadı.\n"
 
@@ -787,7 +788,7 @@ msgstr "readRPM: %s açılırken: %s\n"
 msgid "readRPM: read %s: %s\n"
 msgstr "readRPM: %s okunurken: %s\n"
 
-#: build/pack.c:305 build/pack.c:521
+#: build/pack.c:305 build/pack.c:529
 #, c-format
 msgid "%s: Fseek failed: %s\n"
 msgstr "%s: Fseek başarısız: %s\n"
@@ -802,81 +803,81 @@ msgstr "readRPM: %s bir RPM paketi değil\n"
 msgid "readRPM: reading header from %s\n"
 msgstr "readRPM: %s başlığı okunuyor\n"
 
-#: build/pack.c:467
+#: build/pack.c:471
 #, fuzzy
 msgid "Unable to create immutable header region.\n"
 msgstr "%s'den başlık okunamadı: %s\n"
 
-#: build/pack.c:485
+#: build/pack.c:490
 #, fuzzy
 msgid "Unable to write temp header\n"
 msgstr "%s'e başlık yazılamadı: %s\n"
 
-#: build/pack.c:493
+#: build/pack.c:500
 msgid "Bad CSA data\n"
 msgstr "CSA verisi geçersiz\n"
 
-#: build/pack.c:528
+#: build/pack.c:536
 #, fuzzy
 msgid "Unable to write final header\n"
 msgstr "%s'e başlık yazılamadı: %s\n"
 
-#: build/pack.c:546
+#: build/pack.c:556
 #, c-format
 msgid "Generating signature: %d\n"
 msgstr "İmza üretiliyor: %d\n"
 
-#: build/pack.c:559
+#: build/pack.c:574
 #, fuzzy
 msgid "Unable to reload signature header.\n"
 msgstr "%s'den başlık okunamadı: %s\n"
 
-#: build/pack.c:567
+#: build/pack.c:582
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr "%s açılamadı: %s\n"
 
-#: build/pack.c:603 lib/psm.c:1444
+#: build/pack.c:618 lib/psm.c:1444
 #, c-format
 msgid "Unable to write package: %s\n"
 msgstr "paket yazılamadı: %s\n"
 
-#: build/pack.c:618
+#: build/pack.c:633
 #, c-format
 msgid "Unable to open sigtarget %s: %s\n"
 msgstr "sigtarget %s açılamadı: %s\n"
 
-#: build/pack.c:628
+#: build/pack.c:644
 #, c-format
 msgid "Unable to read header from %s: %s\n"
 msgstr "%s'den başlık okunamadı: %s\n"
 
-#: build/pack.c:642
+#: build/pack.c:658
 #, c-format
 msgid "Unable to write header to %s: %s\n"
 msgstr "%s'e başlık yazılamadı: %s\n"
 
-#: build/pack.c:652
+#: build/pack.c:668
 #, c-format
 msgid "Unable to read payload from %s: %s\n"
 msgstr "%s'den payload okunamadı: %s\n"
 
-#: build/pack.c:658
+#: build/pack.c:674
 #, c-format
 msgid "Unable to write payload to %s: %s\n"
 msgstr "%s'e payload yazılamadı: %s\n"
 
-#: build/pack.c:683 lib/psm.c:1725
+#: build/pack.c:699 lib/psm.c:1725
 #, c-format
 msgid "Wrote: %s\n"
 msgstr "Yazıldı: %s\n"
 
-#: build/pack.c:750
+#: build/pack.c:766
 #, c-format
 msgid "Could not generate output filename for package %s: %s\n"
 msgstr "%s paket dosyası için çıktı dosya adı üretilemedi: %s\n"
 
-#: build/pack.c:767
+#: build/pack.c:783
 #, c-format
 msgid "cannot create %s: %s\n"
 msgstr "%s dosyası oluşturulamıyor: %s\n"
@@ -1634,43 +1635,53 @@ msgstr "%s %s olarak oluşturuldu\n"
 msgid "error creating temporary file %s\n"
 msgstr "%s geçici dosyası oluşturulurken hata\n"
 
-#: lib/package.c:167 lib/package.c:238
+#: lib/package.c:179 lib/package.c:255
 msgid "packaging version 1 is not supported by this version of RPM\n"
 msgstr "RPM'nin bu sürümünde paket sürümü 1 desteklenmiyor\n"
 
-#: lib/package.c:188 lib/package.c:246
+#: lib/package.c:200 lib/package.c:263
 msgid ""
 "only packaging with major numbers <= 4 is supported by this version of RPM\n"
 msgstr ""
 "RPM'nin bu sürümünde sadece ilk sürüm rakamı <= 4 olan paketler "
 "destekleniyor\n"
 
-#: lib/package.c:224 lib/rpmchecksig.c:156 lib/rpmchecksig.c:522
+#: lib/package.c:241 lib/rpmchecksig.c:161 lib/rpmchecksig.c:541
 #, c-format
 msgid "%s: readLead failed\n"
 msgstr "%s: readLead başarısız\n"
 
-#: lib/package.c:230
+#: lib/package.c:247
 #, fuzzy, c-format
 msgid "%s: bad magic\n"
 msgstr "Magic hatalı"
 
-#: lib/package.c:254 lib/rpmchecksig.c:174 lib/rpmchecksig.c:538
+#: lib/package.c:272 lib/rpmchecksig.c:179 lib/rpmchecksig.c:557
 #, c-format
 msgid "%s: rpmReadSignature failed\n"
 msgstr "%s: rpmReadSignature başarısız\n"
 
-#: lib/package.c:258 lib/rpmchecksig.c:178 lib/rpmchecksig.c:543
+#: lib/package.c:276 lib/rpmchecksig.c:183 lib/rpmchecksig.c:562
 #, c-format
 msgid "%s: No signature available\n"
 msgstr "%s: İmza bulundurmuyor\n"
 
-#: lib/package.c:284
+#: lib/package.c:304 lib/rpmchecksig.c:462
 #, fuzzy, c-format
 msgid "%s: headerRead failed\n"
 msgstr "%s: readLead başarısız\n"
 
-#: lib/package.c:303 lib/rpmchecksig.c:107 lib/rpmchecksig.c:466
+#. Parse the parameters from the OpenPGP packets that will be needed.
+#: lib/package.c:334 lib/rpmchecksig.c:631
+msgid "========== Header DSA signature\n"
+msgstr ""
+
+#. Parse the parameters from the OpenPGP packets that will be needed.
+#: lib/package.c:357
+msgid "========== Package DSA/RSA signature\n"
+msgstr ""
+
+#: lib/package.c:366 lib/rpmchecksig.c:110 lib/rpmchecksig.c:491
 #, c-format
 msgid "%s: Fread failed: %s\n"
 msgstr "%s: Fread başarısız: %s\n"
@@ -2402,66 +2413,79 @@ msgstr "db dosyası %s hatalı\n"
 msgid "(added provide)"
 msgstr "%s: %-45s EVET (db sağlar)\n"
 
-#: lib/rpmchecksig.c:49
+#: lib/rpmchecksig.c:51
 #, c-format
 msgid "%s: open failed: %s\n"
 msgstr "%s: açılamadı: %s\n"
 
-#: lib/rpmchecksig.c:61
+#: lib/rpmchecksig.c:63
 msgid "makeTempFile failed\n"
 msgstr "makeTempFile başarısız\n"
 
-#: lib/rpmchecksig.c:101
+#: lib/rpmchecksig.c:104
 #, c-format
 msgid "%s: Fwrite failed: %s\n"
 msgstr "%s: Fwrite başarısız: %s\n"
 
-#: lib/rpmchecksig.c:161
-#, c-format
-msgid "%s: Can't sign v1.0 RPM\n"
+#: lib/rpmchecksig.c:166
+#, fuzzy, c-format
+msgid "%s: Can't sign v1 packaging\n"
 msgstr "%s: v1.0 RPM (eski sürüm) imzalanamaz\n"
 
-#: lib/rpmchecksig.c:165
-#, c-format
-msgid "%s: Can't re-sign v2.0 RPM\n"
+#: lib/rpmchecksig.c:170
+#, fuzzy, c-format
+msgid "%s: Can't re-sign v2 packaging\n"
 msgstr "%s: v2.0 RPM (eski sürüm) yeniden imzalanamaz\n"
 
-#: lib/rpmchecksig.c:229
+#: lib/rpmchecksig.c:239
 #, c-format
 msgid "%s: writeLead failed: %s\n"
 msgstr "%s: writeLead başarısız: %s\n"
 
-#: lib/rpmchecksig.c:235
+#: lib/rpmchecksig.c:245
 #, c-format
 msgid "%s: rpmWriteSignature failed: %s\n"
 msgstr "%s: rpmWriteSignature başarısız: %s\n"
 
-#: lib/rpmchecksig.c:528
+#: lib/rpmchecksig.c:476
+#, fuzzy, c-format
+msgid "%s: headerGetEntry failed\n"
+msgstr "%s: readLead başarısız\n"
+
+#: lib/rpmchecksig.c:547
 #, c-format
 msgid "%s: No signature available (v1.0 RPM)\n"
 msgstr "%s: İmza bulundurmuyor (v1.0 RPM)\n"
 
-#: lib/rpmchecksig.c:725
+#: lib/rpmchecksig.c:618
+msgid "========== Package RSA signature\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:637
+msgid "========== Package DSA signature\n"
+msgstr ""
+
+#: lib/rpmchecksig.c:768
 msgid "NOT OK"
 msgstr "TAMAM DEĞİL"
 
-#: lib/rpmchecksig.c:726 lib/rpmchecksig.c:740
+#: lib/rpmchecksig.c:769 lib/rpmchecksig.c:783
 msgid " (MISSING KEYS:"
 msgstr " (EKSİK ANAHTARLAR:"
 
-#: lib/rpmchecksig.c:728 lib/rpmchecksig.c:742
+#: lib/rpmchecksig.c:771 lib/rpmchecksig.c:785
 msgid ") "
 msgstr ") "
 
-#: lib/rpmchecksig.c:729 lib/rpmchecksig.c:743
+#: lib/rpmchecksig.c:772 lib/rpmchecksig.c:786
 msgid " (UNTRUSTED KEYS:"
 msgstr " (GÜVENCESİZ ANAHTARLAR:"
 
-#: lib/rpmchecksig.c:731 lib/rpmchecksig.c:745
+#: lib/rpmchecksig.c:774 lib/rpmchecksig.c:788
 msgid ")"
 msgstr ")"
 
-#: lib/rpmchecksig.c:739
+#: lib/rpmchecksig.c:782
 msgid "OK"
 msgstr "Tamam"
 
@@ -2673,140 +2697,140 @@ msgstr "%s okunamıyor, EV çok büyük\n"
 msgid "Unable to open %s for reading: %s.\n"
 msgstr "%s okuma erişimi için açılamadı: %s.\n"
 
-#: lib/signature.c:117
+#: lib/signature.c:118
 msgid "file is not regular -- skipping size check\n"
 msgstr "dosya normal değil -- uzunluk denetimi atlanıyor\n"
 
-#: lib/signature.c:126
+#: lib/signature.c:127
 #, 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:131
+#: lib/signature.c:132
 #, c-format
 msgid "  Actual size: %12d\n"
 msgstr "  Gerçek boyut: %12d\n"
 
-#: lib/signature.c:151
+#: lib/signature.c:152
 msgid "No signature\n"
 msgstr "İmza yok\n"
 
-#: lib/signature.c:155
+#: lib/signature.c:156
 msgid "Old PGP signature\n"
 msgstr "Eski PGP imzası\n"
 
-#: lib/signature.c:168
+#: lib/signature.c:169
 msgid "Old (internal-only) signature!  How did you get that!?\n"
 msgstr "Eski imza !!! Bunu nasıl aldın!?\n"
 
-#: lib/signature.c:224
+#: lib/signature.c:225
 #, c-format
 msgid "Signature: size(%d)+pad(%d)\n"
 msgstr "İmza: boyut(%d)+iz(%d)\n"
 
-#: lib/signature.c:299 lib/signature.c:397 lib/signature.c:537
-#: lib/signature.c:569
+#: lib/signature.c:306 lib/signature.c:405 lib/signature.c:656
+#: lib/signature.c:688
 #, fuzzy, c-format
 msgid "Could not exec %s: %s\n"
 msgstr "%s icra edilemedi: %s\n"
 
-#: lib/signature.c:315
+#: lib/signature.c:322
 msgid "pgp failed\n"
 msgstr "pgp hata verdi\n"
 
 #. PGP failed to write signature
 #. Just in case
-#: lib/signature.c:322
+#: lib/signature.c:329
 msgid "pgp failed to write signature\n"
 msgstr "pgp imzasının yazılması başarısız\n"
 
-#: lib/signature.c:327
+#: lib/signature.c:334
 #, c-format
 msgid "PGP sig size: %d\n"
 msgstr "PGP imza uzunluğu: %d\n"
 
-#: lib/signature.c:343 lib/signature.c:442
+#: lib/signature.c:350 lib/signature.c:450
 msgid "unable to read the signature\n"
 msgstr "imza okunamadı\n"
 
-#: lib/signature.c:348
+#: lib/signature.c:355
 #, c-format
 msgid "Got %d bytes of PGP sig\n"
 msgstr "GPG imzasının %d baytı alındı\n"
 
-#: lib/signature.c:414
+#: lib/signature.c:422
 msgid "gpg failed\n"
 msgstr "gpg hata verdi\n"
 
 #. GPG failed to write signature
 #. Just in case
-#: lib/signature.c:421
+#: lib/signature.c:429
 msgid "gpg failed to write signature\n"
 msgstr "imzanın yazılması sırasında gpg hata verdi\n"
 
-#: lib/signature.c:426
+#: lib/signature.c:434
 #, c-format
 msgid "GPG sig size: %d\n"
 msgstr "GPG imza uzunluğu: %d\n"
 
-#: lib/signature.c:447
+#: lib/signature.c:455
 #, c-format
 msgid "Got %d bytes of GPG sig\n"
 msgstr "GPG imzasının %d baytı alındı\n"
 
-#: lib/signature.c:475
-msgid "Generating signature using PGP.\n"
-msgstr "PGP kullanarak imza üretiliyor.\n"
-
-#: lib/signature.c:481
-msgid "Generating signature using GPG.\n"
-msgstr "GPG kullanılarak imza üretiliyor.\n"
-
 #. @notreached@
 #. This case should have been screened out long ago.
-#: lib/signature.c:574 lib/signature.c:627
+#: lib/signature.c:693 lib/signature.c:747
 #, c-format
 msgid "Invalid %%_signature spec in macro file\n"
 msgstr "Makro dosyasında %%_signature spec geçersiz\n"
 
-#: lib/signature.c:607
+#: lib/signature.c:727
 #, 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:619
+#: lib/signature.c:739
 #, c-format
 msgid "You must set \"%%_pgp_name\" in your macro file\n"
 msgstr "Makro dosyanızda \"%%_pgp_name\" belirtmelisiniz\n"
 
-#: lib/signature.c:663
+#: lib/signature.c:783
 #, fuzzy
 msgid "Header+Payload size: "
 msgstr "Başlık çok uzun"
 
-#: lib/signature.c:692
+#: lib/signature.c:823
 msgid "MD5 digest: "
 msgstr ""
 
-#: lib/signature.c:732
+#: lib/signature.c:880
+msgid "Header SHA1 digest: "
+msgstr ""
+
+#: lib/signature.c:1042
 #, fuzzy
 msgid "V3 RSA/MD5 signature: "
 msgstr "tüm MD5 imzalarını atlar"
 
-#: lib/signature.c:822
+#: lib/signature.c:1135
+msgid "Header "
+msgstr ""
+
+#: lib/signature.c:1136
 #, fuzzy
 msgid "V3 DSA signature: "
 msgstr "İmza yok\n"
 
-#: lib/signature.c:886
+#: lib/signature.c:1214
 msgid "Verify signature: BAD PARAMETERS\n"
 msgstr ""
 
-#: lib/signature.c:906
+#: lib/signature.c:1240
 msgid "Broken MD5 digest: UNSUPPORTED\n"
 msgstr ""
 
-#: lib/signature.c:910
+#: lib/signature.c:1244
 #, fuzzy, c-format
 msgid "Signature: UNKNOWN (%d)\n"
 msgstr "İmza: boyut(%d)+iz(%d)\n"
@@ -3082,41 +3106,41 @@ msgid "generate headers compatible with (legacy) rpm[23] packaging"
 msgstr "(eski) rpm[23] paketleme ile uyumlu başlıkları üretir"
 
 #. @-modfilesys@
-#: rpmdb/rpmdb.c:129
+#: rpmdb/rpmdb.c:163
 #, c-format
 msgid "dbiTagsInit: unrecognized tag name: \"%s\" ignored\n"
 msgstr "dbiTagsInit: tanımlanmamış etiket adı: \"%s\" yoksayıldı\n"
 
-#: rpmdb/rpmdb.c:387
+#: rpmdb/rpmdb.c:440
 #, c-format
 msgid "cannot open %s index using db%d - %s (%d)\n"
 msgstr "%s indeksi db%d - %s (%d) kullanarak açılamadı\n"
 
-#: rpmdb/rpmdb.c:409
+#: rpmdb/rpmdb.c:462
 #, c-format
 msgid "cannot open %s index\n"
 msgstr "%s indeksi açılamadı\n"
 
-#: rpmdb/rpmdb.c:501
+#: rpmdb/rpmdb.c:554
 #, c-format
 msgid "error(%d) getting \"%s\" records from %s index\n"
 msgstr "hata(%d): \"%s\" kayıt %s indeksinden alınıyor\n"
 
-#: rpmdb/rpmdb.c:632
+#: rpmdb/rpmdb.c:685
 #, c-format
 msgid "error(%d) storing record %s into %s\n"
 msgstr "hata(%d): %s kayıt %s içine yazılıyor\n"
 
-#: rpmdb/rpmdb.c:642
+#: rpmdb/rpmdb.c:695
 #, c-format
 msgid "error(%d) removing record %s from %s\n"
 msgstr "hata(%d) %s kaydın %s dosyasından silinmesi\n"
 
-#: rpmdb/rpmdb.c:906
+#: rpmdb/rpmdb.c:959
 msgid "no dbpath has been set\n"
 msgstr "belirtilmiş bir dbpath değeri yok\n"
 
-#: rpmdb/rpmdb.c:1054
+#: rpmdb/rpmdb.c:1107
 msgid ""
 "old format database is present; use --rebuilddb to generate a new format "
 "database\n"
@@ -3125,116 +3149,116 @@ msgstr ""
 "rebuilddb kullanın\n"
 
 #. error
-#: rpmdb/rpmdb.c:1319
+#: rpmdb/rpmdb.c:1372
 #, c-format
 msgid "error(%d) counting packages\n"
 msgstr "paketler taranırken hata(%d)\n"
 
-#: rpmdb/rpmdb.c:2097 rpmdb/rpmdb.c:3372
+#: rpmdb/rpmdb.c:2150 rpmdb/rpmdb.c:3502
 #, c-format
 msgid "record number %u in database is bad -- skipping.\n"
 msgstr "veritabanındaki %u. kayıt hatalı -- atlanıyor\n"
 
-#: rpmdb/rpmdb.c:2150
+#: rpmdb/rpmdb.c:2203
 #, c-format
 msgid "rpmdb: damaged header instance #%u retrieved, skipping.\n"
 msgstr "rpmdb: bozuk başlık örneği #%u alındı, atlanıyor.\n"
 
-#: rpmdb/rpmdb.c:2420
+#: rpmdb/rpmdb.c:2473
 #, c-format
 msgid "%s: cannot read header at 0x%x\n"
 msgstr "%s: 0x%x de başlık okunamadı\n"
 
-#: rpmdb/rpmdb.c:2540
+#: rpmdb/rpmdb.c:2634
 #, c-format
 msgid "removing \"%s\" from %s index.\n"
 msgstr "\"%s\" %s indeksinden siliniyor.\n"
 
-#: rpmdb/rpmdb.c:2544
+#: rpmdb/rpmdb.c:2638
 #, c-format
 msgid "removing %d entries from %s index.\n"
 msgstr "%d girdi %s indeksinden siliniyor.\n"
 
-#: rpmdb/rpmdb.c:2714
+#: rpmdb/rpmdb.c:2808
 #, c-format
 msgid "error(%d) allocating new package instance\n"
 msgstr "yeni paket örneğini tutma hatası(%d)\n"
 
-#: rpmdb/rpmdb.c:2873
+#: rpmdb/rpmdb.c:3003
 #, c-format
 msgid "adding \"%s\" to %s index.\n"
 msgstr "\"%s\" %s indeksine ekleniyor.\n"
 
-#: rpmdb/rpmdb.c:2877
+#: rpmdb/rpmdb.c:3007
 #, c-format
 msgid "adding %d entries to %s index.\n"
 msgstr "%d girdi %s indeksine ekleniyor.\n"
 
-#: rpmdb/rpmdb.c:3258
+#: rpmdb/rpmdb.c:3388
 #, c-format
 msgid "removing %s after successful db3 rebuild.\n"
 msgstr "başarılı db3 yeniden oluşturma ertesinde %s kaldırılıyor\n"
 
-#: rpmdb/rpmdb.c:3291
+#: rpmdb/rpmdb.c:3421
 msgid "no dbpath has been set"
 msgstr "belirtilmiş bir dbpath yok"
 
-#: rpmdb/rpmdb.c:3318
+#: rpmdb/rpmdb.c:3448
 #, c-format
 msgid "rebuilding database %s into %s\n"
 msgstr "%s veritabanı %s içinde yeniden oluşturuluyor\n"
 
-#: rpmdb/rpmdb.c:3322
+#: rpmdb/rpmdb.c:3452
 #, c-format
 msgid "temporary database %s already exists\n"
 msgstr "geçici veritabanı %s zaten mevcut\n"
 
-#: rpmdb/rpmdb.c:3328
+#: rpmdb/rpmdb.c:3458
 #, c-format
 msgid "creating directory %s\n"
 msgstr "%s dizini oluşturuluyor\n"
 
-#: rpmdb/rpmdb.c:3330
+#: rpmdb/rpmdb.c:3460
 #, c-format
 msgid "creating directory %s: %s\n"
 msgstr "%s dizini oluşturuluyor: %s\n"
 
-#: rpmdb/rpmdb.c:3337
+#: rpmdb/rpmdb.c:3467
 #, c-format
 msgid "opening old database with dbapi %d\n"
 msgstr "eski veritabanı dbapi %d ile açılıyor\n"
 
-#: rpmdb/rpmdb.c:3348
+#: rpmdb/rpmdb.c:3478
 #, c-format
 msgid "opening new database with dbapi %d\n"
 msgstr "yeni veritabanı dbapi %d ile açılıyor\n"
 
-#: rpmdb/rpmdb.c:3412
+#: rpmdb/rpmdb.c:3542
 #, c-format
 msgid "cannot add record originally at %u\n"
 msgstr "kayıt özgün olarak %u e eklenemedi\n"
 
-#: rpmdb/rpmdb.c:3430
+#: rpmdb/rpmdb.c:3560
 msgid "failed to rebuild database: original database remains in place\n"
 msgstr ""
 "veritabanı yeniden oluşturulamadı: mevcut veritabanı değişmeden\n"
 "yerinde bırakıldı\n"
 
-#: rpmdb/rpmdb.c:3438
+#: rpmdb/rpmdb.c:3568
 msgid "failed to replace old database with new database!\n"
 msgstr "eski veritabanının yenisiyle değiştirilirmesi başarısız!\n"
 
-#: rpmdb/rpmdb.c:3440
+#: rpmdb/rpmdb.c:3570
 #, c-format
 msgid "replace files in %s with files from %s to recover"
 msgstr "kurtarmak için %s içindeki dosyalar %s deki dosyalarla değiştiriliyor"
 
-#: rpmdb/rpmdb.c:3450
+#: rpmdb/rpmdb.c:3580
 #, c-format
 msgid "removing directory %s\n"
 msgstr "%s dizini siliniyor\n"
 
-#: rpmdb/rpmdb.c:3452
+#: rpmdb/rpmdb.c:3582
 #, c-format
 msgid "failed to remove directory %s: %s\n"
 msgstr "%s dizininin silinmesi başarısız: %s\n"
@@ -3446,6 +3470,12 @@ msgstr "url portu bir sayı olmalı\n"
 msgid "failed to create %s: %s\n"
 msgstr "%s oluşturulamadı: %s\n"
 
+#~ msgid "Generating signature using PGP.\n"
+#~ msgstr "PGP kullanarak imza üretiliyor.\n"
+
+#~ msgid "Generating signature using GPG.\n"
+#~ msgstr "GPG kullanılarak imza üretiliyor.\n"
+
 #~ msgid "no packages given for uninstall"
 #~ msgstr "sistemden silinecek paket(ler) belirtilmedi"
 
diff --git a/popt/acconfig.h b/popt/acconfig.h
index fc84c343a..591a9c114 100644
--- a/popt/acconfig.h
+++ b/popt/acconfig.h
@@ -18,12 +18,6 @@
    Leave the following blank line there!!  Autoheader needs it.  */
 
 
-/* Define to the name of the distribution.  */
-#undef PACKAGE
-
-/* Define to the version of the distribution.  */
-#undef VERSION
-
 /* Define to 1 if ANSI function prototypes are usable.  */
 #undef PROTOTYPES
 
diff --git a/rpm.spec b/rpm.spec
index a4d0484cf..040da5830 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -655,3 +655,4 @@ fi
 - display pubkeys in hex when debugging db access.
 - retrieve pubkey(s) from rpmdb, not from detached signature file.
 - reapply Berkeley DB patch #4491.
+- add header DSA signature.
diff --git a/rpm.spec.in b/rpm.spec.in
index f89f7ab82..f92420b51 100644
--- a/rpm.spec.in
+++ b/rpm.spec.in
@@ -655,3 +655,4 @@ fi
 - display pubkeys in hex when debugging db access.
 - retrieve pubkey(s) from rpmdb, not from detached signature file.
 - reapply Berkeley DB patch #4491.
+- add header DSA signature.
diff --git a/rpmdb/header.c b/rpmdb/header.c
index 866936fa7..c160b69af 100644
--- a/rpmdb/header.c
+++ b/rpmdb/header.c
@@ -2,7 +2,7 @@
  * \file lib/header.c
  */
 
-/* RPM - Copyright (C) 1995-2000 Red Hat Software */
+/* RPM - Copyright (C) 1995-2002 Red Hat Software */
 
 /* Data written to file descriptors is in network byte order.    */
 /* Data read from file descriptors is expected to be in          */
diff --git a/rpmdb/rpmdb.c b/rpmdb/rpmdb.c
index b879142aa..9c4c20f9c 100644
--- a/rpmdb/rpmdb.c
+++ b/rpmdb/rpmdb.c
@@ -44,6 +44,7 @@ extern void regfree (/*@only@*/ regex_t *preg)
 /*@access dbiIndexItem@*/
 /*@access Header@*/		/* XXX compared with NULL */
 /*@access rpmdbMatchIterator@*/
+/*@access pgpDig@*/
 
 /*@unchecked@*/
 static int _debug = 0;
@@ -2610,7 +2611,7 @@ int rpmdbRemove(rpmdb db, /*@unused@*/ int rid, unsigned int hdrNum)
 			ssize_t pktlen;
 
 			if (b64decode(rpmvals[i], (void **)&pkt, &pktlen))
-			    continue;
+			    /*@innercontinue@*/ continue;
 			(void) pgpPrtPkts(pkt, pktlen, dig, 0);
 			memcpy(bin, dig->pubkey.signid, 8);
 			pkt = _free(pkt);
@@ -2621,8 +2622,8 @@ int rpmdbRemove(rpmdb db, /*@unused@*/ int rid, unsigned int hdrNum)
 		    }
 		    /*@fallthrough@*/
 		default:
-		    vallen = strlen(rpmvals[i]);
 		    valp = rpmvals[i];
+		    vallen = strlen(rpmvals[i]);
 		    stringvalued = 1;
 		    /*@switchbreak@*/ break;
 		}
@@ -2979,7 +2980,7 @@ int rpmdbAdd(rpmdb db, int iid, Header h)
 			ssize_t pktlen;
 
 			if (b64decode(rpmvals[i], (void **)&pkt, &pktlen))
-			    continue;
+			    /*@innercontinue@*/ continue;
 			(void) pgpPrtPkts(pkt, pktlen, dig, 0);
 			memcpy(bin, dig->pubkey.signid, 8);
 			pkt = _free(pkt);
diff --git a/rpmio/rpmpgp.c b/rpmio/rpmpgp.c
index 634e5432f..a91cad624 100644
--- a/rpmio/rpmpgp.c
+++ b/rpmio/rpmpgp.c
@@ -560,12 +560,12 @@ int pgpPrtSig(pgpTag tag, const byte *h, unsigned int hlen)
 
 if (_debug && _print)
 fprintf(stderr, "   hash[%u] -- %s\n", plen, pgpHexStr(p, plen));
-	/*@-mods@*/
+/*@-mods@*/
 	if (_digp && _digp->pubkey_algo == 0) {
-	    _digp->hashlen = plen;
-	    _digp->hash = memcpy(xmalloc(plen), p, plen);
+	    _digp->hashlen = sizeof(*v) + plen;
+	    _digp->hash = memcpy(xmalloc(_digp->hashlen), v, _digp->hashlen);
 	}
-	/*@=mods@*/
+/*@=mods@*/
 	(void) pgpPrtSubType(p, plen);
 	p += plen;
 
@@ -1016,6 +1016,12 @@ struct pgpDig_s * pgpFreeDig(/*@only@*/ /*@null@*/ struct pgpDig_s * dig)
 	dig->md5 = _free(dig->md5);
 
 	/*@-branchstate@*/
+	if (dig->hdrsha1ctx != NULL)
+	    (void) rpmDigestFinal(dig->hdrsha1ctx, NULL, NULL, 0);
+	/*@=branchstate@*/
+	dig->hdrsha1ctx = NULL;
+
+	/*@-branchstate@*/
 	if (dig->sha1ctx != NULL)
 	    (void) rpmDigestFinal(dig->sha1ctx, NULL, NULL, 0);
 	/*@=branchstate@*/
diff --git a/rpmio/rpmpgp.h b/rpmio/rpmpgp.h
index e02394e4a..e7fa0045a 100644
--- a/rpmio/rpmpgp.h
+++ b/rpmio/rpmpgp.h
@@ -10,8 +10,6 @@
  *	Copyright (C) The Internet Society (1998).  All Rights Reserved.
  */
 
-#undef PACKAGE
-#undef VERSION
 #include "base64.h"
 #include "dsa.h"
 #include "endianness.h"
@@ -975,15 +973,21 @@ struct pgpDig_s {
     struct pgpDigParams_s signature;
     struct pgpDigParams_s pubkey;
 
-    size_t nbytes;			/*!< No. bytes of plain text. */
+    size_t nbytes;		/*!< No. bytes of plain text. */
 
-/*@only@*/ /*@null@*/ DIGEST_CTX sha1ctx;/*!< (dsa) sha1 hash context. */
-/*@only@*/ /*@null@*/ void * sha1;	/*!< (dsa) V3 signature hash. */
-    size_t sha1len;			/*!< (dsa) V3 signature hash length. */
+/*@only@*/ /*@null@*/
+    DIGEST_CTX sha1ctx;		/*!< (dsa) sha1 hash context. */
+/*@only@*/ /*@null@*/
+    DIGEST_CTX hdrsha1ctx;	/*!< (dsa) header sha1 hash context. */
+/*@only@*/ /*@null@*/
+    void * sha1;		/*!< (dsa) V3 signature hash. */
+    size_t sha1len;		/*!< (dsa) V3 signature hash length. */
 
-/*@only@*/ /*@null@*/ DIGEST_CTX md5ctx;/*!< (rsa) md5 hash context. */
-/*@only@*/ /*@null@*/ void * md5;	/*!< (rsa) V3 signature hash. */
-    size_t md5len;			/*!< (rsa) V3 signature hash length. */
+/*@only@*/ /*@null@*/
+    DIGEST_CTX md5ctx;		/*!< (rsa) md5 hash context. */
+/*@only@*/ /*@null@*/
+    void * md5;			/*!< (rsa) V3 signature hash. */
+    size_t md5len;		/*!< (rsa) V3 signature hash length. */
 
     /* DSA parameters. */
     mp32barrett p;
diff --git a/rpmqv.c b/rpmqv.c
index 8db726c43..e18817356 100755
--- a/rpmqv.c
+++ b/rpmqv.c
@@ -232,7 +232,7 @@ static void printBanner(void)
 	/*@globals fileSystem @*/
 	/*@modifies fileSystem @*/
 {
-    (void) puts(_("Copyright (C) 1998-2000 - Red Hat, Inc."));
+    (void) puts(_("Copyright (C) 1998-2002 - Red Hat, Inc."));
     (void) puts(_("This program may be freely redistributed under the terms of the GNU GPL"));
 }