See ChangeLog: Thu May 6 14:18:17 CEST 1999 Werner Koch

27 files changed, 4036 insertions, 3151 deletions

diff --git a/BUGS b/BUGS
index ab9c95f25..21ac85da7 100644
--- a/BUGS
+++ b/BUGS
@@ -32,7 +32,7 @@ and after about half a day in the rsync snapshots.
        5. key has expiration date from 1. and gpg reports that pubkey
 	  and seckey differ.
      The for loop the exp.date is set before v3 detection?
-     [is this bug still there?]
+     [is this bug still alive?]
 
 [  *] #5
     /home/jam/.gnupg/pubring.gpg: can't open gdbm file: Can't be writer
@@ -48,22 +48,5 @@ and after about half a day in the rsync snapshots.
     --> IRIX bug still there
 
 
-[  *] #13 1999-04-05
-    Trying to generate very large keys fails with a BUG in read_pool()
-    FIX: 1999-04-06
-
-
-[  *] #14 1999-04-05 <anonymous>
-    If you use --s2k-cipher-algo twofish, the the program crashes with
-    a BUG at line 226 of passphrase.c.
-    FIX: 1999-04-06
-
-
-[ **] #15 1999-04-05
-    Hash calculation for subkey bindings is not according to rfc2440 if
-    a 4 byte length header is used for the subkey.
-    FIX: 1999-04-06
-
-
-Next #16
+Next #17
 
diff --git a/ChangeLog b/ChangeLog
index 8ed66e34a..5651415a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu May  6 14:18:17 CEST 1999  Werner Koch  <[email protected]>
+
+	* README: Minor updates
+
+	* VERSION: Now 0.9.6
+
 Thu Apr  8 09:35:53 CEST 1999  Werner Koch  <[email protected]>
 
 	* acinclude.m4 (GNUPG_CHECK_RDYNAMIC): Fix for
diff --git a/OBUGS b/OBUGS
index dd15391cb..676f88190 100644
--- a/OBUGS
+++ b/OBUGS
@@ -44,4 +44,24 @@
     gpg --list-secret-keys --with-colon SEGVs
     FIX: 1999-03-10
 
+[  *] #13 1999-04-05
+    Trying to generate very large keys fails with a BUG in read_pool()
+    FIX: 1999-04-06
+
+
+[  *] #14 1999-04-05 <anonymous>
+    If you use --s2k-cipher-algo twofish, the the program crashes with
+    a BUG at line 226 of passphrase.c.
+    FIX: 1999-04-06
+
+
+[ **] #15 1999-04-05
+    Hash calculation for subkey bindings is not according to rfc2440 if
+    a 4 byte length header is used for the subkey.
+    FIX: 1999-04-06
+
+[***] #16 1999-03-23 <[email protected]>
+    Verifying detached signatures with an empty file yields a rc of 0.
+    FIX: 1999-05-06
+
 
diff --git a/README b/README
index 2d02f527b..b10e4427a 100644
--- a/README
+++ b/README
@@ -1,13 +1,8 @@
-Please note that this is only a bug fix release and some things
-do not yet work - see TODO for parts which are problematic
-
-
-
 -----BEGIN PGP SIGNED MESSAGE-----
 
 		    GnuPG - The GNU Privacy Guard
 		   -------------------------------
-			    Version 0.9
+			   Version 0.9.6
 
     GnuPG is now in Beta test and you should report all bugs to the
     mailing list (see below).  The 0.9.x versions are released mainly
@@ -17,29 +12,28 @@ do not yet work - see TODO for parts which are problematic
 
     GnuPG works best on GNU/Linux or *BSD.  Other Unices are
     also supported but are not as well tested as the Free Unices.
-    Please verify the tar file with the PGP2 or GnuPG/PGP5
+    Please verify the tar file with the PGP2 or OpenPGP
     signatures provided.  My PGP2 key is well known and published in
     the "Global Trust Register for 1998", ISBN 0-9532397-0-5.
 
     I have included my pubring as "g10/pubring.asc", which contains
     the key used to make GnuPG signatures:
+
     "pub  1024D/57548DCD 1998-07-07 Werner Koch (gnupg sig) <[email protected]>"
     "Key fingerprint = 6BD9 050F D8FC 941B 4341  2DCC 68B7 AB89 5754 8DCD"
 
-    My new DSA key is:
-    "pub  1024D/621CC013 1998-07-07 Werner Koch <[email protected]>"
-    "Key fingerprint = ECAF 7590 EB34 43B5 C7CF  3ACB 6C7E E1B8 621C C013"
-
-    You may want add my new DSA key to your GnuPG pubring and use it in
+    You may want to add this DSA key to your GnuPG pubring and use it in
     the future to verify new releases.	Because you verified this README
     file and _checked_that_it_is_really_my PGP2 key 0C9857A5, you can be
-    sure that the above fingerprints are correct.
+    quite sure that the above fingerprint is correct.
 
-    Please subscribe to [email protected] by sending a mail with
-    the word "subscribe" in the body to "[email protected]".
-    This mailing list is closed (only subscribers are allowed to post)
-    to avoid misuse by folks who don't know the Netiquette and trash
-    your mailspool with commercial junk.
+    Please subscribe to [email protected] by sending a mail with
+    a subject of "subscribe" to "[email protected]".  If you
+    have problems, please subscribe to "[email protected]" by sending
+    mail with the subject "subscribe" to "[email protected]"
+    and ask there.  The gnupg.org domain is hosted in Germany to avoid
+    possible legal problems with gnu.org (technical advices may count
+    as a violation of ITAR).
 
     See the file COPYING for copyright and warranty information.
 
@@ -72,9 +66,11 @@ do not yet work - see TODO for parts which are problematic
 
     3) "make install"
 
-    4) You end up with the binaries "gpg" and "gpgm" in /usr/local/bin.
+    4) You end up with a "gpg" binray in /usr/local/bin.
 
-    5) Optional, but suggested, install the binary "gpg" as suid root.
+    5) To avoid swapping out of sensitive data, you can install "gpg" as
+       suid root.  If you don't do so, you may want to add the option
+       "no-secmem-warning" to ~/.gnupg/options
 
 
 
@@ -230,7 +226,8 @@ do not yet work - see TODO for parts which are problematic
     key - different keys will always have different fingerprints.
     It is easy to compare fingerprints by phone and I suggest
     that you print your fingerprint on the back of your business
-    card.
+    card.  To see the fingerprints of the secondary keys, you can
+    give the command twice; but this is normally not needed.
 
     If you don't know the owner of the public key you are in trouble.
     Suppose however that friend of yours knows someone who knows someone
@@ -442,11 +439,11 @@ do not yet work - see TODO for parts which are problematic
     Have fun and remember: Echelon is looking at you kid.
 
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v0.9.2 (GNU/Linux)
+Version: GnuPG v0.9.5 (GNU/Linux)
 Comment: For info see http://www.gnupg.org
 
-iQB1AwUBNr2fPh0Z9MEMmFelAQHqNAL/e7pApR0CGUJ/zuIsjaVhNGPEgKAglcEd
-YuVdB+RCN0wq7ZfI0AHU2FdVISRACmSN3xituTTgeiOUsczM40EZ4l1XNfyRF768
-fglui6XxEeYHFY7mSQMgzzFWDG0Squx0
-=enRo
+iQB1AwUBNzFgoB0Z9MEMmFelAQG1EgL/UlmBc7X9UoSh0ge1FNSNncHQGIX8wHkG
+0BHOkcHS9XNxZokgkxoUTSRDFlXxW9auWpYKYeNkkck8S9ExtOJK6FABme6Daof0
+Hfe4E7TA82T73gvsMMlN6wyys3k5gTRt
+=FP1e
 -----END PGP SIGNATURE-----
diff --git a/THANKS b/THANKS
index 8fe47c17d..082d85bf5 100644
--- a/THANKS
+++ b/THANKS
@@ -5,6 +5,7 @@ errors.
 
 Anand Kumria		[email protected]
 Ariel T Glenn		[email protected]
+Bodo Moeller		[email protected]
 Bryan Fullerton 	[email protected]
 Brian Moore		[email protected]
 Brian Warner		[email protected]
diff --git a/TODO b/TODO
index dc2daaa76..250c10d11 100644
--- a/TODO
+++ b/TODO
@@ -2,8 +2,6 @@
   * add some status output put for signing and encryption.
     replace the putc in primegen with some kind of status-fd outputs.
 
-  * Fix revocation and expire stuff.  Subkey revocations are not detected.
-
   * Speed up calculation of key validity.
 
   * See why we always get this "Hmmm, public key not anymore available"
@@ -19,7 +17,6 @@
     encrypt package was found.	Extension: display a list of all recipients.
 
   * Add NO_PUBKEY and NO_SECKEY status lines.
-  * Add more NODATA status lines
 
   * Solaris make has problems with the generated POTFILES - seems to be a
     gettext bug.
diff --git a/VERSION b/VERSION
index 278046e3f..85b7c695b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.9.5b
+0.9.6
diff --git a/checks/defs.inc b/checks/defs.inc
index 7255fbad1..45d54dfed 100755
--- a/checks/defs.inc
+++ b/checks/defs.inc
@@ -60,7 +60,7 @@ chdir () {
 
 
 have_hash_algo () {
-  if  ../g10/gpgm --homedir .  --version | grep "Hash:.*$1" >/dev/null
+  if  ../g10/gpg --homedir .  --version | grep "Hash:.*$1" >/dev/null
   then
 	true
   else
diff --git a/cipher/Makefile.am b/cipher/Makefile.am
index b12781622..a3b77a1a1 100644
--- a/cipher/Makefile.am
+++ b/cipher/Makefile.am
@@ -41,7 +41,6 @@ libcipher_a_SOURCES = cipher.c	\
 		 des.c		\
 		 des.h		\
 		 twofish.c	\
-		 twofish.h	\
 		 blowfish.c	\
 		 blowfish.h	\
 		 cast5.c	\
diff --git a/doc/DETAILS b/doc/DETAILS
index 4641bf7a4..a681c2f89 100644
--- a/doc/DETAILS
+++ b/doc/DETAILS
@@ -77,6 +77,9 @@ more arguments in future versions.
     NODATA  <what>
 	No data has been found. Codes for what are:
 	    1 - No armored data.
+	    2 - Expected a packet but did not found one.
+	    3 - Invalid packet found, this may indicate a non OpenPGP message.
+	You may see more than one of these status lines.
 
     TRUST_UNDEFINED
     TRUST_NEVER
diff --git a/g10/ChangeLog b/g10/ChangeLog
index dc4d1e15f..a29764a2f 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,15 @@
+Thu May  6 14:18:17 CEST 1999  Werner Koch  <[email protected]>
+
+	* trustdb.c (check_trust): Check for revoked subkeys.
+	* pkclist.c (do_we_trust): Handled revoked subkeys.
+	(do_we_trust_pre): Ditto.
+	(check_signatures_trust): Ditto.
+
+	* build-packet.c (hash_public_key): Fix for ancient g10 keys.
+
+	* mainproc.c (do_proc_packets): Return EOF if no data has been read.
+	* g10.c (main): Catch errors for default operation.
+
 Thu Apr 29 12:29:22 CEST 1999  Werner Koch  <[email protected]>
 
 	* sign.c (sign_file): Fixed hashing in case of no subpackets.
diff --git a/g10/build-packet.c b/g10/build-packet.c
index 285f115f4..7a2c1062a 100644
--- a/g10/build-packet.c
+++ b/g10/build-packet.c
@@ -258,38 +258,42 @@ hash_public_key( MD_HANDLE md, PKT_public_key *pk )
     pkt.pkt.public_key = pk;
     if( (rc = build_packet( a, &pkt )) )
 	log_fatal("build public_key for hashing failed: %s\n", g10_errstr(rc));
-    /* skip the constructed header */
-    ctb = iobuf_get_noeof(a);
-    pktlen = 0;
-    if( (ctb & 0x40) ) {
-	c = iobuf_get_noeof(a);
-	if( c < 192 )
-	    pktlen = c;
-	else if( c < 224 ) {
-	    pktlen = (c - 192) * 256;
+
+    if( !(pk->version == 3 && pk->pubkey_algo == 16) ) {
+	/* skip the constructed header but don't do this for our very old
+	 * v3 ElG keys */
+	ctb = iobuf_get_noeof(a);
+	pktlen = 0;
+	if( (ctb & 0x40) ) {
 	    c = iobuf_get_noeof(a);
-	    pktlen += c + 192;
-	}
-	else if( c == 255 ) {
-	    pktlen  = iobuf_get_noeof(a) << 24;
-	    pktlen |= iobuf_get_noeof(a) << 16;
-	    pktlen |= iobuf_get_noeof(a) << 8;
-	    pktlen |= iobuf_get_noeof(a);
+	    if( c < 192 )
+		pktlen = c;
+	    else if( c < 224 ) {
+		pktlen = (c - 192) * 256;
+		c = iobuf_get_noeof(a);
+		pktlen += c + 192;
+	    }
+	    else if( c == 255 ) {
+		pktlen	= iobuf_get_noeof(a) << 24;
+		pktlen |= iobuf_get_noeof(a) << 16;
+		pktlen |= iobuf_get_noeof(a) << 8;
+		pktlen |= iobuf_get_noeof(a);
+	    }
 	}
-    }
-    else {
-	int lenbytes = ((ctb&3)==3)? 0 : (1<<(ctb & 3));
-	for( ; lenbytes; lenbytes-- ) {
-	    pktlen <<= 8;
-	    pktlen |= iobuf_get_noeof(a);
+	else {
+	    int lenbytes = ((ctb&3)==3)? 0 : (1<<(ctb & 3));
+	    for( ; lenbytes; lenbytes-- ) {
+		pktlen <<= 8;
+		pktlen |= iobuf_get_noeof(a);
+	    }
 	}
+	/* hash a header */
+	md_putc( md, 0x99 );
+	pktlen &= 0xffff; /* can't handle longer packets */
+	md_putc( md, pktlen >> 8 );
+	md_putc( md, pktlen & 0xff );
     }
-    /* hash a header */
-    md_putc( md, 0x99 );
-    pktlen &= 0xffff; /* can't handle longer packets */
-    md_putc( md, pktlen >> 8 );
-    md_putc( md, pktlen & 0xff );
-    /* hash the packet body (don't use pktlen here!) */
+    /* hash the packet body */
     while( (c=iobuf_get(a)) != -1 ) {
       #if 0
 	fprintf( fp," %02x", c );
diff --git a/g10/g10.c b/g10/g10.c
index ab6a28d2a..945ed0495 100644
--- a/g10/g10.c
+++ b/g10/g10.c
@@ -1243,7 +1243,9 @@ main( int argc, char **argv )
 		set_packet_list_mode(1);
 		opt.list_packets=1;
 	    }
-	    proc_packets(NULL, a );
+	    rc = proc_packets(NULL, a );
+	    if( rc )
+		log_error("processing message failed: %s\n", g10_errstr(rc) );
 	    iobuf_close(a);
 	}
 	break;
diff --git a/g10/getkey.c b/g10/getkey.c
index 505e1c071..4d747f8bc 100644
--- a/g10/getkey.c
+++ b/g10/getkey.c
@@ -1438,7 +1438,8 @@ find_by_fpr( KBNODE keyblock, PKT_public_key *pk, const char *name, int mode )
 		keyid_from_pk( k->pkt->pkt.public_key, aki );
 		log_debug("         aki=%08lx%08lx algo=%d mode=%d an=%u\n",
 				(ulong)aki[0], (ulong)aki[1],
-			k->pkt->pkt.public_key->pubkey_algo, mode, an );
+			k->pkt->pkt.public_key->pubkey_algo, mode,
+							    (unsigned)an );
 	    }
 
 	    if( an == mode
@@ -1470,7 +1471,8 @@ find_by_fpr_sk( KBNODE keyblock, PKT_secret_key *sk,
 		keyid_from_sk( k->pkt->pkt.secret_key, aki );
 		log_debug("         aki=%08lx%08lx algo=%d mode=%d an=%u\n",
 				(ulong)aki[0], (ulong)aki[1],
-			k->pkt->pkt.secret_key->pubkey_algo, mode, an );
+			k->pkt->pkt.secret_key->pubkey_algo, mode,
+							(unsigned)an );
 	    }
 
 	    if( an == mode
diff --git a/g10/kbnode.c b/g10/kbnode.c
index 70c85f7bd..6bd547048 100644
--- a/g10/kbnode.c
+++ b/g10/kbnode.c
@@ -302,7 +302,8 @@ dump_kbnode( KBNODE node )
 	    fputs("\"\n", stderr);
 	}
 	else if( node->pkt->pkttype == PKT_SIGNATURE ) {
-	    fprintf(stderr, "  keyid=%08lX\n",
+	    fprintf(stderr, "  class=%02x keyid=%08lX\n",
+		   node->pkt->pkt.signature->sig_class,
 		   (ulong)node->pkt->pkt.signature->keyid[1] );
 	}
 	else if( node->pkt->pkttype == PKT_PUBLIC_KEY
diff --git a/g10/keyedit.c b/g10/keyedit.c
index b2fb13d28..85f3dfaf7 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -122,8 +122,6 @@ check_all_keysigs( KBNODE keyblock, int only_selected )
     int anyuid = 0;
 
     for( kbctx=NULL; (node=walk_kbnode( keyblock, &kbctx, 0)) ; ) {
-	int is_rev = 0;
-
 	if( node->pkt->pkttype == PKT_USER_ID ) {
 	    PKT_user_id *uid = node->pkt->pkt.user_id;
 
@@ -140,10 +138,11 @@ check_all_keysigs( KBNODE keyblock, int only_selected )
 	    }
 	}
 	else if( selected && node->pkt->pkttype == PKT_SIGNATURE
-		 && (node->pkt->pkt.signature->sig_class&~3) == 0x10
-		 && (is_rev = node->pkt->pkt.signature->sig_class == 0x30) ) {
+		 && ( (node->pkt->pkt.signature->sig_class&~3) == 0x10
+		     || node->pkt->pkt.signature->sig_class == 0x30 )  ) {
 	    PKT_signature *sig = node->pkt->pkt.signature;
 	    int sigrc, selfsig;
+	    int is_rev = sig->sig_class == 0x30;
 
 	    switch( (rc = check_key_signature( keyblock, node, &selfsig)) ) {
 	      case 0:
@@ -956,7 +955,7 @@ show_key_with_all_names( KBNODE keyblock, int only_marked,
 			 int with_fpr, int with_subkeys, int with_prefs )
 {
     KBNODE node;
-    int i;
+    int i, rc;
 
     /* the keys */
     for( node = keyblock; node; node = node->next ) {
@@ -1001,6 +1000,20 @@ show_key_with_all_names( KBNODE keyblock, int only_marked,
 			  datestr_from_sk(sk),
 			  expirestr_from_sk(sk) );
 	}
+	else if( with_subkeys && node->pkt->pkttype == PKT_SIGNATURE
+		 && node->pkt->pkt.signature->sig_class == 0x28       ) {
+	    PKT_signature *sig = node->pkt->pkt.signature;
+
+	    rc = check_key_signature( keyblock, node, NULL );
+	    if( !rc )
+		tty_printf( "rev! subkey has been revoked: %s\n",
+			    datestr_from_sig( sig ) );
+	    else if( rc == G10ERR_BAD_SIGN )
+		tty_printf( "rev- faked revocation found\n" );
+	    else if( rc )
+		tty_printf( "rev? problem checking revocation: %s\n",
+							 g10_errstr(rc) );
+	}
     }
     /* the user ids */
     i = 0;
@@ -1677,7 +1690,7 @@ menu_revsig( KBNODE keyblock )
 	pkt = m_alloc_clear( sizeof *pkt );
 	pkt->pkttype = PKT_SIGNATURE;
 	pkt->pkt.signature = sig;
-	insert_kbnode( unode, new_kbnode(pkt), PKT_SIGNATURE );
+	insert_kbnode( unode, new_kbnode(pkt), 0 );
 	goto reloop;
     }
 
@@ -1701,7 +1714,7 @@ menu_revkey( KBNODE pub_keyblock, KBNODE sec_keyblock )
     int upd_trust = 0;
     int rc;
 
-  reloop: /* (better this way becuase we are modifing the keyring) */
+  reloop: /* (better this way because we are modifing the keyring) */
     mainpk = pub_keyblock->pkt->pkt.public_key;
     for( node = pub_keyblock; node; node = node->next ) {
 	if( node->pkt->pkttype == PKT_PUBLIC_SUBKEY
@@ -1726,7 +1739,7 @@ menu_revkey( KBNODE pub_keyblock, KBNODE sec_keyblock )
 	    pkt = m_alloc_clear( sizeof *pkt );
 	    pkt->pkttype = PKT_SIGNATURE;
 	    pkt->pkt.signature = sig;
-	    insert_kbnode( node, new_kbnode(pkt), PKT_SIGNATURE );
+	    insert_kbnode( node, new_kbnode(pkt), 0 );
 	    goto reloop;
 	}
     }
diff --git a/g10/mainproc.c b/g10/mainproc.c
index 024674e4a..9bfdaaf9a 100644
--- a/g10/mainproc.c
+++ b/g10/mainproc.c
@@ -215,7 +215,7 @@ proc_pubkey_enc( CTX c, PACKET *pkt )
     else {
 	/* fixme: defer this message until we have parsed all packets of
 	 * this type - do this by building a list of keys with their stati
-	 * and store it with the conetxt.  do_proc_packets can then use
+	 * and store it with the context.  do_proc_packets can then use
 	 * this list to display some information */
 	log_error(_("public key decryption failed: %s\n"), g10_errstr(result));
     }
@@ -307,7 +307,7 @@ proc_plaintext( CTX c, PACKET *pkt )
 	md_enable( c->mfx.md, DIGEST_ALGO_SHA1 );
 	md_enable( c->mfx.md, DIGEST_ALGO_MD5 );
     }
-  #if 1
+  #if 0
     #warning md_start_debug is enabled
     md_start_debug( c->mfx.md, "verify" );
   #endif
@@ -753,12 +753,13 @@ do_proc_packets( CTX c, IOBUF a )
 {
     PACKET *pkt = m_alloc( sizeof *pkt );
     int rc=0;
+    int any_data=0;
     int newpkt;
 
     c->iobuf = a;
     init_packet(pkt);
     while( (rc=parse_packet(a, pkt)) != -1 ) {
-
+	any_data = 1;
 	if( rc ) {
 	    free_packet(pkt);
 	    if( rc == G10ERR_INVALID_PACKET )
@@ -844,7 +845,13 @@ do_proc_packets( CTX c, IOBUF a )
 	else
 	    free_packet(pkt);
     }
-    rc = 0;
+    if( rc == G10ERR_INVALID_PACKET )
+	write_status_text( STATUS_NODATA, "3" );
+    if( any_data )
+	rc = 0;
+    else if( rc == -1 )
+	write_status_text( STATUS_NODATA, "2" );
+
 
   leave:
     release_list( c );
diff --git a/g10/pkclist.c b/g10/pkclist.c
index 73e8f3889..f873be404 100644
--- a/g10/pkclist.c
+++ b/g10/pkclist.c
@@ -287,6 +287,16 @@ do_we_trust( PKT_public_key *pk, int trustlevel )
 				    _("Use this key anyway? ")) )
 	    return 0;
     }
+    else if( (trustlevel & TRUST_FLAG_SUB_REVOKED) ) {
+	log_info(_("key %08lX: subkey has been revoked!\n"),
+					(ulong)keyid_from_pk( pk, NULL) );
+	if( opt.batch )
+	    return 0;
+
+	if( !cpr_get_answer_is_yes("revoked_key.override",
+				    _("Use this key anyway? ")) )
+	    return 0;
+    }
 
 
     switch( (trustlevel & TRUST_MASK) ) {
@@ -368,6 +378,8 @@ do_we_trust_pre( PKT_public_key *pk, int trustlevel )
 
     if( (trustlevel & TRUST_FLAG_REVOKED) && !rc )
 	return 0;
+    if( (trustlevel & TRUST_FLAG_SUB_REVOKED) && !rc )
+	return 0;
     else if( !opt.batch && !rc ) {
 	char *p;
 	u32 keyid[2];
@@ -435,6 +447,10 @@ check_signatures_trust( PKT_signature *sig )
 	log_info(_("WARNING: This key has been revoked by its owner!\n"));
 	log_info(_("         This could mean that the signature is forgery.\n"));
     }
+    else if( (trustlevel & TRUST_FLAG_SUB_REVOKED) ) {
+	write_status( STATUS_KEYREVOKED );
+	log_info(_("WARNING: This subkey has been revoked by its owner!\n"));
+    }
 
 
     switch( (trustlevel & TRUST_MASK) ) {
diff --git a/g10/trustdb.c b/g10/trustdb.c
index 88e06c315..9f12757b1 100644
--- a/g10/trustdb.c
+++ b/g10/trustdb.c
@@ -2780,6 +2780,36 @@ check_trust( PKT_public_key *pk, unsigned *r_trustlevel,
 	}
     }
 
+    /* is a subkey has been requested, we have to check its keyflags */
+    if( !rc ) {
+	TRUSTREC krec;
+	byte fpr[MAX_FINGERPRINT_LEN] = {0}; /* to avoid compiler warnings */
+	size_t fprlen = 0;
+	ulong recno;
+	int kcount=0;
+
+	for( recno = rec.r.dir.keylist; recno; recno = krec.r.key.next ) {
+	    read_record( recno, &krec, RECTYPE_KEY );
+	    if( ++kcount == 1 )
+		continue; /* skip the primary key */
+	    if( kcount == 2 ) /* now we need the fingerprint */
+		fingerprint_from_pk( pk, fpr, &fprlen );
+
+	    if( krec.r.key.fingerprint_len == fprlen
+		&& !memcmp( krec.r.key.fingerprint, fpr, fprlen ) ) {
+		/* found the subkey */
+		if( (krec.r.key.keyflags & KEYF_REVOKED) )
+		    trustlevel |= TRUST_FLAG_SUB_REVOKED;
+		/* should we check for keybinding here??? */
+		/* Hmmm: Maybe this whole checking stuff should not go
+		 * into the trustdb, but be done direct from the keyblock.
+		 * Chnage this all when we add an abstarction layer around
+		 * the way certificates are handled by different standards */
+		break;
+	    }
+	}
+    }
+
 
   leave:
     if( DBG_TRUST )
diff --git a/g10/trustdb.h b/g10/trustdb.h
index 64ccaae5d..777c4749d 100644
--- a/g10/trustdb.h
+++ b/g10/trustdb.h
@@ -33,6 +33,7 @@
 #define TRUST_ULTIMATE	  6  /* u: ultimately trusted */
 /* trust values not covered by the mask */
 #define TRUST_FLAG_REVOKED 32 /* r: revoked */
+#define TRUST_FLAG_SUB_REVOKED 64
 
 
 #define PREFTYPE_SYM	  1
diff --git a/po/de.po b/po/de.po
index 9103247b6..8df045083 100644
--- a/po/de.po
+++ b/po/de.po
@@ -3,7 +3,7 @@
 # Walter Koch <[email protected]>, 1998.
 msgid ""
 msgstr ""
-"POT-Creation-Date: 1999-03-20 13:40+0100\n"
+"POT-Creation-Date: 1999-05-06 13:37+0200\n"
 "PO-Revision-Date: 1999-03-08 13:34+0100\n"
 "Last-Translator: Walter Koch <[email protected]>\n"
 "Language-Team: German <[email protected]>\n"
@@ -35,11 +35,11 @@ msgid "(you may have used the wrong program for this task)\n"
 msgstr ""
 "(m�glicherweise haben Sie das falsche Programm f�r diese Aufgabe benutzt)\n"
 
-#: util/miscutil.c:143
+#: util/miscutil.c:156
 msgid "yes"
 msgstr "ja"
 
-#: util/miscutil.c:144
+#: util/miscutil.c:157
 msgid "yY"
 msgstr "jJyY"
 
@@ -231,6 +231,11 @@ msgstr "Nicht unterst�tzter URI"
 msgid "network error"
 msgstr "Netzwerkfehler"
 
+#: util/errors.c:102
+#, fuzzy
+msgid "not encrypted"
+msgstr "%s verschl�sselte Daten\n"
+
 #: util/logger.c:178
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
@@ -241,12 +246,12 @@ msgstr "... dies ist ein Bug (Programmfehler) (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "Sie haben eine Bug (Programmfehler) gefunden ... (%s:%d)\n"
 
-#: cipher/random.c:403
+#: cipher/random.c:408
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr ""
 "WARNUNG: Der Zufallszahlengenerator erzeugt keine echten Zufallszahlen!\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:409
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -272,7 +277,7 @@ msgstr ""
 "Arbeiten durch, damit das Betriebssystem weitere Entropie sammeln kann!\n"
 "(Es werden noch %d Byte ben�tigt.)\n"
 
-#: g10/g10.c:166
+#: g10/g10.c:163
 msgid ""
 "@Commands:\n"
 " "
@@ -280,132 +285,132 @@ msgstr ""
 "@Befehle:\n"
 " "
 
-#: g10/g10.c:169
+#: g10/g10.c:165
 msgid "|[file]|make a signature"
 msgstr "|[file]|Eine Unterschrift erzeugen"
 
-#: g10/g10.c:170
+#: g10/g10.c:166
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|Eine Klartextunterschrift erzeugen"
 
-#: g10/g10.c:171
+#: g10/g10.c:167
 msgid "make a detached signature"
 msgstr "Eine abgetrennte Unterschrift erzeugen"
 
-#: g10/g10.c:172
+#: g10/g10.c:168
 msgid "encrypt data"
 msgstr "Daten verschl�sseln"
 
-#: g10/g10.c:173
+#: g10/g10.c:169
 msgid "encryption only with symmetric cipher"
 msgstr "Daten symmetrisch verschl�sseln"
 
-#: g10/g10.c:174
+#: g10/g10.c:170
 msgid "store only"
 msgstr "Nur speichern"
 
-#: g10/g10.c:175
+#: g10/g10.c:171
 msgid "decrypt data (default)"
 msgstr "Daten entschl�sseln (Voreinstellung)"
 
-#: g10/g10.c:176
+#: g10/g10.c:172
 msgid "verify a signature"
 msgstr "Signatur pr�fen"
 
-#: g10/g10.c:178
+#: g10/g10.c:173
 msgid "list keys"
 msgstr "Liste der Schl�ssel"
 
-#: g10/g10.c:179
+#: g10/g10.c:175
 msgid "list keys and signatures"
 msgstr "Liste der Schl�ssel und ihrer Signaturen"
 
-#: g10/g10.c:180
+#: g10/g10.c:176
 msgid "check key signatures"
 msgstr "Signaturen der Schl�ssel pr�fen"
 
-#: g10/g10.c:181
+#: g10/g10.c:177
 msgid "list keys and fingerprints"
 msgstr "Liste der Schl�ssel und ihrer \"Fingerabdr�cke\""
 
-#: g10/g10.c:182
+#: g10/g10.c:178
 msgid "list secret keys"
 msgstr "Liste der geheimen Schl�ssel"
 
-#: g10/g10.c:184
+#: g10/g10.c:179
 msgid "generate a new key pair"
 msgstr "Ein neues Schl�sselpaar erzeugen"
 
-#: g10/g10.c:186
+#: g10/g10.c:180
 msgid "remove key from the public keyring"
 msgstr "Schl�ssel entfernen"
 
-#: g10/g10.c:188
+#: g10/g10.c:181
 msgid "sign or edit a key"
 msgstr "Unterschreiben oder Bearbeiten eines Schl�ssels"
 
-#: g10/g10.c:189
+#: g10/g10.c:182
 msgid "generate a revocation certificate"
 msgstr "Ein Schl�sselwiderruf-Zertifikat erzeugen"
 
-#: g10/g10.c:191
+#: g10/g10.c:183
 msgid "export keys"
 msgstr "Schl�ssel exportieren"
 
-#: g10/g10.c:192
+#: g10/g10.c:184
 msgid "export keys to a key server"
 msgstr "Schl�ssel zu einem Schl�sselserver exportieren"
 
-#: g10/g10.c:193
+#: g10/g10.c:185
 #, fuzzy
 msgid "import keys from a key server"
 msgstr "Schl�ssel zu einem Schl�sselserver exportieren"
 
-#: g10/g10.c:196
+#: g10/g10.c:188
 msgid "import/merge keys"
 msgstr "Schl�ssel importieren/kombinieren"
 
-#: g10/g10.c:198
+#: g10/g10.c:190
 msgid "list only the sequence of packets"
 msgstr "Lediglich die Struktur der Datenpakete anzeigen"
 
-#: g10/g10.c:201
+#: g10/g10.c:192
 msgid "export the ownertrust values"
 msgstr "Exportieren der \"Owner trust\" Werte"
 
-#: g10/g10.c:203
+#: g10/g10.c:194
 msgid "import ownertrust values"
 msgstr "Importieren der \"Owner trust\" Werte"
 
-#: g10/g10.c:205
+#: g10/g10.c:196
 msgid "|[NAMES]|update the trust database"
 msgstr "|[NAMES]|�ndern der \"Trust\"-Datenbank"
 
-#: g10/g10.c:207
+#: g10/g10.c:198
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NAMES]|�berpr�fen der \"Trust\"-Datenbank"
 
-#: g10/g10.c:208
+#: g10/g10.c:199
 msgid "fix a corrupted trust database"
 msgstr "Reparieren einer besch�digten \"Trust\"-Datenbank"
 
-#: g10/g10.c:209
+#: g10/g10.c:200
 msgid "De-Armor a file or stdin"
 msgstr "Datei oder stdin von der ASCII-H�lle befreien"
 
-#: g10/g10.c:210
+#: g10/g10.c:201
 msgid "En-Armor a file or stdin"
 msgstr "Datei oder stdin in eine ASCII-H�lle einpacken"
 
-#: g10/g10.c:211
+#: g10/g10.c:202
 msgid "|algo [files]|print message digests"
 msgstr "|algo [files]|Message-Digests f�r die Dateien ausgeben"
 
-#: g10/g10.c:212
+#: g10/g10.c:203
 msgid "print all message digests"
 msgstr "Message-Digests f�r die Eingabedaten ausgeben"
 
-#: g10/g10.c:219
+#: g10/g10.c:209
 msgid ""
 "@\n"
 "Options:\n"
@@ -415,143 +420,148 @@ msgstr ""
 "Optionen:\n"
 " "
 
-#: g10/g10.c:221
+#: g10/g10.c:211
 msgid "create ascii armored output"
 msgstr "Ausgabe mit ASCII-H�lle versehen"
 
-#: g10/g10.c:222
+#: g10/g10.c:212
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|verschl�sseln f�r NAME"
 
-#: g10/g10.c:227
+#: g10/g10.c:216
 msgid "use this user-id to sign or decrypt"
 msgstr "Mit dieser User-ID signieren"
 
-#: g10/g10.c:228
+#: g10/g10.c:217
 msgid "|N|set compress level N (0 disables)"
 msgstr "Kompressionsstufe auf N setzen (0 = keine Kompr.)"
 
-#: g10/g10.c:230
+#: g10/g10.c:219
 msgid "use canonical text mode"
 msgstr "Textmodus benutzen"
 
-#: g10/g10.c:232
+#: g10/g10.c:220
 msgid "use as output file"
 msgstr "Als Ausgabedatei benutzen"
 
-#: g10/g10.c:233
+#: g10/g10.c:221
 msgid "verbose"
 msgstr "Detaillierte Informationen"
 
-#: g10/g10.c:234
+#: g10/g10.c:222
 msgid "be somewhat more quiet"
 msgstr "Etwas weniger Infos"
 
-#: g10/g10.c:235
+#: g10/g10.c:223
 msgid "force v3 signatures"
 msgstr "v3 Signaturen erzwingen"
 
-#: g10/g10.c:236
+#: g10/g10.c:224
+#, fuzzy
+msgid "always use a MDC for encryption"
+msgstr "Verschl�sseln f�r diese User-ID"
+
+#: g10/g10.c:225
 msgid "do not make any changes"
 msgstr "Keine wirklichen �nderungen durchf�hren"
 
-#: g10/g10.c:237
+#: g10/g10.c:226
 msgid "batch mode: never ask"
 msgstr "Stapelmodus: Keine Abfragen"
 
-#: g10/g10.c:238
+#: g10/g10.c:227
 msgid "assume yes on most questions"
 msgstr "\"Ja\" als Standardantwort annehmen"
 
-#: g10/g10.c:239
+#: g10/g10.c:228
 msgid "assume no on most questions"
 msgstr "\"Nein\" als Standardantwort annehmen"
 
-#: g10/g10.c:240
+#: g10/g10.c:229
 msgid "add this keyring to the list of keyrings"
 msgstr "Als �ffentlichen Schl�sselbund mitbenutzen"
 
-#: g10/g10.c:241
+#: g10/g10.c:230
 msgid "add this secret keyring to the list"
 msgstr "Als geheimen Schl�sselbund mitbenutzen"
 
-#: g10/g10.c:242
+#: g10/g10.c:231
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|NAME als voreingestellten Schl�ssel benutzen"
 
-#: g10/g10.c:243
+#: g10/g10.c:232
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|diesen Schl�sselserver zur Suche verwenden"
 
-#: g10/g10.c:244
+#: g10/g10.c:233
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAME|Terminalzeichensatz NAME benutzen"
 
-#: g10/g10.c:245
+#: g10/g10.c:234
 msgid "read options from file"
 msgstr "Optionen aus der Datei lesen"
 
-#: g10/g10.c:247
+#: g10/g10.c:236
 msgid "set debugging flags"
 msgstr "Debug-Flags einschalten"
 
-#: g10/g10.c:248
+#: g10/g10.c:237
 msgid "enable full debugging"
 msgstr "Alle Debug-Flags einschalten"
 
-#: g10/g10.c:249
+#: g10/g10.c:238
 msgid "|FD|write status info to this FD"
 msgstr "|FD|Statusinfo auf FD (Dateihandle) ausgeben"
 
-#: g10/g10.c:250
+#: g10/g10.c:239
 msgid "do not write comment packets"
 msgstr "Keine Kommentarpakete schreiben"
 
-#: g10/g10.c:251
+#: g10/g10.c:240
 msgid "(default is 1)"
 msgstr "Ben�tigte Vollvertrauen (Voreinstellung 1)"
 
-#: g10/g10.c:252
+#: g10/g10.c:241
 msgid "(default is 3)"
 msgstr "Ben�tigte Teilvertrauen (Voreinstellung 3)"
 
-#: g10/g10.c:254
+#: g10/g10.c:243
 msgid "|FILE|load extension module FILE"
 msgstr "|FILE|Erweiterungsmodul DATEI laden"
 
-#: g10/g10.c:255
+#: g10/g10.c:244
 msgid "emulate the mode described in RFC1991"
 msgstr "Den in RFC1991 beschriebenen Modus nachahmen"
 
-#: g10/g10.c:256
+#: g10/g10.c:245
 msgid "|N|use passphrase mode N"
 msgstr "|N|Verwenden des Mantra-Modus N"
 
-#: g10/g10.c:258
+#: g10/g10.c:247
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAME|Das Hashverfahren NAME f�r Mantras benutzen"
 
-#: g10/g10.c:260
+#: g10/g10.c:249
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAME|Das Verschl�.verfahren NAME f�r Mantras benutzen"
 
-#: g10/g10.c:262
+#: g10/g10.c:250
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|Das Verschl�.verfahren NAME benutzen"
 
-#: g10/g10.c:263
+#: g10/g10.c:251
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|Das Hashverfahren NAME benutzen"
 
-#: g10/g10.c:264
+#: g10/g10.c:252
 msgid "|N|use compress algorithm N"
 msgstr "|N|Die Komprimierverfahren N benutzen"
 
-#: g10/g10.c:265
+#: g10/g10.c:253
 msgid "throw keyid field of encrypted packets"
 msgstr "entferne die Absender-ID verschl�sselter Pakete"
 
-#: g10/g10.c:273
+#: g10/g10.c:255
 msgid ""
 "@\n"
 "Examples:\n"
@@ -571,27 +581,15 @@ msgstr ""
 " --list-keys [Namen]        Schl�ssel anzeigen\n"
 " --fingerprint [Namen]      \"Fingerabdr�cke\" anzeigen\n"
 
-#: g10/g10.c:353
+#: g10/g10.c:323
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Berichte �ber Bugs (Programmfehler) bitte an <[email protected]>.\n"
 
-#: g10/g10.c:358
-msgid "Usage: gpgm [options] [files] (-h for help)"
-msgstr "Syntax: gpgm [Optionen] [Dateien] (-h f�r Hilfe)"
-
-#: g10/g10.c:360
+#: g10/g10.c:327
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Aufruf: gpg [Optionen] [Dateien] (-h f�r Hilfe)"
 
-#: g10/g10.c:365
-msgid ""
-"Syntax: gpgm [options] [files]\n"
-"GnuPG maintenance utility\n"
-msgstr ""
-"Syntax: gpgm [options] [files]\n"
-"GnuPG Wartungs-Hilfsprogramm\n"
-
-#: g10/g10.c:368
+#: g10/g10.c:330
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -601,7 +599,7 @@ msgstr ""
 "Signieren, pr�fen, verschl�sseln, entschl�sseln\n"
 "Die voreingestellte Operation ist abh�ngig von den Eingabedaten\n"
 
-#: g10/g10.c:374
+#: g10/g10.c:335
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -609,222 +607,218 @@ msgstr ""
 "\n"
 "Unterst�tzte Verfahren:\n"
 
-#: g10/g10.c:449
-msgid "usage: gpgm [options] "
-msgstr "Aufruf: gpgm [Optionen] "
-
-#: g10/g10.c:451
+#: g10/g10.c:409
 msgid "usage: gpg [options] "
 msgstr "Aufruf: gpg [Optionen] "
 
-#: g10/g10.c:492
+#: g10/g10.c:449
 msgid "conflicting commands\n"
 msgstr "Widerspr�chliche Befehle\n"
 
-#: g10/g10.c:631
+#: g10/g10.c:576
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n"
 
-#: g10/g10.c:635
+#: g10/g10.c:580
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "Optionendatei '%s': %s\n"
 
-#: g10/g10.c:642
+#: g10/g10.c:587
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Optionen werden aus '%s' gelesen\n"
 
-#: g10/g10.c:797
+#: g10/g10.c:731
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s ist kein g�ltiger Zeichensatz.\n"
 
-#: g10/g10.c:838 g10/g10.c:850
+#: g10/g10.c:774 g10/g10.c:786
 msgid "selected cipher algorithm is invalid\n"
 msgstr "Das ausgew�hlte Verschl�sslungsverfahren ist ung�ltig\n"
 
-#: g10/g10.c:844 g10/g10.c:856
+#: g10/g10.c:780 g10/g10.c:792
 msgid "selected digest algorithm is invalid\n"
 msgstr "Das ausgew�hlte Hashverfahren ist ung�ltig\n"
 
-#: g10/g10.c:859
+#: g10/g10.c:795
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "Das Komprimierverfahren mu� im Bereich %d bis %d liegen\n"
 
-#: g10/g10.c:861
+#: g10/g10.c:797
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed m�ssen gr��er als 0 sein\n"
 
-#: g10/g10.c:863
+#: g10/g10.c:799
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed m�ssen gr��er als 1 sein\n"
 
-#: g10/g10.c:865
+#: g10/g10.c:801
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth mu� im Bereich 1 bis 255 liegen\n"
 
-#: g10/g10.c:868
+#: g10/g10.c:804
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n"
 
-#: g10/g10.c:872
+#: g10/g10.c:808
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ung�ltiger \"simple S2K\"-Modus; Wert mu� 0, 1 oder 3 sein\n"
 
-#: g10/g10.c:949
+#: g10/g10.c:885
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
 
-#: g10/g10.c:955
+#: g10/g10.c:891
 msgid "--store [filename]"
 msgstr "--store [Dateiname]"
 
-#: g10/g10.c:963
+#: g10/g10.c:898
 msgid "--symmetric [filename]"
 msgstr "--symmetric [Dateiname]"
 
-#: g10/g10.c:971
+#: g10/g10.c:906
 msgid "--encrypt [filename]"
 msgstr "--encrypt [Dateiname]"
 
-#: g10/g10.c:984
+#: g10/g10.c:919
 msgid "--sign [filename]"
 msgstr "--sign [Dateiname]"
 
-#: g10/g10.c:997
+#: g10/g10.c:932
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [Dateiname]"
 
-#: g10/g10.c:1011
+#: g10/g10.c:946
 msgid "--clearsign [filename]"
 msgstr "--clearsign [Dateiname]"
 
-#: g10/g10.c:1023
+#: g10/g10.c:958
 msgid "--decrypt [filename]"
 msgstr "--decrypt [Dateiname]"
 
-#: g10/g10.c:1032
+#: g10/g10.c:967
 msgid "--edit-key username [commands]"
 msgstr "--edit-key Username [Befehle]"
 
-#: g10/g10.c:1048
+#: g10/g10.c:981
 msgid "--delete-secret-key username"
 msgstr "--delete-secret-key Username"
 
-#: g10/g10.c:1051
+#: g10/g10.c:984
 msgid "--delete-key username"
 msgstr "--delete-key Benutzername"
 
-#: g10/encode.c:229 g10/g10.c:1074 g10/sign.c:311
+#: g10/encode.c:234 g10/g10.c:1007 g10/sign.c:311
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "'%s' kann nicht ge�ffnet werden: %s\n"
 
-#: g10/g10.c:1085
+#: g10/g10.c:1018
 msgid "-k[v][v][v][c] [userid] [keyring]"
 msgstr "-k[v][v][v][c] [Benutzername] [Keyring]"
 
-#: g10/g10.c:1149
+#: g10/g10.c:1077
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "Entfernen der ASCII-H�lle ist fehlgeschlagen: %s\n"
 
-#: g10/g10.c:1157
+#: g10/g10.c:1085
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "Anbringen der ASCII-H�lle ist fehlgeschlagen: %s\n"
 
-#: g10/g10.c:1223
+#: g10/g10.c:1151
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "Ung�ltiges Hashverfahren '%s'\n"
 
-#: g10/g10.c:1302
+#: g10/g10.c:1226
 msgid "[filename]"
 msgstr "[Dateiname]"
 
-#: g10/g10.c:1306
+#: g10/g10.c:1230
 msgid "Go ahead and type your message ...\n"
 msgstr "Auf geht's - Botschaft eintippen ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1309 g10/verify.c:66
+#: g10/decrypt.c:59 g10/g10.c:1233 g10/verify.c:66
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "'%s' kann nicht ge�ffnet werden\n"
 
-#: g10/armor.c:297
+#: g10/armor.c:296
 #, c-format
 msgid "armor: %s\n"
 msgstr "ASCII-H�lle: %s\n"
 
-#: g10/armor.c:320
+#: g10/armor.c:319
 msgid "invalid armor header: "
 msgstr "Ung�ltige ASCII-H�lle"
 
-#: g10/armor.c:327
+#: g10/armor.c:326
 msgid "armor header: "
 msgstr "ASCII-H�lle: "
 
-#: g10/armor.c:338
+#: g10/armor.c:337
 msgid "invalid clearsig header\n"
 msgstr "Ung�ltige Klartextsignatur-Einleitung\n"
 
-#: g10/armor.c:390
+#: g10/armor.c:389
 msgid "nested clear text signatures\n"
 msgstr "verschachtelte Klartextunterschriften\n"
 
-#: g10/armor.c:499
+#: g10/armor.c:498
 msgid "invalid dash escaped line: "
 msgstr "Ung�ltige mit Bindestrich \"escapte\" Zeile: "
 
-#: g10/armor.c:511
+#: g10/armor.c:510
 msgid "unexpected armor:"
 msgstr "Unerwartete ASCII-H�lle:"
 
-#: g10/armor.c:628
+#: g10/armor.c:627
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "Ung�ltiges \"radix64\" Zeichen %02x ignoriert\n"
 
-#: g10/armor.c:671
+#: g10/armor.c:670
 msgid "premature eof (no CRC)\n"
 msgstr "vorzeitiges Dateiende (keine Pr�fsumme)\n"
 
-#: g10/armor.c:705
+#: g10/armor.c:704
 msgid "premature eof (in CRC)\n"
 msgstr "vorzeitiges Dateiende (innerhalb der Pr�fsumme)\n"
 
-#: g10/armor.c:709
+#: g10/armor.c:708
 msgid "malformed CRC\n"
 msgstr "Falsch aufgebaute Pr�fsumme\n"
 
-#: g10/armor.c:713
+#: g10/armor.c:712
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "Pr�fsummenfehler; %06lx - %06lx\n"
 
-#: g10/armor.c:730
+#: g10/armor.c:729
 msgid "premature eof (in Trailer)\n"
 msgstr "vorzeitiges Dateiende (im Nachsatz)\n"
 
-#: g10/armor.c:734
+#: g10/armor.c:733
 msgid "error in trailer line\n"
 msgstr "Fehler in der Nachsatzzeile\n"
 
-#: g10/armor.c:998
+#: g10/armor.c:997
 msgid "no valid OpenPGP data found.\n"
 msgstr "Keine g�ltigen OpenPGP-Daten gefunden.\n"
 
-#: g10/armor.c:1002
+#: g10/armor.c:1001
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "ung�ltige ASCII-H�lle: Zeile ist l�nger als %d Zeichen\n"
 
-#: g10/armor.c:1006
+#: g10/armor.c:1005
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -925,28 +919,33 @@ msgstr ""
 msgid "key %08lX: key has been revoked!\n"
 msgstr "Schl�ssel %08lX: Schl�ssel wurde widerrufen\n"
 
-#: g10/pkclist.c:287 g10/pkclist.c:391
+#: g10/pkclist.c:287 g10/pkclist.c:297 g10/pkclist.c:403
 msgid "Use this key anyway? "
 msgstr "Diesen Schl�ssel trotzdem benutzen?"
 
-#: g10/pkclist.c:311
+#: g10/pkclist.c:291
+#, fuzzy, c-format
+msgid "key %08lX: subkey has been revoked!\n"
+msgstr "Schl�ssel %08lX: Schl�ssel wurde widerrufen\n"
+
+#: g10/pkclist.c:321
 #, c-format
 msgid "%08lX: key has expired\n"
 msgstr "%08lX: Schl�ssel ist verfallen!\n"
 
-#: g10/pkclist.c:317
+#: g10/pkclist.c:327
 #, c-format
 msgid "%08lX: no info to calculate a trust probability\n"
 msgstr ""
 "%08lX: Keine Infos zur Berechnung der Vertrauenswahrscheinlichkeit "
 "vorgefunden\n"
 
-#: g10/pkclist.c:331
+#: g10/pkclist.c:341
 #, c-format
 msgid "%08lX: We do NOT trust this key\n"
 msgstr "%08lX: Wir haben KEIN Vertrauen zu diesem Schl�ssel!\n"
 
-#: g10/pkclist.c:337
+#: g10/pkclist.c:347
 #, c-format
 msgid ""
 "%08lX: It is not sure that this key really belongs to the owner\n"
@@ -955,18 +954,18 @@ msgstr ""
 "%08lX: Es ist nicht sicher, da� dieser Schl�ssel wirklich dem vorgeblichen\n"
 "Besitzer geh�rt, aber er wird trotzdem akzeptiert\n"
 
-#: g10/pkclist.c:343
+#: g10/pkclist.c:353
 msgid "This key probably belongs to the owner\n"
 msgstr ""
 "Dieser Schl�ssel geh�rt h�chstwahrscheinlich dem angegebenen Besitzer\n"
 
-#: g10/pkclist.c:348
+#: g10/pkclist.c:358
 msgid "This key belongs to us\n"
 msgstr ""
 "Dieser Schl�ssel geh�rt uns (da wir n�mlich den geheimen Schl�ssel dazu "
 "haben)\n"
 
-#: g10/pkclist.c:386
+#: g10/pkclist.c:398
 msgid ""
 "It is NOT certain that the key belongs to its owner.\n"
 "If you *really* know what you are doing, you may answer\n"
@@ -977,60 +976,65 @@ msgstr ""
 "Wenn Sie *wirklich* wissen, was Sie tun, k�nnen Sie die n�chste\n"
 "Frage mit ja beantworten\n"
 
-#: g10/pkclist.c:399
+#: g10/pkclist.c:411
 msgid "WARNING: Using untrusted key!\n"
 msgstr "WARNUNG: Ein Schl�ssel ohne gesichertes Vertrauen wird benutzt!\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:447
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "WARNUNG: Dieser Schl�ssel wurde von seinem Besitzer widerrufen!\n"
 
-#: g10/pkclist.c:436
+#: g10/pkclist.c:448
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "         Das k�nnte bedeuten, da� die Signatur gef�lscht ist.\n"
 
-#: g10/pkclist.c:457
+#: g10/pkclist.c:452
+#, fuzzy
+msgid "WARNING: This subkey has been revoked by its owner!\n"
+msgstr "WARNUNG: Dieser Schl�ssel wurde von seinem Besitzer widerrufen!\n"
+
+#: g10/pkclist.c:473
 msgid "Note: This key has expired!\n"
 msgstr "Hinweis: Dieser Schl�ssel ist verfallen!\n"
 
-#: g10/pkclist.c:464
+#: g10/pkclist.c:480
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "WARNUNG: Dieser Schl�ssel tr�gt keine vertrauensw�rdige Signatur!\n"
 
-#: g10/pkclist.c:466
+#: g10/pkclist.c:482
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         Es gibt keinen Hinweis, da� die Signatur wirklich dem vorgeblichen "
 "Besitzer geh�rt.\n"
 
-#: g10/pkclist.c:482
+#: g10/pkclist.c:498
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "WARNUNG: Wir haben KEIN Vertrauen zu diesem Schl�ssel!\n"
 
-#: g10/pkclist.c:483
+#: g10/pkclist.c:499
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Die Signatur ist wahrscheinlich eine F�LSCHUNG.\n"
 
-#: g10/pkclist.c:490
+#: g10/pkclist.c:506
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "WARNUNG: Dieser Schl�ssel ist nicht durch hinreichend vertrauensw�rdige "
 "Signaturen zertifiziert!\n"
 
-#: g10/pkclist.c:493
+#: g10/pkclist.c:509
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr ""
 "         Es ist nicht sicher, da� die Signatur wirklich dem vorgeblichen "
 "Besitzer geh�rt.\n"
 
-#: g10/pkclist.c:546 g10/pkclist.c:559 g10/pkclist.c:622 g10/pkclist.c:650
+#: g10/pkclist.c:562 g10/pkclist.c:575 g10/pkclist.c:638 g10/pkclist.c:666
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: �bersprungen: %s\n"
 
-#: g10/pkclist.c:568
+#: g10/pkclist.c:584
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1038,20 +1042,20 @@ msgstr ""
 "Sie gaben keine User-ID angegeben (Benutzen Sie die Option \"-r\").\n"
 "\n"
 
-#: g10/pkclist.c:573
+#: g10/pkclist.c:589
 msgid "Enter the user ID: "
 msgstr "Geben Sie die User-ID ein: "
 
-#: g10/pkclist.c:584
+#: g10/pkclist.c:600
 msgid "No such user ID.\n"
 msgstr "Keine solche User-ID vorhanden.\n"
 
-#: g10/pkclist.c:630
+#: g10/pkclist.c:646
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: Fehler beim Pr�fen des Schl�ssels: %s\n"
 
-#: g10/pkclist.c:656
+#: g10/pkclist.c:672
 msgid "no valid addressees\n"
 msgstr "Keine g�ltigen Adressaten\n"
 
@@ -1131,7 +1135,20 @@ msgstr "DSA erlaubt nur Schl�ssell�ngen von 512 bis 1024\n"
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "zu kurz; 768 ist die kleinste m�gliche Schl�ssell�nge.\n"
 
-#: g10/keygen.c:459
+#. It is ridiculous and an annoyance to use larger key sizes!
+#. * GnuPG can handle much larger sizes; but it takes an eternity
+#. * to create such a key (but less than the time the Sirius
+#. * Computer Corporation needs to process one of the usual
+#. * complaints) and {de,en}cryption although needs some time.
+#. * So, before you complain about this limitation, I suggest that
+#. * you start a discussion with Marvin about this theme and then
+#. * do whatever you want.
+#: g10/keygen.c:466
+#, fuzzy, c-format
+msgid "keysize too large; %d is largest value allowed.\n"
+msgstr "zu kurz; 768 ist die kleinste m�gliche Schl�ssell�nge.\n"
+
+#: g10/keygen.c:471
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1139,11 +1156,11 @@ msgstr ""
 "Schl�ssell�ngen gr��er als 2048 werden nicht empfohlen, da die\n"
 "Berechnungen dann WIRKLICH lange brauchen!\n"
 
-#: g10/keygen.c:462
+#: g10/keygen.c:474
 msgid "Are you sure that you want this keysize? "
 msgstr "Sind Sie sicher, da� Sie diese Schl�ssell�nge w�nschen? "
 
-#: g10/keygen.c:463
+#: g10/keygen.c:475
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1151,21 +1168,21 @@ msgstr ""
 "Gut, aber bitte denken Sie auch daran, da� Monitor und Tastatur Daten "
 "abstrahlen und diese leicht mitgelesen werden k�nnen.\n"
 
-#: g10/keygen.c:471
+#: g10/keygen.c:483
 msgid "Do you really need such a large keysize? "
 msgstr "Brauchen Sie wirklich einen derartig langen Schl�ssel? "
 
-#: g10/keygen.c:477
+#: g10/keygen.c:489
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Die verlangte Schl�ssell�nge betr�gt %u Bit\n"
 
-#: g10/keygen.c:480 g10/keygen.c:484
+#: g10/keygen.c:492 g10/keygen.c:496
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "aufgerundet auf %u Bit\n"
 
-#: g10/keygen.c:497
+#: g10/keygen.c:509
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1181,29 +1198,29 @@ msgstr ""
 "      <n>m = Schl�ssel verf�llt nach n Monaten\n"
 "      <n>y = Schl�ssel verf�llt nach n Jahren\n"
 
-#: g10/keygen.c:512
+#: g10/keygen.c:524
 msgid "Key is valid for? (0) "
 msgstr "Der Schl�ssel bleibt wie lange g�ltig? (0) "
 
-#: g10/keygen.c:523
+#: g10/keygen.c:535
 msgid "invalid value\n"
 msgstr "Ung�ltiger Wert.\n"
 
-#: g10/keygen.c:528
+#: g10/keygen.c:540
 msgid "Key does not expire at all\n"
 msgstr "Der Schl�ssel verf�llt nie.\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:534
+#: g10/keygen.c:546
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Der Schl�ssel verf�llt am %s\n"
 
-#: g10/keygen.c:540
+#: g10/keygen.c:552
 msgid "Is this correct (y/n)? "
 msgstr "Ist dies richtig? (j/n) "
 
-#: g10/keygen.c:583
+#: g10/keygen.c:595
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1219,44 +1236,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:594
+#: g10/keygen.c:606
 msgid "Real name: "
 msgstr "Ihr Name (\"Vorname Nachname\"): "
 
-#: g10/keygen.c:598
+#: g10/keygen.c:610
 msgid "Invalid character in name\n"
 msgstr "Ung�ltiges Zeichen im Namen\n"
 
-#: g10/keygen.c:600
+#: g10/keygen.c:612
 msgid "Name may not start with a digit\n"
 msgstr "Der Name darf nicht mit einer Ziffer beginnen.\n"
 
-#: g10/keygen.c:602
+#: g10/keygen.c:614
 msgid "Name must be at least 5 characters long\n"
 msgstr "Der Name mu� min. 5 Zeichen lang sein.\n"
 
-#: g10/keygen.c:610
+#: g10/keygen.c:622
 msgid "Email address: "
 msgstr "E-Mail-Adresse: "
 
-#: g10/keygen.c:621
+#: g10/keygen.c:633
 msgid "Not a valid email address\n"
 msgstr "Diese E-Mail-Adresse ist ung�ltig\n"
 
-#: g10/keygen.c:629
+#: g10/keygen.c:641
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:635
+#: g10/keygen.c:647
 msgid "Invalid character in comment\n"
 msgstr "Ung�ltiges Zeichen im Kommentar.\n"
 
-#: g10/keygen.c:657
+#: g10/keygen.c:669
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr ""
 
-#: g10/keygen.c:663
+#: g10/keygen.c:675
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1267,15 +1284,15 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:666
+#: g10/keygen.c:678
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeFfBb"
 
-#: g10/keygen.c:676
+#: g10/keygen.c:688
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "�ndern: (N)ame, (K)ommentar, (E)-Mail oder (F)ertig/(B)eenden? "
 
-#: g10/keygen.c:728
+#: g10/keygen.c:740
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1283,11 +1300,11 @@ msgstr ""
 "Sie ben�tigen ein Mantra, um den geheimen Schl�ssel zu sch�tzen.\n"
 "\n"
 
-#: g10/keyedit.c:421 g10/keygen.c:736
+#: g10/keyedit.c:433 g10/keygen.c:748
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "Mantra wurde nicht richtig wiederholt; noch einmal versuchen.\n"
 
-#: g10/keygen.c:742
+#: g10/keygen.c:754
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1300,46 +1317,46 @@ msgstr ""
 "aufrufen.\n"
 "\n"
 
-#: g10/keygen.c:763
+#: g10/keygen.c:775
 #, fuzzy
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
-"the disks) during the prime generation; this gives the random\n"
-"number generator a better chance to gain enough entropy.\n"
+"disks) during the prime generation; this gives the random number\n"
+"generator a better chance to gain enough entropy.\n"
 msgstr ""
 "Wir m��en eine ganze Menge Zufallszahlen erzeugen.  Sie k�nnen dies\n"
 "unterst�tzen, indem Sie z.B. in einem anderen Fenster/Konsole irgendetwas\n"
 "tippen oder irgendwelche anderen Programme benutzen.\n"
 
-#: g10/keygen.c:833
+#: g10/keygen.c:845
 msgid "Key generation can only be used in interactive mode\n"
 msgstr ""
 "Die Schl�sselerzeugung kann nur im interaktiven Modus benutzt werden.\n"
 
-#: g10/keygen.c:841
+#: g10/keygen.c:853
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "Der DSA Schl�ssel wird 1024 Bits haben.\n"
 
-#: g10/keygen.c:847
+#: g10/keygen.c:859
 msgid "Key generation cancelled.\n"
 msgstr "Schl�sselerzeugung abgebrochen.\n"
 
-#: g10/keygen.c:857
+#: g10/keygen.c:869
 #, c-format
 msgid "writing public certificate to `%s'\n"
 msgstr "schreiben des �ffentlichen Zertifikats nach '%s'\n"
 
-#: g10/keygen.c:858
+#: g10/keygen.c:870
 #, c-format
 msgid "writing secret certificate to `%s'\n"
 msgstr "schreiben des geheimen Zertifikats nach '%s'\n"
 
-#: g10/keygen.c:935
+#: g10/keygen.c:947
 msgid "public and secret key created and signed.\n"
 msgstr "�ffentlichen und geheimen Schl�ssel erzeugt und signiert.\n"
 
-#: g10/keygen.c:937
+#: g10/keygen.c:949
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1348,12 +1365,12 @@ msgstr ""
 "werden kann.  Sie k�nnen aber mit dem Befehl \"--edit-key\" einen\n"
 "Zweitschl�ssel f�r diesem Zweck erzeugen.\n"
 
-#: g10/keygen.c:951 g10/keygen.c:1050
+#: g10/keygen.c:963 g10/keygen.c:1062
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Schl�sselerzeugung fehlgeschlagen: %s\n"
 
-#: g10/keygen.c:995 g10/sig-check.c:212 g10/sign.c:52
+#: g10/keygen.c:1007 g10/sig-check.c:299 g10/sign.c:52
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1361,7 +1378,7 @@ msgstr ""
 "Der Schl�ssel wurde %lu Sekunde in der Zukunft erzeugt (Zeitreise oder Uhren "
 "stimmen nicht �berein)\n"
 
-#: g10/keygen.c:997 g10/sig-check.c:214 g10/sign.c:54
+#: g10/keygen.c:1009 g10/sig-check.c:301 g10/sign.c:54
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1369,32 +1386,37 @@ msgstr ""
 "Der Schl�ssel wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise oder "
 "Uhren stimmen nicht �berein)\n"
 
-#: g10/keygen.c:1028
+#: g10/keygen.c:1040
 msgid "Really create? "
 msgstr "Wirklich erzeugen? "
 
-#: g10/encode.c:90 g10/openfile.c:86 g10/openfile.c:174 g10/tdbio.c:467
-#: g10/tdbio.c:527
+#: g10/encode.c:91 g10/openfile.c:86 g10/openfile.c:174 g10/tdbio.c:467
+#: g10/tdbio.c:528
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: kann nicht ge�ffnet werden: %s\n"
 
-#: g10/encode.c:112
+#: g10/encode.c:113
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "Fehler beim Erzeugen des Mantras: %s\n"
 
-#: g10/encode.c:166 g10/encode.c:285
+#: g10/encode.c:167 g10/encode.c:290
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: WARNUNG: Leere Datei\n"
 
-#: g10/encode.c:235
+#: g10/encode.c:240
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "Lesen von '%s'\n"
 
-#: g10/encode.c:413
+#: g10/encode.c:435 g10/sign.c:346
+#, c-format
+msgid "WARNING: `%s' is an empty file\n"
+msgstr "WARNUNG: '%s' ist eine leere Datei.\n"
+
+#: g10/encode.c:605
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s verschl�sselt f�r: %s\n"
@@ -1426,7 +1448,7 @@ msgstr "zu viele Eintr�ge im pk-Lager - abgeschaltet\n"
 msgid "too many entries in unk cache - disabled\n"
 msgstr "zu viele Eintr�ge im unk-Lager - abgeschaltet\n"
 
-#: g10/getkey.c:1531 g10/getkey.c:1587
+#: g10/getkey.c:1535 g10/getkey.c:1591
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr ""
@@ -1452,326 +1474,335 @@ msgstr "%lu Schl�ssel bislang bearbeitet\n"
 msgid "read error: %s\n"
 msgstr "Lesefehler: %s\n"
 
-#: g10/import.c:174
+#: g10/import.c:175
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Anzahl insgesamt bearbeiteter Schl�ssel: %lu\n"
 
-#: g10/import.c:176
+#: g10/import.c:177
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         ohne User-ID: %lu\n"
 
-#: g10/import.c:178
+#: g10/import.c:179
 #, c-format
 msgid "              imported: %lu"
 msgstr "           importiert: %lu"
 
-#: g10/import.c:184
+#: g10/import.c:185
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "          unver�ndert: %lu\n"
 
-#: g10/import.c:186
+#: g10/import.c:187
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "        neue User-IDs: %lu\n"
 
-#: g10/import.c:188
+#: g10/import.c:189
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "  neue Unterschl�ssel: %lu\n"
 
-#: g10/import.c:190
+#: g10/import.c:191
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        neue Signaturen: %lu\n"
 
-#: g10/import.c:192
+#: g10/import.c:193
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "neue Schl�sselwiderrufe: %lu\n"
 
-#: g10/import.c:194
+#: g10/import.c:195
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr " gelesene geheime Schl.: %lu\n"
 
-#: g10/import.c:196
+#: g10/import.c:197
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "geheime Schl�ssel importiert: %lu\n"
 
-#: g10/import.c:198
+#: g10/import.c:199
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " unver�nderte geh.Schl.: %lu\n"
 
-#: g10/import.c:340 g10/import.c:532
+#: g10/import.c:342 g10/import.c:534
 #, c-format
 msgid "key %08lX: no user id\n"
 msgstr "Schl�ssel %08lX: Keine User-ID\n"
 
-#: g10/import.c:351
+#: g10/import.c:353
 #, c-format
 msgid "key %08lX: no valid user ids\n"
 msgstr "Schl�ssel %08lX: Keine g�ltigen User-IDs\n"
 
-#: g10/import.c:353
+#: g10/import.c:355
 msgid "this may be caused by a missing self-signature\n"
 msgstr "dies k�nnte durch fehlende Eigenbeglaubigung verursacht worden sein\n"
 
-#: g10/import.c:364 g10/import.c:600
+#: g10/import.c:366 g10/import.c:604
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "Schl�ssel %08lX: �ffentlicher Schl�ssel nicht gefunden: %s\n"
 
-#: g10/import.c:370
+#: g10/import.c:372
 msgid "no default public keyring\n"
 msgstr "Kein voreingestellter �ffentlicher Schl�sselbund\n"
 
-#: g10/import.c:374 g10/openfile.c:115 g10/sign.c:215 g10/sign.c:498
+#: g10/import.c:376 g10/openfile.c:115 g10/sign.c:215 g10/sign.c:501
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "Schreiben nach '%s'\n"
 
-#: g10/import.c:378 g10/import.c:438 g10/import.c:654
+#: g10/import.c:380 g10/import.c:440 g10/import.c:658
 #, c-format
 msgid "can't lock public keyring: %s\n"
 msgstr "kann �ffentlichen Schl�sselbund nicht sperren: %s\n"
 
-#: g10/import.c:381
+#: g10/import.c:383
 #, c-format
 msgid "can't write to keyring: %s\n"
 msgstr "kann Schl�sselbund nicht schreiben: %s\n"
 
-#: g10/import.c:385
+#: g10/import.c:387
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "Schl�ssel %08lX: �ffentlicher Schl�ssel importiert\n"
 
-#: g10/import.c:398
+#: g10/import.c:400
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "Schl�ssel %08lX: Stimmt nicht mit unserer Kopie �berein\n"
 
-#: g10/import.c:411 g10/import.c:609
+#: g10/import.c:413 g10/import.c:613
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr ""
 "Schl�ssel %08lX: der lokale originale Schl�sselblocks wurde nicht gefunden: "
 "%s\n"
 
-#: g10/import.c:418 g10/import.c:616
+#: g10/import.c:420 g10/import.c:620
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr ""
 "Schl�ssel %08lX: Lesefehler im lokalen originalen Schl�sselblocks: %s\n"
 
-#: g10/import.c:435 g10/import.c:547 g10/import.c:651
+#: g10/import.c:437 g10/import.c:549 g10/import.c:655
 msgid "writing keyblock\n"
 msgstr "Schreiben des Schl�sselblocks\n"
 
-#: g10/import.c:441 g10/import.c:657
+#: g10/import.c:443 g10/import.c:661
 #, c-format
 msgid "can't write keyblock: %s\n"
 msgstr "Der Schl�sselblock kann nicht geschrieben werden: %s\n"
 
-#: g10/import.c:446
+#: g10/import.c:448
 #, c-format
 msgid "key %08lX: 1 new user-id\n"
 msgstr "Schl�ssel %08lX: 1 neue User-ID\n"
 
-#: g10/import.c:449
+#: g10/import.c:451
 #, c-format
 msgid "key %08lX: %d new user-ids\n"
 msgstr "Schl�ssel %08lX: %d neue User-IDs\n"
 
-#: g10/import.c:452
+#: g10/import.c:454
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "Schl�ssel %08lX: 1 neue Signatur\n"
 
-#: g10/import.c:455
+#: g10/import.c:457
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "Schl�ssel %08lX: %d neue Signaturen\n"
 
-#: g10/import.c:458
+#: g10/import.c:460
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "Schl�ssel %08lX: 1 neuer Unterschl�ssel\n"
 
-#: g10/import.c:461
+#: g10/import.c:463
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "Schl�ssel %08lX: %d neue Unterschl�ssel\n"
 
-#: g10/import.c:471
+#: g10/import.c:473
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "Schl�ssel %08lX: Nicht ge�ndert\n"
 
-#: g10/import.c:550
+#: g10/import.c:552
 #, c-format
 msgid "can't lock secret keyring: %s\n"
 msgstr "kann geheimen Schl�sselbund nicht sperren: %s\n"
 
-#: g10/import.c:553
+#: g10/import.c:555
 #, c-format
 msgid "can't write keyring: %s\n"
 msgstr "kann Schl�sselbund nicht schreiben: %s\n"
 
-#. we are ready
-#: g10/import.c:556
+#: g10/import.c:559
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "Schl�ssel %08lX: Geheimer Schl�ssel importiert\n"
 
 #. we can't merge secret keys
-#: g10/import.c:560
+#: g10/import.c:564
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "Schl�ssel %08lX: Ist bereits im geheimen Schl�sselbund\n"
 
-#: g10/import.c:565
+#: g10/import.c:569
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "Schl�ssel %08lX: geheimer Schl�ssel nicht gefunden: %s\n"
 
-#: g10/import.c:594
+#: g10/import.c:598
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "Schl�ssel %08lX: Kein �ffentlicher Schl�ssel - der Schl�sselwiderruf kann "
 "nicht angebracht werden\n"
 
-#: g10/import.c:627
+#: g10/import.c:631
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "Schl�ssel %08lX: Ung�ltiges Widerrufzertifikat: %s - zur�ckgewiesen\n"
 
-#: g10/import.c:661
+#: g10/import.c:665
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "Schl�ssel %08lX: Widerrufzertifikat importiert\n"
 
-#: g10/import.c:695
+#: g10/import.c:699
 #, c-format
 msgid "key %08lX: no user-id for signature\n"
 msgstr "Schl�ssel %08lX: Keine User-ID f�r Signatur\n"
 
-#: g10/import.c:702 g10/import.c:727
+#: g10/import.c:706 g10/import.c:731
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "Schl�ssel %08lX: Nicht unterst�tzetes Public-Key-Verfahren\n"
 
-#: g10/import.c:703
+#: g10/import.c:707
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "Schl�ssel %08lX: Ung�ltige Eigenbeglaubigung\n"
 
-#: g10/import.c:719
+#: g10/import.c:723
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "Schl�ssel %08lX: Kein Unterschl�ssel f�r die Schl�sselanbindung\n"
 
-#: g10/import.c:728
+#: g10/import.c:732
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "Schl�ssel %08lX: Ung�ltige Unterschl�ssel-Anbindung\n"
 
-#: g10/import.c:760
+#: g10/import.c:764
 #, c-format
 msgid "key %08lX: skipped userid '"
 msgstr "Schl�ssel %08lX: �bergehe User-ID '"
 
-#: g10/import.c:780
+#: g10/import.c:787
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "Schl�ssel %08lX: Unterschl�ssel ignoriert\n"
 
-#: g10/import.c:800
+#. here we violate the rfc a bit by still allowing
+#. * to import non-exportable signature when we have the
+#. * the secret key used to create this signature - it
+#. * seems that this makes sense
+#: g10/import.c:812
 #, fuzzy, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "Schl�ssel %08lX: Widerrufzertifikat an falschem Platz - �bergangen\n"
 
-#: g10/import.c:809
+#: g10/import.c:821
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "Schl�ssel %08lX: Widerrufzertifikat an falschem Platz - �bergangen\n"
 
-#: g10/import.c:817
+#: g10/import.c:829
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "Schl�ssel %08lX: Ung�ltiges Widerrufzertifikat: %s - �bergangen\n"
 
-#: g10/import.c:878
+#: g10/import.c:890
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "Schl�ssel %08lX: Widerrufzertifikat hinzugef�gt\n"
 
-#: g10/import.c:992 g10/import.c:1047
+#: g10/import.c:1008 g10/import.c:1063
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "Schl�ssel %08lX: Unsere Kopie hat keine Eigenbeglaubigung\n"
 
-#: g10/keyedit.c:88
+#: g10/keyedit.c:91
 #, c-format
 msgid "%s: user not found\n"
 msgstr "%s: Benutzer nicht gefunden\n"
 
-#: g10/keyedit.c:171
+#: g10/keyedit.c:177
+msgid "[revocation]"
+msgstr ""
+
+#: g10/keyedit.c:178
 msgid "[self-signature]"
 msgstr "[Eigenbeglaubigung]"
 
-#: g10/keyedit.c:189
+#: g10/keyedit.c:196
 msgid "1 bad signature\n"
 msgstr "%d schlechte Signaturen\n"
 
-#: g10/keyedit.c:191
+#: g10/keyedit.c:198
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d falsche Beglaubigungen\n"
 
-#: g10/keyedit.c:193
+#: g10/keyedit.c:200
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 Beglaubigung wegen fehlendem Schl�ssel nicht gepr�ft\n"
 
-#: g10/keyedit.c:195
+#: g10/keyedit.c:202
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d Beglaubigungen wegen fehlenden Schl�sseln nicht gepr�ft\n"
 
-#: g10/keyedit.c:197
+#: g10/keyedit.c:204
 msgid "1 signature not checked due to an error\n"
 msgstr "1 Beglaubigung aufgrund von Fehler nicht gepr�ft\n"
 
-#: g10/keyedit.c:199
+#: g10/keyedit.c:206
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d Beglaubigungen aufgrund von Fehlern nicht gepr�ft\n"
 
-#: g10/keyedit.c:201
+#: g10/keyedit.c:208
 msgid "1 user id without valid self-signature detected\n"
 msgstr "Eine User-ID ohne g�ltige Eigenbeglaubigung entdeckt\n"
 
-#: g10/keyedit.c:203
+#: g10/keyedit.c:210
 #, c-format
 msgid "%d user ids without valid self-signatures detected\n"
 msgstr "%d User-IDs ohne g�ltige Eigenbeglaubigung entdeckt\n"
 
-#: g10/keyedit.c:281
+#. Fixme: see whether there is a revocation in which
+#. * case we should allow to sign it again.
+#: g10/keyedit.c:290
 #, c-format
 msgid "Already signed by key %08lX\n"
 msgstr "Ist bereits durch Schl�ssel %08lX beglaubigt.\n"
 
-#: g10/keyedit.c:289
+#: g10/keyedit.c:298
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Nichts zu beglaubigen f�r Schl�ssel %08lX\n"
 
-#: g10/keyedit.c:298
+#: g10/keyedit.c:307
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -1779,35 +1810,35 @@ msgstr ""
 "Sind Sie wirklich sicher, da� Sie vorstehenden Schl�ssel mit Ihrem\n"
 "Schl�ssel beglaubigen wollen: \""
 
-#: g10/keyedit.c:307
+#: g10/keyedit.c:316
 msgid ""
 "The signature will be marked as non-exportable.\n"
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:309
+#: g10/keyedit.c:321
 msgid "Really sign? "
 msgstr "Wirklich unterschreiben? "
 
-#: g10/keyedit.c:335 g10/sign.c:75
+#: g10/keyedit.c:347 g10/keyedit.c:1684 g10/keyedit.c:1733 g10/sign.c:75
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Beglaubigung fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:388
+#: g10/keyedit.c:400
 msgid "This key is not protected.\n"
 msgstr "Dieser Schl�ssel ist nicht gesch�tzt.\n"
 
-#: g10/keyedit.c:391
+#: g10/keyedit.c:403
 msgid "Key is protected.\n"
 msgstr "Schl�ssel ist gesch�tzt.\n"
 
-#: g10/keyedit.c:408
+#: g10/keyedit.c:420
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Dieser Schl�ssel kann nicht editiert werden: %s\n"
 
-#: g10/keyedit.c:413
+#: g10/keyedit.c:425
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -1815,7 +1846,7 @@ msgstr ""
 "Geben Sie das neue Mantra f�r diesen geheimen Schl�ssel ein.\n"
 "\n"
 
-#: g10/keyedit.c:425
+#: g10/keyedit.c:437
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -1823,381 +1854,452 @@ msgstr ""
 "Sie wollen kein Mantra - dies ist bestimmt *keine* gute Idee!\n"
 "\n"
 
-#: g10/keyedit.c:428
+#: g10/keyedit.c:440
 msgid "Do you really want to do this? "
 msgstr "M�chten Sie dies wirklich tun? "
 
-#: g10/keyedit.c:487
+#: g10/keyedit.c:499
 msgid "moving a key signature to the correct place\n"
 msgstr "schiebe eine Beglaubigung an die richtige Stelle\n"
 
-#: g10/keyedit.c:523
+#: g10/keyedit.c:535
 msgid "quit"
 msgstr "quit"
 
-#: g10/keyedit.c:523
+#: g10/keyedit.c:535
 msgid "quit this menu"
 msgstr "Men� verlassen"
 
-#: g10/keyedit.c:524
+#: g10/keyedit.c:536
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:525
+#: g10/keyedit.c:537
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:525
+#: g10/keyedit.c:537
 msgid "save and quit"
 msgstr "speichern und Men� verlassen"
 
-#: g10/keyedit.c:526
+#: g10/keyedit.c:538
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:526
+#: g10/keyedit.c:538
 msgid "show this help"
 msgstr "Diese Hilfe zeigen"
 
-#: g10/keyedit.c:528
+#: g10/keyedit.c:540
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:528
+#: g10/keyedit.c:540
 msgid "show fingerprint"
 msgstr "\"Fingerabdruck\" anzeigen"
 
-#: g10/keyedit.c:529
+#: g10/keyedit.c:541
 msgid "list"
 msgstr "Liste der Schl�ssel"
 
-#: g10/keyedit.c:529
+#: g10/keyedit.c:541
 msgid "list key and user ids"
 msgstr "Schl�ssel und User-ID auflisten"
 
-#: g10/keyedit.c:530
+#: g10/keyedit.c:542
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:531
+#: g10/keyedit.c:543
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:531
+#: g10/keyedit.c:543
 msgid "select user id N"
 msgstr "User-ID N ausw�hlen"
 
-#: g10/keyedit.c:532
+#: g10/keyedit.c:544
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:532
+#: g10/keyedit.c:544
 msgid "select secondary key N"
 msgstr "Zweitschl�ssel N ausw�hlen"
 
-#: g10/keyedit.c:533
+#: g10/keyedit.c:545
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:533
+#: g10/keyedit.c:545
 msgid "list signatures"
 msgstr "Liste der Signaturen"
 
-#: g10/keyedit.c:534
+#: g10/keyedit.c:546
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:535
+#: g10/keyedit.c:547
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:535
+#: g10/keyedit.c:547
 msgid "sign the key"
 msgstr "Den Schl�ssel signieren"
 
-#: g10/keyedit.c:536
+#: g10/keyedit.c:548
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:537
+#: g10/keyedit.c:549
 #, fuzzy
 msgid "lsign"
 msgstr "sign"
 
-#: g10/keyedit.c:537
+#: g10/keyedit.c:549
 #, fuzzy
 msgid "sign the key locally"
 msgstr "Den Schl�ssel signieren"
 
-#: g10/keyedit.c:538
+#: g10/keyedit.c:550
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:539
+#: g10/keyedit.c:551
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:539
+#: g10/keyedit.c:551
 msgid "add a user id"
 msgstr "Eine User-ID hinzuf�gen"
 
-#: g10/keyedit.c:540
+#: g10/keyedit.c:552
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:540
+#: g10/keyedit.c:552
 msgid "delete user id"
 msgstr "User-ID entfernen"
 
-#: g10/keyedit.c:541
+#: g10/keyedit.c:553
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:541
+#: g10/keyedit.c:553
 msgid "add a secondary key"
 msgstr "Einen Zweitschl�ssel hinzuf�gen"
 
-#: g10/keyedit.c:542
+#: g10/keyedit.c:554
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:542
+#: g10/keyedit.c:554
 msgid "delete a secondary key"
 msgstr "Einen Zweitschl�ssel entfernen"
 
-#: g10/keyedit.c:543
+#: g10/keyedit.c:555
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:543
+#: g10/keyedit.c:555
 msgid "change the expire date"
 msgstr "�ndern des Verfallsdatums"
 
-#: g10/keyedit.c:544
+#: g10/keyedit.c:556
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:544
+#: g10/keyedit.c:556
 msgid "toggle between secret and public key listing"
 msgstr "Umschalten zwischen Anzeige geheimer und �ffentlicher Schl�ssel"
 
-#: g10/keyedit.c:546
+#: g10/keyedit.c:558
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:547
+#: g10/keyedit.c:559
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:547
+#: g10/keyedit.c:559
 msgid "list preferences"
 msgstr "Liste der Voreinstellungen"
 
-#: g10/keyedit.c:548
+#: g10/keyedit.c:560
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:548
+#: g10/keyedit.c:560
 msgid "change the passphrase"
 msgstr "Das Mantra �ndern"
 
-#: g10/keyedit.c:549
+#: g10/keyedit.c:561
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:549
+#: g10/keyedit.c:561
 msgid "change the ownertrust"
 msgstr "Den \"Owner trust\" �ndern"
 
-#: g10/keyedit.c:568
+#: g10/keyedit.c:562
+#, fuzzy
+msgid "revsig"
+msgstr "sign"
+
+#: g10/keyedit.c:562
+#, fuzzy
+msgid "revoke signatures"
+msgstr "v3 Signaturen erzwingen"
+
+#: g10/keyedit.c:563
+#, fuzzy
+msgid "revkey"
+msgstr "key"
+
+#: g10/keyedit.c:563
+#, fuzzy
+msgid "revoke a secondary key"
+msgstr "Einen Zweitschl�ssel entfernen"
+
+#: g10/keyedit.c:582
 msgid "can't do that in batchmode\n"
 msgstr "Dies kann im Batchmodus nicht durchgef�hrt werden.\n"
 
 #. check that they match
 #. FIXME: check that they both match
-#: g10/keyedit.c:595
+#: g10/keyedit.c:609
 msgid "Secret key is available.\n"
 msgstr "Geheimer Schl�ssel ist vorhanden.\n"
 
-#: g10/keyedit.c:624
+#: g10/keyedit.c:638
 msgid "Command> "
 msgstr "Befehl> "
 
-#: g10/keyedit.c:651
+#: g10/keyedit.c:665
 msgid "Need the secret key to do this.\n"
 msgstr "Hierzu wird der geheime Schl�ssel ben�tigt.\n"
 
-#: g10/keyedit.c:673
+#: g10/keyedit.c:687
 msgid "Save changes? "
 msgstr "�nderungen speichern? "
 
-#: g10/keyedit.c:676
+#: g10/keyedit.c:690
 msgid "Quit without saving? "
 msgstr "Beenden ohne zu speichern? "
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:700
 #, c-format
 msgid "update failed: %s\n"
 msgstr "�nderung fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:693
+#: g10/keyedit.c:707
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "�nderung des Geheimnisses fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:700
+#: g10/keyedit.c:714
 msgid "Key not changed so no update needed.\n"
 msgstr "Schl�ssel ist nicht ge�ndert worden, also ist kein Speichern n�tig.\n"
 
-#: g10/keyedit.c:703 g10/keyedit.c:762
+#: g10/keyedit.c:717 g10/keyedit.c:776
 #, c-format
 msgid "update of trustdb failed: %s\n"
 msgstr "�nderung der \"Trust-DB\" fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:736
+#: g10/keyedit.c:750
 msgid "Really sign all user ids? "
 msgstr "Wirklich alle User-IDs beglaubigen? "
 
-#: g10/keyedit.c:737
+#: g10/keyedit.c:751
 msgid "Hint: Select the user ids to sign\n"
 msgstr "Tip: W�hlen Sie die User-ID, die beglaubigt werden soll\n"
 
-#: g10/keyedit.c:773
+#: g10/keyedit.c:787
 msgid "You must select at least one user id.\n"
 msgstr "Zumindestens eine User-ID mu� ausgew�hlt werden.\n"
 
-#: g10/keyedit.c:775
+#: g10/keyedit.c:789
 msgid "You can't delete the last user id!\n"
 msgstr "Die letzte User-ID kann nicht gel�scht werden!\n"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:792
 msgid "Really remove all selected user ids? "
 msgstr "M�chten Sie alle ausgew�hlten User-IDs wirklich entfernen? "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:793
 msgid "Really remove this user id? "
 msgstr "Diese User-ID wirklich entfernen? "
 
-#: g10/keyedit.c:802
+#: g10/keyedit.c:816 g10/keyedit.c:838
 msgid "You must select at least one key.\n"
 msgstr "Zumindestens ein Schl�ssel mu� ausgew�hlt werden.\n"
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:820
 msgid "Do you really want to delete the selected keys? "
 msgstr "M�chten Sie die ausgew�hlten Schl�ssel wirklich entfernen? "
 
-#: g10/keyedit.c:807
+#: g10/keyedit.c:821
 msgid "Do you really want to delete this key? "
 msgstr "M�chten Sie diesen Schl�ssel wirklich entfernen? "
 
-#: g10/keyedit.c:854
+#: g10/keyedit.c:842
+#, fuzzy
+msgid "Do you really want to revoke the selected keys? "
+msgstr "M�chten Sie die ausgew�hlten Schl�ssel wirklich entfernen? "
+
+#: g10/keyedit.c:843
+#, fuzzy
+msgid "Do you really want to revoke this key? "
+msgstr "M�chten Sie diesen Schl�ssel wirklich entfernen? "
+
+#: g10/keyedit.c:897
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ung�ltiger Befehl (versuchen Sie's mal mit \"help\")\n"
 
-#: g10/keyedit.c:1232
+#: g10/keyedit.c:1289
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Bitte entfernen Sie die Auswahl von den geheimen Schl�sseln.\n"
 
-#: g10/keyedit.c:1238
+#: g10/keyedit.c:1295
 msgid "Please select at most one secondary key.\n"
 msgstr "Bitte w�hlen Sie h�chstens einen Zweitschl�ssel aus.\n"
 
-#: g10/keyedit.c:1242
+#: g10/keyedit.c:1299
 msgid "Changing exiration time for a secondary key.\n"
 msgstr "�ndern des Verfallsdatums des Zweitschl�ssels.\n"
 
-#: g10/keyedit.c:1244
+#: g10/keyedit.c:1301
 msgid "Changing exiration time for the primary key.\n"
 msgstr "�ndern des Verfallsdatums des Hauptschl�ssels.\n"
 
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1342
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Sie k�nnen das Verfallsdatum eines v3-Schl�ssels nicht �ndern\n"
 
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1358
 msgid "No corresponding signature in secret ring\n"
 msgstr "Keine entsprechende Signatur im geheimen Schl�sselbund\n"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1418
 #, c-format
 msgid "No user id with index %d\n"
 msgstr "Keine User-ID mit Index %d\n"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1464
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Kein Zweitschl�ssel mit Index %d\n"
 
-#: g10/mainproc.c:184
+#: g10/keyedit.c:1562
+#, fuzzy
+msgid "user ID: \""
+msgstr "Geben Sie die User-ID ein: "
+
+#: g10/keyedit.c:1565
+#, fuzzy, c-format
+msgid ""
+"\"\n"
+"signed with your key %08lX at %s\n"
+msgstr "Nichts zu beglaubigen f�r Schl�ssel %08lX\n"
+
+#: g10/keyedit.c:1569
+#, fuzzy
+msgid "Create a revocation certificate for this signature? (y/N)"
+msgstr "Ein Schl�sselwiderruf-Zertifikat erzeugen"
+
+#: g10/keyedit.c:1649
+#, fuzzy
+msgid "Really create the revocation certificates? (y/N)"
+msgstr "Ein Schl�sselwiderruf-Zertifikat erzeugen"
+
+#: g10/keyedit.c:1672
+#, fuzzy
+msgid "no secret key\n"
+msgstr "Falscher geheimer Schl�ssel"
+
+#: g10/mainproc.c:185
 #, fuzzy, c-format
 msgid "public key is %08lX\n"
 msgstr "�ffentlicher Schl�ssel nicht gefunden"
 
-#: g10/mainproc.c:212
+#: g10/mainproc.c:213
 msgid "public key encrypted data: good DEK\n"
 msgstr "Mit �ffentlichem Sch�ssel verschl�sselte Daten: Korrekte DEK\n"
 
 #. fixme: defer this message until we have parsed all packets of
 #. * this type - do this by building a list of keys with their stati
-#. * and store it with the conetxt.  do_proc_packets can then use
+#. * and store it with the context.  do_proc_packets can then use
 #. * this list to display some information
-#: g10/mainproc.c:219
+#: g10/mainproc.c:220
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "Entschl�sselung mit �ffentlichem Schl�ssel fehlgeschlagen: %s\n"
 
-#: g10/mainproc.c:246
+#: g10/mainproc.c:249
 msgid "decryption okay\n"
 msgstr "Enschl�sselung fehlgeschlagen: %s\n"
 
-#: g10/mainproc.c:249
+#: g10/mainproc.c:253
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "Enschl�sselung fehlgeschlagen: %s\n"
 
-#: g10/mainproc.c:266
+#: g10/mainproc.c:270
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr ""
 "Hinweis: Der Absender verlangte Vertraulichkeit(\"for-your-eyes-only\")\n"
 
-#: g10/mainproc.c:268
+#: g10/mainproc.c:272
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "Urspr�nglicher Dateiname='%.*s'\n"
 
-#: g10/mainproc.c:849
+#: g10/mainproc.c:876
 msgid "signature verification suppressed\n"
 msgstr "Unterschriften-�berpr�fung unterdr�ckt\n"
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen mu� "ID" rein :-(
-#: g10/mainproc.c:855
+#: g10/mainproc.c:883
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Unterschrift vom %.*s, %s Schl�ssel ID %08lX\n"
 
+#: g10/mainproc.c:895
+#, fuzzy
+msgid "encrypted message is valid\n"
+msgstr "Das ausgew�hlte Hashverfahren ist ung�ltig\n"
+
+#: g10/mainproc.c:899
+msgid "WARNING: encrypted message has been manipulated!\n"
+msgstr ""
+
+#: g10/mainproc.c:904
+#, fuzzy, c-format
+msgid "Can't check MDC: %s\n"
+msgstr "Unterschrift kann nicht gepr�ft werden: %s\n"
+
 #. just in case that we have no userid
-#: g10/mainproc.c:881 g10/mainproc.c:892
+#: g10/mainproc.c:925 g10/mainproc.c:936
 msgid "BAD signature from \""
 msgstr "FALSCHE Unterschrift von \""
 
-#: g10/mainproc.c:882 g10/mainproc.c:893
+#: g10/mainproc.c:926 g10/mainproc.c:937
 msgid "Good signature from \""
 msgstr "Korrekte Unterschrift von \""
 
-#: g10/mainproc.c:884
+#: g10/mainproc.c:928
 msgid "                aka \""
 msgstr "                    alias \""
 
-#: g10/mainproc.c:930
+#: g10/mainproc.c:974
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Unterschrift kann nicht gepr�ft werden: %s\n"
 
-#: g10/mainproc.c:1003
+#: g10/mainproc.c:1047
 msgid "old style (PGP 2.x) signature\n"
 msgstr "Unterschrift nach alter (PGP 2.x) Art\n"
 
-#: g10/mainproc.c:1008
+#: g10/mainproc.c:1052
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "ung�ltiges root-Paket in proc_tree() entdeckt\n"
 
@@ -2222,7 +2324,7 @@ msgstr ""
 "RSA Schl�ssel sind nicht erw�nscht; bitte denken Sie dar�ber nach, einen\n"
 "neuen Schl�ssel zu erzeugen und diesen in Zukunft zu benutzen\n"
 
-#: g10/misc.c:235
+#: g10/misc.c:236
 msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr ""
 "Diees Verschl�sselungsmethode taugt nicht mehr viel; verwenden Sie eine "
@@ -2238,7 +2340,7 @@ msgstr "dieses Public-Key Verfahren %d kann nicht benutzt werden\n"
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "Im Unterpaket des Typs %d ist das \"critical bit\" gesetzt\n"
 
-#: g10/passphrase.c:151
+#: g10/passphrase.c:157
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2248,21 +2350,21 @@ msgstr ""
 "Sie ben�tigen ein Mantra, um den geheimen Schl�ssel zu entsperren.\n"
 "Benutzer: \""
 
-#: g10/passphrase.c:160
+#: g10/passphrase.c:166
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "%u-Bit %s Schl�ssel, ID %08lX, erzeugt %s"
 
-#: g10/passphrase.c:165
+#: g10/passphrase.c:171
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (Hauptschl�ssel-ID %08lX)"
 
-#: g10/passphrase.c:184
+#: g10/passphrase.c:190
 msgid "Enter passphrase: "
 msgstr "Geben Sie das Mantra ein: "
 
-#: g10/passphrase.c:188
+#: g10/passphrase.c:194
 msgid "Repeat passphrase: "
 msgstr "Geben Sie das Mantra nochmal ein: "
 
@@ -2302,46 +2404,52 @@ msgstr "alte Kodierung des DEK wird nicht unterst�tzt\n"
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr "Hinweis: Verfahren %d ist kein bevorzugtes Verschl�sselungsverfahren\n"
 
-#: g10/seckey-cert.c:57
+#: g10/seckey-cert.c:55
 #, c-format
 msgid "protection algorithm %d is not supported\n"
 msgstr "Schutzverfahren %d wird nicht unterst�tzt\n"
 
-#: g10/seckey-cert.c:177
+#: g10/seckey-cert.c:171
 msgid "Invalid passphrase; please try again ...\n"
 msgstr "Ung�ltiges Mantra; versuchen Sie's doch noch einmal ...\n"
 
-#: g10/seckey-cert.c:232
+#: g10/seckey-cert.c:227
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "WARNUNG: Unsicherer Schl�ssel entdeckt -\n"
 "         bitte Mantra nochmals wechseln.\n"
 
-#: g10/sig-check.c:195
+#: g10/sig-check.c:186
+#, fuzzy
+msgid "assuming bad MDC due to an unknown critical bit\n"
+msgstr ""
+"Vermutlich eine FALSCHE Unterschrift, wegen unbekanntem \"critical bit\"\n"
+
+#: g10/sig-check.c:282
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "Dieser durch PGP erzeugte ElGamal-Schl�ssel ist f�r Signaturen NICHT sicher "
 "genug!\n"
 
-#: g10/sig-check.c:203
+#: g10/sig-check.c:290
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr ""
 "�ffentlicher Schl�ssel ist um %lu Sekunde j�nger als die Unterschrift\n"
 
-#: g10/sig-check.c:204
+#: g10/sig-check.c:291
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr ""
 "�ffentlicher Schl�ssel ist um %lu Sekunden j�nger als die Unterschrift\n"
 
-#: g10/sig-check.c:220
+#: g10/sig-check.c:307
 #, c-format
 msgid "NOTE: signature key expired %s\n"
 msgstr "Hinweis: Schl�ssel der Signatur ist verfallen am %s.\n"
 
-#: g10/sig-check.c:277
+#: g10/sig-check.c:364
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 "Vermutlich eine FALSCHE Unterschrift, wegen unbekanntem \"critical bit\"\n"
@@ -2351,7 +2459,7 @@ msgstr ""
 msgid "%s signature from: %s\n"
 msgstr "%s Unterschrift von: %s\n"
 
-#: g10/sign.c:210 g10/sign.c:493
+#: g10/sign.c:210 g10/sign.c:496
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "%s kann nicht erzeugt werden: %s\n"
@@ -2360,11 +2468,6 @@ msgstr "%s kann nicht erzeugt werden: %s\n"
 msgid "signing:"
 msgstr "unterschreibe:"
 
-#: g10/sign.c:346
-#, c-format
-msgid "WARNING: `%s' is an empty file\n"
-msgstr "WARNUNG: '%s' ist eine leere Datei.\n"
-
 #: g10/textfilter.c:122
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
@@ -2375,12 +2478,12 @@ msgstr "Textzeilen l�nger als %d Zeichen k�nnen nicht benutzt werden\n"
 msgid "input line longer than %d characters\n"
 msgstr "ung�ltige ASCII-H�lle: Zeile ist l�nger als %d Zeichen\n"
 
-#: g10/tdbio.c:116 g10/tdbio.c:1504
+#: g10/tdbio.c:116 g10/tdbio.c:1505
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "trustdb Satz %lu: lseek fehlgeschlagen: %s\n"
 
-#: g10/tdbio.c:122 g10/tdbio.c:1511
+#: g10/tdbio.c:122 g10/tdbio.c:1512
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "trustdb Satz %lu: write fehlgeschlagen (n=%d): %s\n"
@@ -2409,12 +2512,12 @@ msgstr "%s: Verzeichnis erzeugt\n"
 msgid "%s: directory does not exist!\n"
 msgstr "%s: Verzeichnis existiert nicht!\n"
 
-#: g10/openfile.c:111 g10/openfile.c:181 g10/ringedit.c:1325 g10/tdbio.c:457
+#: g10/openfile.c:111 g10/openfile.c:181 g10/ringedit.c:1344 g10/tdbio.c:457
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: kann nicht erzeugt werden: %s\n"
 
-#: g10/tdbio.c:472 g10/tdbio.c:520
+#: g10/tdbio.c:472 g10/tdbio.c:521
 #, c-format
 msgid "%s: can't create lock\n"
 msgstr "%s: Sperre kann nicht erzeugt werden\n"
@@ -2429,83 +2532,83 @@ msgstr "%s: Fehler beim Erzeugen des Versionsatzes: %s"
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: ung�ltige trust-db erzeugt\n"
 
-#: g10/tdbio.c:492
+#: g10/tdbio.c:493
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: trust-db erzeugt\n"
 
-#: g10/tdbio.c:529
+#: g10/tdbio.c:530
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: ung�ltige 'Trust'-Datenbank\n"
 
-#: g10/tdbio.c:562
+#: g10/tdbio.c:563
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: hashtable kann nicht erzeugt werden: %s\n"
 
-#: g10/tdbio.c:570
+#: g10/tdbio.c:571
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: Fehler beim �ndern des Versionsatzes: %s\n"
 
-#: g10/tdbio.c:586 g10/tdbio.c:625 g10/tdbio.c:647 g10/tdbio.c:677
-#: g10/tdbio.c:702 g10/tdbio.c:1437 g10/tdbio.c:1464
+#: g10/tdbio.c:587 g10/tdbio.c:626 g10/tdbio.c:648 g10/tdbio.c:678
+#: g10/tdbio.c:703 g10/tdbio.c:1438 g10/tdbio.c:1465
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: Fehler beim Lesen des Versionsatzes: %s\n"
 
-#: g10/tdbio.c:599 g10/tdbio.c:658
+#: g10/tdbio.c:600 g10/tdbio.c:659
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: Fehler beim Schreiben des Versionsatzes: %s\n"
 
-#: g10/tdbio.c:1131
+#: g10/tdbio.c:1132
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "trustdb: lseek fehlgeschlagen: %s\n"
 
-#: g10/tdbio.c:1139
+#: g10/tdbio.c:1140
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "trustdb: read failed (n=%d): %s\n"
 
-#: g10/tdbio.c:1160
+#: g10/tdbio.c:1161
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: keine trustdb Datei\n"
 
-#: g10/tdbio.c:1176
+#: g10/tdbio.c:1177
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: version record with recnum %lu\n"
 
-#: g10/tdbio.c:1181
+#: g10/tdbio.c:1182
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: invalid file version %d\n"
 
-#: g10/tdbio.c:1470
+#: g10/tdbio.c:1471
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: Fehler beim Lesen eines freien Satzes: %s\n"
 
-#: g10/tdbio.c:1478
+#: g10/tdbio.c:1479
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: Fehler beim Schreiben eines Verzeichnis-Satzes: %s\n"
 
-#: g10/tdbio.c:1488
+#: g10/tdbio.c:1489
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: konnte einen Satz nicht Nullen: %s\n"
 
-#: g10/tdbio.c:1518
+#: g10/tdbio.c:1519
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: konnte Satz nicht anh�ngen: %s\n"
 
-#: g10/tdbio.c:1629
+#: g10/tdbio.c:1630
 msgid "The trustdb is corrupted; please run \"gpgm --fix-trustdb\".\n"
 msgstr ""
 "Die \"Trust\"-Datenbank ist besch�digt; verwenden Sie \"gpgm "
@@ -2722,7 +2825,7 @@ msgstr "Zu viele Einstellungen"
 msgid "Too many preference items"
 msgstr "Zu viele Angaben zur Bevorzugung"
 
-#: g10/trustdb.c:1549 g10/trustdb.c:3045 g10/trustdb.c:3075
+#: g10/trustdb.c:1549 g10/trustdb.c:3075 g10/trustdb.c:3105
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "WARNUNG: Lange 'Pref'-Records k�nnen noch nicht benutzt werden\n"
 
@@ -2891,22 +2994,22 @@ msgstr "Schl�ssel %08lX.%lu: verfallen am %s\n"
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "Schl�ssel %08lX.%lu: Vertrauenspr�fung fehlgeschlagen: %s\n"
 
-#: g10/trustdb.c:2851
+#: g10/trustdb.c:2881
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "Benutzer '%s' nicht gefunden: %s\n"
 
-#: g10/trustdb.c:2853
+#: g10/trustdb.c:2883
 #, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "Problem, '%s' in der Trust-DB zu finden: %s\n"
 
-#: g10/trustdb.c:2856
+#: g10/trustdb.c:2886
 #, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr "User '%s' ist nicht in der 'Trust'-Datenbank - wird eingef�gt\n"
 
-#: g10/trustdb.c:2859
+#: g10/trustdb.c:2889
 #, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "konnte '%s' nicht in die 'Trust'-Datenbank hineintun: %s\n"
@@ -2916,26 +3019,26 @@ msgstr "konnte '%s' nicht in die 'Trust'-Datenbank hineintun: %s\n"
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s: Schl�sselbund kann nicht erzeugt werden: %s\n"
 
-#: g10/ringedit.c:322 g10/ringedit.c:1330
+#: g10/ringedit.c:333 g10/ringedit.c:1349
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: Schl�sselbund erstellt\n"
 
-#: g10/ringedit.c:1507
+#: g10/ringedit.c:1526
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "Warnung: Zwei Dateien mit vertraulichem Inhalt vorhanden.\n"
 
-#: g10/ringedit.c:1508
+#: g10/ringedit.c:1527
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s ist der Unver�nderte\n"
 
-#: g10/ringedit.c:1509
+#: g10/ringedit.c:1528
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s ist der Neue\n"
 
-#: g10/ringedit.c:1510
+#: g10/ringedit.c:1529
 msgid "Please fix this possible security flaw\n"
 msgstr "Bitte diesen potentiellen Sicherheitsmangel beseitigen\n"
 
@@ -2983,17 +3086,17 @@ msgstr "die unterzeichneten Daten sind wohl in '%s'\n"
 msgid "%s: new options file created\n"
 msgstr "%s: neue Optionendatei erstellt\n"
 
-#: g10/encr-data.c:59
+#: g10/encr-data.c:60
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s verschl�sselte Daten\n"
 
-#: g10/encr-data.c:61
+#: g10/encr-data.c:62
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "Mit unbekanntem Verfahren verschl�sselt %d\n"
 
-#: g10/encr-data.c:74
+#: g10/encr-data.c:77
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
@@ -3242,6 +3345,19 @@ msgstr "Keine Hilfe vorhanden."
 msgid "No help available for `%s'"
 msgstr "Keine Hilfe f�r '%s' vorhanden."
 
+#~ msgid "Usage: gpgm [options] [files] (-h for help)"
+#~ msgstr "Syntax: gpgm [Optionen] [Dateien] (-h f�r Hilfe)"
+
+#~ msgid ""
+#~ "Syntax: gpgm [options] [files]\n"
+#~ "GnuPG maintenance utility\n"
+#~ msgstr ""
+#~ "Syntax: gpgm [options] [files]\n"
+#~ "GnuPG Wartungs-Hilfsprogramm\n"
+
+#~ msgid "usage: gpgm [options] "
+#~ msgstr "Aufruf: gpgm [Optionen] "
+
 #~ msgid "|KEYID|ulimately trust this key"
 #~ msgstr "|KEYID|Diesem Schl�ssel uneingeschr�nkt vertrauen"
 
@@ -3326,9 +3442,6 @@ msgstr "Keine Hilfe f�r '%s' vorhanden."
 #~ msgid "did not use primary key for insert_trust_record()\n"
 #~ msgstr "F�r insert_trust_record() wurde nicht der Hauptschl�ssel benutzt\n"
 
-#~ msgid "use this user-id for encryption"
-#~ msgstr "Verschl�sseln f�r diese User-ID"
-
 #~ msgid "second"
 #~ msgstr "Sekunde"
 
diff --git a/po/es_ES.po b/po/es_ES.po
index bc11aaa27..22a629bc9 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -5,7 +5,7 @@
 # I also got inspiration from it.po by Marco d'Itri <[email protected]>
 msgid ""
 msgstr ""
-"POT-Creation-Date: 1999-03-20 13:40+0100\n"
+"POT-Creation-Date: 1999-05-06 13:37+0200\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Date: 1998-11-13 10:49:25+0100\n"
 "From: Urko Lusa <[email protected]>\n"
@@ -31,11 +31,11 @@ msgstr ""
 msgid "(you may have used the wrong program for this task)\n"
 msgstr ""
 
-#: util/miscutil.c:143
+#: util/miscutil.c:156
 msgid "yes"
 msgstr "s�"
 
-#: util/miscutil.c:144
+#: util/miscutil.c:157
 msgid "yY"
 msgstr "sS"
 
@@ -231,6 +231,11 @@ msgstr "No soportado"
 msgid "network error"
 msgstr "Error general"
 
+#: util/errors.c:102
+#, fuzzy
+msgid "not encrypted"
+msgstr "datos cifrados %s\n"
+
 #: util/logger.c:178
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
@@ -241,11 +246,11 @@ msgstr "�Oh! vaya... esto es un bug (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "Ha encontrado Vd. un bug... (%s:%d)\n"
 
-#: cipher/random.c:403
+#: cipher/random.c:408
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "Aviso: �se est� usando un generador de n�meros aleatorios inseguro!\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:409
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -271,7 +276,7 @@ msgstr ""
 "otro trabajo para que el sistema pueda recolectar m�s entrop�a\n"
 "(se necesitan %d bytes m�s).\n"
 
-#: g10/g10.c:166
+#: g10/g10.c:163
 msgid ""
 "@Commands:\n"
 " "
@@ -279,131 +284,131 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/g10.c:169
+#: g10/g10.c:165
 msgid "|[file]|make a signature"
 msgstr "|[file]|hace una firma"
 
-#: g10/g10.c:170
+#: g10/g10.c:166
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|hace una firma en texto claro"
 
-#: g10/g10.c:171
+#: g10/g10.c:167
 msgid "make a detached signature"
 msgstr "hace una firma separada"
 
-#: g10/g10.c:172
+#: g10/g10.c:168
 msgid "encrypt data"
 msgstr "cifra datos"
 
-#: g10/g10.c:173
+#: g10/g10.c:169
 msgid "encryption only with symmetric cipher"
 msgstr "cifra s�lo con un cifrado sim�trico"
 
-#: g10/g10.c:174
+#: g10/g10.c:170
 msgid "store only"
 msgstr "s�lo almacenar"
 
-#: g10/g10.c:175
+#: g10/g10.c:171
 msgid "decrypt data (default)"
 msgstr "descifra datos (predefinido)"
 
-#: g10/g10.c:176
+#: g10/g10.c:172
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/g10.c:178
+#: g10/g10.c:173
 msgid "list keys"
 msgstr "lista las claves"
 
-#: g10/g10.c:179
+#: g10/g10.c:175
 msgid "list keys and signatures"
 msgstr "lista las claves y firmas"
 
-#: g10/g10.c:180
+#: g10/g10.c:176
 msgid "check key signatures"
 msgstr "comprueba las firmas de las claves"
 
-#: g10/g10.c:181
+#: g10/g10.c:177
 msgid "list keys and fingerprints"
 msgstr "lista las claves y huellas dactilares"
 
-#: g10/g10.c:182
+#: g10/g10.c:178
 msgid "list secret keys"
 msgstr "lista las claves secretas"
 
-#: g10/g10.c:184
+#: g10/g10.c:179
 msgid "generate a new key pair"
 msgstr "genera un nuevo par de claves"
 
-#: g10/g10.c:186
+#: g10/g10.c:180
 msgid "remove key from the public keyring"
 msgstr "elimina la clave del anillo p�blico"
 
-#: g10/g10.c:188
+#: g10/g10.c:181
 msgid "sign or edit a key"
 msgstr "firma o modifica una clave"
 
-#: g10/g10.c:189
+#: g10/g10.c:182
 msgid "generate a revocation certificate"
 msgstr "genera un certificado de revocaci�n"
 
-#: g10/g10.c:191
+#: g10/g10.c:183
 msgid "export keys"
 msgstr "exporta las claves"
 
-#: g10/g10.c:192
+#: g10/g10.c:184
 msgid "export keys to a key server"
 msgstr ""
 
-#: g10/g10.c:193
+#: g10/g10.c:185
 msgid "import keys from a key server"
 msgstr ""
 
-#: g10/g10.c:196
+#: g10/g10.c:188
 msgid "import/merge keys"
 msgstr "importa/fusiona las claves"
 
-#: g10/g10.c:198
+#: g10/g10.c:190
 msgid "list only the sequence of packets"
 msgstr "lista s�lo la secuencia de paquetes"
 
-#: g10/g10.c:201
+#: g10/g10.c:192
 msgid "export the ownertrust values"
 msgstr "exporta los valores de confianza"
 
-#: g10/g10.c:203
+#: g10/g10.c:194
 msgid "import ownertrust values"
 msgstr "importa los valores de confianza"
 
-#: g10/g10.c:205
+#: g10/g10.c:196
 msgid "|[NAMES]|update the trust database"
 msgstr "|[NOMBRES]|actualiza la base de datos de confianza"
 
-#: g10/g10.c:207
+#: g10/g10.c:198
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMBRES]|comprueba la base de datos de confianza"
 
-#: g10/g10.c:208
+#: g10/g10.c:199
 msgid "fix a corrupted trust database"
 msgstr "arregla una base de datos de confianza da�ada"
 
-#: g10/g10.c:209
+#: g10/g10.c:200
 msgid "De-Armor a file or stdin"
 msgstr "quita la armadura de un fichero o stdin"
 
-#: g10/g10.c:210
+#: g10/g10.c:201
 msgid "En-Armor a file or stdin"
 msgstr "crea la armadura a un fichero o stdin"
 
-#: g10/g10.c:211
+#: g10/g10.c:202
 msgid "|algo [files]|print message digests"
 msgstr "|algo [files]|imprime res�menes de mensaje"
 
-#: g10/g10.c:212
+#: g10/g10.c:203
 msgid "print all message digests"
 msgstr "imprime todos los res�menes de mensaje"
 
-#: g10/g10.c:219
+#: g10/g10.c:209
 msgid ""
 "@\n"
 "Options:\n"
@@ -413,148 +418,153 @@ msgstr ""
 "Opciones:\n"
 " "
 
-#: g10/g10.c:221
+#: g10/g10.c:211
 msgid "create ascii armored output"
 msgstr "crea una salida ascii con armadura"
 
-#: g10/g10.c:222
+#: g10/g10.c:212
 #, fuzzy
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOMBRE|usa el juego de caracteres NOMBRE"
 
-#: g10/g10.c:227
+#: g10/g10.c:216
 msgid "use this user-id to sign or decrypt"
 msgstr "usa este usuario para firmar o descifrar"
 
-#: g10/g10.c:228
+#: g10/g10.c:217
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|establece nivel de compresi�n N (0 no comprime)"
 
-#: g10/g10.c:230
+#: g10/g10.c:219
 msgid "use canonical text mode"
 msgstr "usa modo de texto can�nico"
 
-#: g10/g10.c:232
+#: g10/g10.c:220
 msgid "use as output file"
 msgstr "usa como fichero de salida"
 
-#: g10/g10.c:233
+#: g10/g10.c:221
 msgid "verbose"
 msgstr "prolijo"
 
-#: g10/g10.c:234
+#: g10/g10.c:222
 msgid "be somewhat more quiet"
 msgstr "algo m�s discreto"
 
-#: g10/g10.c:235
+#: g10/g10.c:223
 msgid "force v3 signatures"
 msgstr "fuerza firmas v3"
 
-#: g10/g10.c:236
+#: g10/g10.c:224
+#, fuzzy
+msgid "always use a MDC for encryption"
+msgstr "usa este usuario para cifrar"
+
+#: g10/g10.c:225
 msgid "do not make any changes"
 msgstr ""
 
-#: g10/g10.c:237
+#: g10/g10.c:226
 msgid "batch mode: never ask"
 msgstr "proceso por lotes: nunca preguntar"
 
-#: g10/g10.c:238
+#: g10/g10.c:227
 msgid "assume yes on most questions"
 msgstr "asume \"s�\" en casi todas las preguntas"
 
-#: g10/g10.c:239
+#: g10/g10.c:228
 msgid "assume no on most questions"
 msgstr "asume \"no\" en casi todas las preguntas"
 
-#: g10/g10.c:240
+#: g10/g10.c:229
 msgid "add this keyring to the list of keyrings"
 msgstr "a�ade este anillo a la lista de anillos"
 
-#: g10/g10.c:241
+#: g10/g10.c:230
 msgid "add this secret keyring to the list"
 msgstr "a�ade este anillo secreto a la lista"
 
-#: g10/g10.c:242
+#: g10/g10.c:231
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOMBRE|usa NOMBRE como clave secreta por defecto"
 
-#: g10/g10.c:243
+#: g10/g10.c:232
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr ""
 
-#: g10/g10.c:244
+#: g10/g10.c:233
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOMBRE|usa el juego de caracteres NOMBRE"
 
-#: g10/g10.c:245
+#: g10/g10.c:234
 msgid "read options from file"
 msgstr "lee opciones del fichero"
 
-#: g10/g10.c:247
+#: g10/g10.c:236
 msgid "set debugging flags"
 msgstr "establece los par�metros de depuraci�n"
 
-#: g10/g10.c:248
+#: g10/g10.c:237
 msgid "enable full debugging"
 msgstr "habilita depuraci�n completa"
 
-#: g10/g10.c:249
+#: g10/g10.c:238
 msgid "|FD|write status info to this FD"
 msgstr "|DF|escribe informaci�n de estado en descriptor DF"
 
-#: g10/g10.c:250
+#: g10/g10.c:239
 msgid "do not write comment packets"
 msgstr "no escribe paquetes de comentario"
 
-#: g10/g10.c:251
+#: g10/g10.c:240
 msgid "(default is 1)"
 msgstr "(por defecto es 1)"
 
-#: g10/g10.c:252
+#: g10/g10.c:241
 msgid "(default is 3)"
 msgstr "(por defecto es 3)"
 
-#: g10/g10.c:254
+#: g10/g10.c:243
 msgid "|FILE|load extension module FILE"
 msgstr "|FICHERO|carga m�dulo de extensiones FICHERO"
 
-#: g10/g10.c:255
+#: g10/g10.c:244
 msgid "emulate the mode described in RFC1991"
 msgstr "emula el modo descrito en la RFC1991"
 
-#: g10/g10.c:256
+#: g10/g10.c:245
 msgid "|N|use passphrase mode N"
 msgstr "|N|usa modo de contrase�a N"
 
-#: g10/g10.c:258
+#: g10/g10.c:247
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr ""
 "|NOMBRE|usa algoritmo de resumen de mensaje NOMBRE\n"
 "para las contrase�as"
 
-#: g10/g10.c:260
+#: g10/g10.c:249
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr ""
 "|NOMBRE|usa el algoritmo de cifrado NOMBRE para las\n"
 "contrase�as"
 
-#: g10/g10.c:262
+#: g10/g10.c:250
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOMBRE|usa el algoritmo de cifrado NOMBRE"
 
-#: g10/g10.c:263
+#: g10/g10.c:251
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOMBRE|usa algoritmo de resumen de mensaje NOMBRE"
 
-#: g10/g10.c:264
+#: g10/g10.c:252
 msgid "|N|use compress algorithm N"
 msgstr "|N|usa el algoritmo de compresi�n N"
 
-#: g10/g10.c:265
+#: g10/g10.c:253
 msgid "throw keyid field of encrypted packets"
 msgstr "elimina el campo keyid de los paquetes cifrados"
 
-#: g10/g10.c:273
+#: g10/g10.c:255
 msgid ""
 "@\n"
 "Examples:\n"
@@ -574,27 +584,15 @@ msgstr ""
 " --list-keys [nombres]      muestra las claves\n"
 " --fingerprint [nombres]    muestra las huellas dactilares\n"
 
-#: g10/g10.c:353
+#: g10/g10.c:323
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Por favor, informe de posibles \"bugs\" a <[email protected]>.\n"
 
-#: g10/g10.c:358
-msgid "Usage: gpgm [options] [files] (-h for help)"
-msgstr "Uso: gpgm [opciones] [ficheros] (-h para ayuda)"
-
-#: g10/g10.c:360
+#: g10/g10.c:327
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
 
-#: g10/g10.c:365
-msgid ""
-"Syntax: gpgm [options] [files]\n"
-"GnuPG maintenance utility\n"
-msgstr ""
-"Sintaxis: gpgm [opciones] [ficheros]\n"
-"Utilidad de mantenimiento de GnuPG\n"
-
-#: g10/g10.c:368
+#: g10/g10.c:330
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -604,7 +602,7 @@ msgstr ""
 "firma, comprueba, cifra o descifra\n"
 "la operaci�n por defecto depende del tipo de datos de entrada\n"
 
-#: g10/g10.c:374
+#: g10/g10.c:335
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -612,222 +610,218 @@ msgstr ""
 "\n"
 "Algoritmos soportados:\n"
 
-#: g10/g10.c:449
-msgid "usage: gpgm [options] "
-msgstr "uso: gpgm [opciones] "
-
-#: g10/g10.c:451
+#: g10/g10.c:409
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opciones] "
 
-#: g10/g10.c:492
+#: g10/g10.c:449
 msgid "conflicting commands\n"
 msgstr "comandos incompatibles\n"
 
-#: g10/g10.c:631
+#: g10/g10.c:576
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "nota: no existe fichero de opciones predefinido `%s'\n"
 
-#: g10/g10.c:635
+#: g10/g10.c:580
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichero de opciones `%s': %s\n"
 
-#: g10/g10.c:642
+#: g10/g10.c:587
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "leyendo opciones desde `%s'\n"
 
-#: g10/g10.c:797
+#: g10/g10.c:731
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s no es un juego de caracteres v�lido\n"
 
-#: g10/g10.c:838 g10/g10.c:850
+#: g10/g10.c:774 g10/g10.c:786
 msgid "selected cipher algorithm is invalid\n"
 msgstr "el algoritmo de cifrado seleccionado no es v�lido\n"
 
-#: g10/g10.c:844 g10/g10.c:856
+#: g10/g10.c:780 g10/g10.c:792
 msgid "selected digest algorithm is invalid\n"
 msgstr "el algoritmo de resumen seleccionado no es v�lido\n"
 
-#: g10/g10.c:859
+#: g10/g10.c:795
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "el algoritmo de compresi�n debe estar en el rango %d-%d\n"
 
-#: g10/g10.c:861
+#: g10/g10.c:797
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser mayor que 0\n"
 
-#: g10/g10.c:863
+#: g10/g10.c:799
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser mayor que 1\n"
 
-#: g10/g10.c:865
+#: g10/g10.c:801
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth debe estar en el rango 1-255\n"
 
-#: g10/g10.c:868
+#: g10/g10.c:804
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "nota: el modo S2K simple (0) no es nada recomendable\n"
 
-#: g10/g10.c:872
+#: g10/g10.c:808
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K incorrecto; debe ser 0, 1 o 3\n"
 
-#: g10/g10.c:949
+#: g10/g10.c:885
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicializaci�n de la base de datos de confianza fallida: %s\n"
 
-#: g10/g10.c:955
+#: g10/g10.c:891
 msgid "--store [filename]"
 msgstr "--store [nombre_fichero]"
 
-#: g10/g10.c:963
+#: g10/g10.c:898
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nombre_fichero]"
 
-#: g10/g10.c:971
+#: g10/g10.c:906
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nombre_fichero]"
 
-#: g10/g10.c:984
+#: g10/g10.c:919
 msgid "--sign [filename]"
 msgstr "--sign [nombre_fichero]"
 
-#: g10/g10.c:997
+#: g10/g10.c:932
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nombre_fichero]"
 
-#: g10/g10.c:1011
+#: g10/g10.c:946
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nombre_fichero]"
 
-#: g10/g10.c:1023
+#: g10/g10.c:958
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nombre_fichero]"
 
-#: g10/g10.c:1032
+#: g10/g10.c:967
 msgid "--edit-key username [commands]"
 msgstr "--edit-key nombre_usuario"
 
-#: g10/g10.c:1048
+#: g10/g10.c:981
 msgid "--delete-secret-key username"
 msgstr "--delete-secret-key nombre_usuario"
 
-#: g10/g10.c:1051
+#: g10/g10.c:984
 msgid "--delete-key username"
 msgstr "--delete-key nombre_usuario"
 
-#: g10/encode.c:229 g10/g10.c:1074 g10/sign.c:311
+#: g10/encode.c:234 g10/g10.c:1007 g10/sign.c:311
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "no puede abrirse `%s': %s\n"
 
-#: g10/g10.c:1085
+#: g10/g10.c:1018
 msgid "-k[v][v][v][c] [userid] [keyring]"
 msgstr "-k[v][v][v][c] [id_usuario] [anillo]"
 
-#: g10/g10.c:1149
+#: g10/g10.c:1077
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminaci�n de armadura fallida: %s\n"
 
-#: g10/g10.c:1157
+#: g10/g10.c:1085
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creaci�n de armadura fallida: %s\n"
 
-#: g10/g10.c:1223
+#: g10/g10.c:1151
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de distribuci�n no v�lido `%s'\n"
 
-#: g10/g10.c:1302
+#: g10/g10.c:1226
 msgid "[filename]"
 msgstr "[nombre_fichero]"
 
-#: g10/g10.c:1306
+#: g10/g10.c:1230
 msgid "Go ahead and type your message ...\n"
 msgstr "Adelante, teclee el mensaje ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1309 g10/verify.c:66
+#: g10/decrypt.c:59 g10/g10.c:1233 g10/verify.c:66
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "no puede abrirse `%s'\n"
 
-#: g10/armor.c:297
+#: g10/armor.c:296
 #, c-format
 msgid "armor: %s\n"
 msgstr "armadura: %s\n"
 
-#: g10/armor.c:320
+#: g10/armor.c:319
 msgid "invalid armor header: "
 msgstr "cabecera de armadura no v�lida: "
 
-#: g10/armor.c:327
+#: g10/armor.c:326
 msgid "armor header: "
 msgstr "cabecera de armadura: "
 
-#: g10/armor.c:338
+#: g10/armor.c:337
 msgid "invalid clearsig header\n"
 msgstr "cabecera de firma clara no v�lida\n"
 
-#: g10/armor.c:390
+#: g10/armor.c:389
 msgid "nested clear text signatures\n"
 msgstr "firmas en texto claro anidadas\n"
 
-#: g10/armor.c:499
+#: g10/armor.c:498
 msgid "invalid dash escaped line: "
 msgstr "L�nea con guiones no v�lida: "
 
-#: g10/armor.c:511
+#: g10/armor.c:510
 msgid "unexpected armor:"
 msgstr "armadura inesperada"
 
-#: g10/armor.c:628
+#: g10/armor.c:627
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "caracteres no v�lidos radix64 %02x ignorados\n"
 
-#: g10/armor.c:671
+#: g10/armor.c:670
 msgid "premature eof (no CRC)\n"
 msgstr "Fin de fichero prematuro\n"
 
-#: g10/armor.c:705
+#: g10/armor.c:704
 msgid "premature eof (in CRC)\n"
 msgstr "Fin de suma de comprobaci�n prematuro\n"
 
-#: g10/armor.c:709
+#: g10/armor.c:708
 msgid "malformed CRC\n"
 msgstr "Suma de comprobaci�n mal creada\n"
 
-#: g10/armor.c:713
+#: g10/armor.c:712
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "Error en suma de comprobaci�n: %06lx - %06lx\n"
 
-#: g10/armor.c:730
+#: g10/armor.c:729
 msgid "premature eof (in Trailer)\n"
 msgstr "fin de fichero prematuro (en el cierre)\n"
 
-#: g10/armor.c:734
+#: g10/armor.c:733
 msgid "error in trailer line\n"
 msgstr "error en la l�nea de cierre\n"
 
-#: g10/armor.c:998
+#: g10/armor.c:997
 msgid "no valid OpenPGP data found.\n"
 msgstr "no se han encontrados datos OpenPGP v�lidos\n"
 
-#: g10/armor.c:1002
+#: g10/armor.c:1001
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armadura inv�lida: l�nea m�s larga de %d caracteres\n"
 
-#: g10/armor.c:1006
+#: g10/armor.c:1005
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -921,26 +915,31 @@ msgstr ""
 msgid "key %08lX: key has been revoked!\n"
 msgstr "%08lX: �Esta clave ha sido retirada!\n"
 
-#: g10/pkclist.c:287 g10/pkclist.c:391
+#: g10/pkclist.c:287 g10/pkclist.c:297 g10/pkclist.c:403
 msgid "Use this key anyway? "
 msgstr "�Usar esta clave de todas formas? "
 
-#: g10/pkclist.c:311
+#: g10/pkclist.c:291
+#, fuzzy, c-format
+msgid "key %08lX: subkey has been revoked!\n"
+msgstr "%08lX: �Esta clave ha sido retirada!\n"
+
+#: g10/pkclist.c:321
 #, c-format
 msgid "%08lX: key has expired\n"
 msgstr "%08lX: �Esta clave est� caducada!\n"
 
-#: g10/pkclist.c:317
+#: g10/pkclist.c:327
 #, c-format
 msgid "%08lX: no info to calculate a trust probability\n"
 msgstr "%08lX: no hay informaci�n para calcular la probabilidad de confianza\n"
 
-#: g10/pkclist.c:331
+#: g10/pkclist.c:341
 #, c-format
 msgid "%08lX: We do NOT trust this key\n"
 msgstr "%08lX: �Esta clave NO es de confianza!\n"
 
-#: g10/pkclist.c:337
+#: g10/pkclist.c:347
 #, c-format
 msgid ""
 "%08lX: It is not sure that this key really belongs to the owner\n"
@@ -950,15 +949,15 @@ msgstr ""
 "proprietario\n"
 "pero se acepta igualmente\n"
 
-#: g10/pkclist.c:343
+#: g10/pkclist.c:353
 msgid "This key probably belongs to the owner\n"
 msgstr "Esta clave probablemente pertenece a su proprietario\n"
 
-#: g10/pkclist.c:348
+#: g10/pkclist.c:358
 msgid "This key belongs to us\n"
 msgstr "Esta clave nos pertenece\n"
 
-#: g10/pkclist.c:386
+#: g10/pkclist.c:398
 msgid ""
 "It is NOT certain that the key belongs to its owner.\n"
 "If you *really* know what you are doing, you may answer\n"
@@ -970,56 +969,61 @@ msgstr ""
 "\"s�\" a la siguiente pregunta.\n"
 "\n"
 
-#: g10/pkclist.c:399
+#: g10/pkclist.c:411
 msgid "WARNING: Using untrusted key!\n"
 msgstr "ATENCI�N: �Usando una clave no fiable!\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:447
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "ATENCI�N: �Esta clave ha sido revocada por su propietario!\n"
 
-#: g10/pkclist.c:436
+#: g10/pkclist.c:448
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "          Esto puede significar que la firma est� falsificada.\n"
 
-#: g10/pkclist.c:457
+#: g10/pkclist.c:452
+#, fuzzy
+msgid "WARNING: This subkey has been revoked by its owner!\n"
+msgstr "ATENCI�N: �Esta clave ha sido revocada por su propietario!\n"
+
+#: g10/pkclist.c:473
 msgid "Note: This key has expired!\n"
 msgstr "Nota: �Esta clave est� caducada!\n"
 
-#: g10/pkclist.c:464
+#: g10/pkclist.c:480
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 "ATENCI�N: �Esta clave no est� certificada por una firma de confianza!\n"
 
-#: g10/pkclist.c:466
+#: g10/pkclist.c:482
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "         No hay indicios de que la firma pertenezca al propietario.\n"
 
-#: g10/pkclist.c:482
+#: g10/pkclist.c:498
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "ATENCI�N: �Esta clave NO es de confianza!\n"
 
-#: g10/pkclist.c:483
+#: g10/pkclist.c:499
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         La firma es probablemente una FALSIFICACI�N.\n"
 
-#: g10/pkclist.c:490
+#: g10/pkclist.c:506
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "AVISO: �Esta clave no est� certificada con suficientes firmas de confianza!\n"
 
-#: g10/pkclist.c:493
+#: g10/pkclist.c:509
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         No es seguro que la firma pertenezca al propietario.\n"
 
-#: g10/pkclist.c:546 g10/pkclist.c:559 g10/pkclist.c:622 g10/pkclist.c:650
+#: g10/pkclist.c:562 g10/pkclist.c:575 g10/pkclist.c:638 g10/pkclist.c:666
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignorado: %s\n"
 
-#: g10/pkclist.c:568
+#: g10/pkclist.c:584
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1027,20 +1031,20 @@ msgstr ""
 "No se ha especificado un ID de usuario (puede usar \"-r\")\n"
 "\n"
 
-#: g10/pkclist.c:573
+#: g10/pkclist.c:589
 msgid "Enter the user ID: "
 msgstr "Introduzca el ID de usuario: "
 
-#: g10/pkclist.c:584
+#: g10/pkclist.c:600
 msgid "No such user ID.\n"
 msgstr "ID de usuario inexistente.\n"
 
-#: g10/pkclist.c:630
+#: g10/pkclist.c:646
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: error comprobando la clave: %s\n"
 
-#: g10/pkclist.c:656
+#: g10/pkclist.c:672
 msgid "no valid addressees\n"
 msgstr "no hay direcciones v�lidas\n"
 
@@ -1118,7 +1122,20 @@ msgstr "DSA s�lo permite tama�os desde 512 a 1024\n"
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "tama�o insuficiente; 768 es el valor m�nimo permitido\n"
 
-#: g10/keygen.c:459
+#. It is ridiculous and an annoyance to use larger key sizes!
+#. * GnuPG can handle much larger sizes; but it takes an eternity
+#. * to create such a key (but less than the time the Sirius
+#. * Computer Corporation needs to process one of the usual
+#. * complaints) and {de,en}cryption although needs some time.
+#. * So, before you complain about this limitation, I suggest that
+#. * you start a discussion with Marvin about this theme and then
+#. * do whatever you want.
+#: g10/keygen.c:466
+#, fuzzy, c-format
+msgid "keysize too large; %d is largest value allowed.\n"
+msgstr "tama�o insuficiente; 768 es el valor m�nimo permitido\n"
+
+#: g10/keygen.c:471
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1126,11 +1143,11 @@ msgstr ""
 "No se recomiendan claves de m�s de 2048 bits porque\n"
 "el tiempo de computaci�n es REALMENTE largo.\n"
 
-#: g10/keygen.c:462
+#: g10/keygen.c:474
 msgid "Are you sure that you want this keysize? "
 msgstr "�Seguro que quiere una clave de este tama�o? "
 
-#: g10/keygen.c:463
+#: g10/keygen.c:475
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1139,21 +1156,21 @@ msgstr ""
 "teclado\n"
 "tambi�n son vulnerables a un ataque!\n"
 
-#: g10/keygen.c:471
+#: g10/keygen.c:483
 msgid "Do you really need such a large keysize? "
 msgstr "�De verdad necesita una clave tan grande? "
 
-#: g10/keygen.c:477
+#: g10/keygen.c:489
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "El tama�o requerido es de %u bits\n"
 
-#: g10/keygen.c:480 g10/keygen.c:484
+#: g10/keygen.c:492 g10/keygen.c:496
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "redondeados a %u bits\n"
 
-#: g10/keygen.c:497
+#: g10/keygen.c:509
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1169,29 +1186,29 @@ msgstr ""
 "      <n>m = la clave caduca en n meses\n"
 "      <n>y = la clave caduca en n a�os\n"
 
-#: g10/keygen.c:512
+#: g10/keygen.c:524
 msgid "Key is valid for? (0) "
 msgstr "�Validez de la clave (0)? "
 
-#: g10/keygen.c:523
+#: g10/keygen.c:535
 msgid "invalid value\n"
 msgstr "valor no v�lido\n"
 
-#: g10/keygen.c:528
+#: g10/keygen.c:540
 msgid "Key does not expire at all\n"
 msgstr "La clave nunca caduca\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:534
+#: g10/keygen.c:546
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "La clave caduca el %s\n"
 
-#: g10/keygen.c:540
+#: g10/keygen.c:552
 msgid "Is this correct (y/n)? "
 msgstr "�Es correcto (s/n)? "
 
-#: g10/keygen.c:583
+#: g10/keygen.c:595
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1209,44 +1226,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:594
+#: g10/keygen.c:606
 msgid "Real name: "
 msgstr "Nombre y apellidos: "
 
-#: g10/keygen.c:598
+#: g10/keygen.c:610
 msgid "Invalid character in name\n"
 msgstr "Caracter no v�lido en el nombre\n"
 
-#: g10/keygen.c:600
+#: g10/keygen.c:612
 msgid "Name may not start with a digit\n"
 msgstr "El nombre no puede empezar con un n�mero\n"
 
-#: g10/keygen.c:602
+#: g10/keygen.c:614
 msgid "Name must be at least 5 characters long\n"
 msgstr "El nombre debe tener al menos 5 caracteres\n"
 
-#: g10/keygen.c:610
+#: g10/keygen.c:622
 msgid "Email address: "
 msgstr "Direcci�n de correo electr�nico: "
 
-#: g10/keygen.c:621
+#: g10/keygen.c:633
 msgid "Not a valid email address\n"
 msgstr "Direcci�n no v�lida\n"
 
-#: g10/keygen.c:629
+#: g10/keygen.c:641
 msgid "Comment: "
 msgstr "Comentario: "
 
-#: g10/keygen.c:635
+#: g10/keygen.c:647
 msgid "Invalid character in comment\n"
 msgstr "Caracter no v�lido en el comentario\n"
 
-#: g10/keygen.c:657
+#: g10/keygen.c:669
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr ""
 
-#: g10/keygen.c:663
+#: g10/keygen.c:675
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1257,15 +1274,15 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:666
+#: g10/keygen.c:678
 msgid "NnCcEeOoQq"
 msgstr "NnCcDdVvSs"
 
-#: g10/keygen.c:676
+#: g10/keygen.c:688
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "�Cambia (N)ombre, (C)omentario, (D)irecci�n o (V)ale/(S)alir? "
 
-#: g10/keygen.c:728
+#: g10/keygen.c:740
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1273,11 +1290,11 @@ msgstr ""
 "Necesita una contrase�a para proteger su clave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:421 g10/keygen.c:736
+#: g10/keyedit.c:433 g10/keygen.c:748
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "contrase�a repetida incorrecta, int�ntelo de nuevo.\n"
 
-#: g10/keygen.c:742
+#: g10/keygen.c:754
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1289,13 +1306,13 @@ msgstr ""
 "la opci�n \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:763
+#: g10/keygen.c:775
 #, fuzzy
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
-"the disks) during the prime generation; this gives the random\n"
-"number generator a better chance to gain enough entropy.\n"
+"disks) during the prime generation; this gives the random number\n"
+"generator a better chance to gain enough entropy.\n"
 msgstr ""
 "Es necesario generar muchos bytes aleatorios. Es una buena idea realizar\n"
 "alguna otra tarea (trabajar en otra ventana/consola, mover el rat�n, usar\n"
@@ -1303,33 +1320,33 @@ msgstr ""
 "generador de n�meros aleatorios mayor oportunidad de recoger suficiente\n"
 "entrop�a.\n"
 
-#: g10/keygen.c:833
+#: g10/keygen.c:845
 msgid "Key generation can only be used in interactive mode\n"
 msgstr "La creaci�n de claves s�lo es posible en modo interactivo\n"
 
-#: g10/keygen.c:841
+#: g10/keygen.c:853
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "El par de claves DSA tendr� 1024 bits.\n"
 
-#: g10/keygen.c:847
+#: g10/keygen.c:859
 msgid "Key generation cancelled.\n"
 msgstr "Creaci�n de claves cancelada.\n"
 
-#: g10/keygen.c:857
+#: g10/keygen.c:869
 #, c-format
 msgid "writing public certificate to `%s'\n"
 msgstr "escribiendo certificado p�blico en `%s'\n"
 
-#: g10/keygen.c:858
+#: g10/keygen.c:870
 #, c-format
 msgid "writing secret certificate to `%s'\n"
 msgstr "escribiendo certificado privado en `%s'\n"
 
-#: g10/keygen.c:935
+#: g10/keygen.c:947
 msgid "public and secret key created and signed.\n"
 msgstr "Claves p�blica y secreta creadas y firmadas.\n"
 
-#: g10/keygen.c:937
+#: g10/keygen.c:949
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -1339,12 +1356,12 @@ msgstr ""
 "el comando \"--add-key\" para crear una clave secundaria con este "
 "prop�sito.\n"
 
-#: g10/keygen.c:951 g10/keygen.c:1050
+#: g10/keygen.c:963 g10/keygen.c:1062
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Creaci�n de la clave fallida: %s\n"
 
-#: g10/keygen.c:995 g10/sig-check.c:212 g10/sign.c:52
+#: g10/keygen.c:1007 g10/sig-check.c:299 g10/sign.c:52
 #, fuzzy, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1352,7 +1369,7 @@ msgstr ""
 "clave p�blica creada %lu %s en el futuro (salto en el tiempo o problemas con "
 "el reloj)\n"
 
-#: g10/keygen.c:997 g10/sig-check.c:214 g10/sign.c:54
+#: g10/keygen.c:1009 g10/sig-check.c:301 g10/sign.c:54
 #, fuzzy, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1360,32 +1377,37 @@ msgstr ""
 "clave p�blica creada %lu %s en el futuro (salto en el tiempo o problemas con "
 "el reloj)\n"
 
-#: g10/keygen.c:1028
+#: g10/keygen.c:1040
 msgid "Really create? "
 msgstr "�Crear de verdad? "
 
-#: g10/encode.c:90 g10/openfile.c:86 g10/openfile.c:174 g10/tdbio.c:467
-#: g10/tdbio.c:527
+#: g10/encode.c:91 g10/openfile.c:86 g10/openfile.c:174 g10/tdbio.c:467
+#: g10/tdbio.c:528
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: no puede abrirse: %s\n"
 
-#: g10/encode.c:112
+#: g10/encode.c:113
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "error creando contrase�a: %s\n"
 
-#: g10/encode.c:166 g10/encode.c:285
+#: g10/encode.c:167 g10/encode.c:290
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: atenci�n: fichero vac�o\n"
 
-#: g10/encode.c:235
+#: g10/encode.c:240
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "leyendo desde `%s'\n"
 
-#: g10/encode.c:413
+#: g10/encode.c:435 g10/sign.c:346
+#, c-format
+msgid "WARNING: `%s' is an empty file\n"
+msgstr "atenci�n: '%s' es un fichero vac�o\n"
+
+#: g10/encode.c:605
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s cifrado para: %s\n"
@@ -1417,7 +1439,7 @@ msgstr "demasiados registros en la cache pk - anulada\n"
 msgid "too many entries in unk cache - disabled\n"
 msgstr "demasiados registros en la cache unk - anulada\n"
 
-#: g10/getkey.c:1531 g10/getkey.c:1587
+#: g10/getkey.c:1535 g10/getkey.c:1591
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "usando clave secundaria %08lX en vez de clave primaria %08lX\n"
@@ -1442,325 +1464,334 @@ msgstr "hasta ahora se han procesado %lu claves\n"
 msgid "read error: %s\n"
 msgstr "error de lectura: %s\n"
 
-#: g10/import.c:174
+#: g10/import.c:175
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "         Cantidad total procesada: %lu\n"
 
-#: g10/import.c:176
+#: g10/import.c:177
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "    sin identificativo de usuario: %lu\n"
 
-#: g10/import.c:178
+#: g10/import.c:179
 #, c-format
 msgid "              imported: %lu"
 msgstr "                       importadas: %lu"
 
-#: g10/import.c:184
+#: g10/import.c:185
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                      sin cambios: %lu\n"
 
-#: g10/import.c:186
+#: g10/import.c:187
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "nuevos identificativos de usuario: %lu\n"
 
-#: g10/import.c:188
+#: g10/import.c:189
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "                nuevas sub-claves: %lu\n"
 
-#: g10/import.c:190
+#: g10/import.c:191
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "                    nuevas firmas: %lu\n"
 
-#: g10/import.c:192
+#: g10/import.c:193
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "     nuevas revocaciones de clave: %lu\n"
 
-#: g10/import.c:194
+#: g10/import.c:195
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "           claves secretas le�das: %lu\n"
 
-#: g10/import.c:196
+#: g10/import.c:197
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "       claves secretas importadas: %lu\n"
 
-#: g10/import.c:198
+#: g10/import.c:199
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "      claves secretas sin cambios: %lu\n"
 
-#: g10/import.c:340 g10/import.c:532
+#: g10/import.c:342 g10/import.c:534
 #, c-format
 msgid "key %08lX: no user id\n"
 msgstr "clave %08lX: no hay identificativo de usuario\n"
 
-#: g10/import.c:351
+#: g10/import.c:353
 #, c-format
 msgid "key %08lX: no valid user ids\n"
 msgstr "clave %08lX: no hay identificativos de usuario v�lidos\n"
 
-#: g10/import.c:353
+#: g10/import.c:355
 msgid "this may be caused by a missing self-signature\n"
 msgstr "esto puede ser debido a la ausencia de autofirma\n"
 
-#: g10/import.c:364 g10/import.c:600
+#: g10/import.c:366 g10/import.c:604
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "clave %08lX: clave p�blica no encontrada: %s\n"
 
-#: g10/import.c:370
+#: g10/import.c:372
 msgid "no default public keyring\n"
 msgstr "no hay anillo p�blico por defecto\n"
 
-#: g10/import.c:374 g10/openfile.c:115 g10/sign.c:215 g10/sign.c:498
+#: g10/import.c:376 g10/openfile.c:115 g10/sign.c:215 g10/sign.c:501
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escribiendo en `%s'\n"
 
-#: g10/import.c:378 g10/import.c:438 g10/import.c:654
+#: g10/import.c:380 g10/import.c:440 g10/import.c:658
 #, c-format
 msgid "can't lock public keyring: %s\n"
 msgstr "no puede bloquearse el anillo p�blico: %s\n"
 
-#: g10/import.c:381
+#: g10/import.c:383
 #, c-format
 msgid "can't write to keyring: %s\n"
 msgstr "no puede escribirse en el anillo: %s\n"
 
-#: g10/import.c:385
+#: g10/import.c:387
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "clave %08lX: clave p�blica importada\n"
 
-#: g10/import.c:398
+#: g10/import.c:400
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "clave %08lX: no se corresponde con nuestra copia\n"
 
-#: g10/import.c:411 g10/import.c:609
+#: g10/import.c:413 g10/import.c:613
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "clave %08lX: no puede localizarse el bloque de claves original: %s\n"
 
-#: g10/import.c:418 g10/import.c:616
+#: g10/import.c:420 g10/import.c:620
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "clave %08lX: no puede leerse el bloque de claves original: %s\n"
 
-#: g10/import.c:435 g10/import.c:547 g10/import.c:651
+#: g10/import.c:437 g10/import.c:549 g10/import.c:655
 msgid "writing keyblock\n"
 msgstr "escribiendo bloque de claves\n"
 
-#: g10/import.c:441 g10/import.c:657
+#: g10/import.c:443 g10/import.c:661
 #, c-format
 msgid "can't write keyblock: %s\n"
 msgstr "no puede escribirse el bloque de claves: %s\n"
 
-#: g10/import.c:446
+#: g10/import.c:448
 #, c-format
 msgid "key %08lX: 1 new user-id\n"
 msgstr "clave %08lX: 1 nuevo identificativo de usuario\n"
 
-#: g10/import.c:449
+#: g10/import.c:451
 #, c-format
 msgid "key %08lX: %d new user-ids\n"
 msgstr "clave %08lX: %d nuevos identificativos de usuario\n"
 
-#: g10/import.c:452
+#: g10/import.c:454
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "clave %08lX: 1 nueva firma\n"
 
-#: g10/import.c:455
+#: g10/import.c:457
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "clave %08lX: %d nuevas firmas\n"
 
-#: g10/import.c:458
+#: g10/import.c:460
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "clave %08lX: 1 nueva sub-clave\n"
 
-#: g10/import.c:461
+#: g10/import.c:463
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "clave %08lX: %d nuevas sub-claves\n"
 
-#: g10/import.c:471
+#: g10/import.c:473
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "clave %08lX: sin cambios\n"
 
-#: g10/import.c:550
+#: g10/import.c:552
 #, c-format
 msgid "can't lock secret keyring: %s\n"
 msgstr "no puede bloquearse el anillo secreto: %s\n"
 
-#: g10/import.c:553
+#: g10/import.c:555
 #, c-format
 msgid "can't write keyring: %s\n"
 msgstr "no puede escribirse el anillo: %s\n"
 
-#. we are ready
-#: g10/import.c:556
+#: g10/import.c:559
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "clave %08lX: clave secreta importata\n"
 
 #. we can't merge secret keys
-#: g10/import.c:560
+#: g10/import.c:564
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "clave %08lX: ya estaba en el anillo secreto\n"
 
-#: g10/import.c:565
+#: g10/import.c:569
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "clave %08lX: clave secreta no encontrada: %s\n"
 
-#: g10/import.c:594
+#: g10/import.c:598
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "clave %08lX: falta la clave p�blica - imposibile applicar el\n"
 "certificado de revocaci�n\n"
 
-#: g10/import.c:627
+#: g10/import.c:631
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "clave %08lX: certificado de revocaci�n no v�lido: %s - rechazado\n"
 
-#: g10/import.c:661
+#: g10/import.c:665
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "clave %08lX: certificado de revocaci�n importado\n"
 
-#: g10/import.c:695
+#: g10/import.c:699
 #, c-format
 msgid "key %08lX: no user-id for signature\n"
 msgstr "clave %08lX: no hay identificativo de usuario para la firma\n"
 
-#: g10/import.c:702 g10/import.c:727
+#: g10/import.c:706 g10/import.c:731
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "clave %08lX: algoritmo da clave p�blica no soportado\n"
 
-#: g10/import.c:703
+#: g10/import.c:707
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "clave %08lX: autofirma no v�lida\n"
 
-#: g10/import.c:719
+#: g10/import.c:723
 #, fuzzy, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "clave %08lX.%lu: buena uni�n de sub-clave\n"
 
-#: g10/import.c:728
+#: g10/import.c:732
 #, fuzzy, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "clave %08lX.%lu: uni�n de sub-clave no v�lida\n"
 
-#: g10/import.c:760
+#: g10/import.c:764
 #, c-format
 msgid "key %08lX: skipped userid '"
 msgstr "clave %08lX: ignorado identificativo de usuario '"
 
-#: g10/import.c:780
+#: g10/import.c:787
 #, fuzzy, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "clave %08lX: 1 nueva sub-clave\n"
 
-#: g10/import.c:800
+#. here we violate the rfc a bit by still allowing
+#. * to import non-exportable signature when we have the
+#. * the secret key used to create this signature - it
+#. * seems that this makes sense
+#: g10/import.c:812
 #, fuzzy, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr ""
 "clave %08lX: certificado de revocaci�n en lugar equivocado - ignorado\n"
 
-#: g10/import.c:809
+#: g10/import.c:821
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "clave %08lX: certificado de revocaci�n en lugar equivocado - ignorado\n"
 
-#: g10/import.c:817
+#: g10/import.c:829
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "clave %08lX: certificado de revocaci�n no valido: %s - ignorado\n"
 
-#: g10/import.c:878
+#: g10/import.c:890
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "clave %08lX: certificado de revocaci�n a�adido\n"
 
-#: g10/import.c:992 g10/import.c:1047
+#: g10/import.c:1008 g10/import.c:1063
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "clave %08lX: nuestra copia no tiene autofirma\n"
 
-#: g10/keyedit.c:88
+#: g10/keyedit.c:91
 #, c-format
 msgid "%s: user not found\n"
 msgstr "%s: usuario no encontrado\n"
 
-#: g10/keyedit.c:171
+#: g10/keyedit.c:177
+msgid "[revocation]"
+msgstr ""
+
+#: g10/keyedit.c:178
 msgid "[self-signature]"
 msgstr "[autofirma]"
 
-#: g10/keyedit.c:189
+#: g10/keyedit.c:196
 msgid "1 bad signature\n"
 msgstr "1 firma incorrecta\n"
 
-#: g10/keyedit.c:191
+#: g10/keyedit.c:198
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d firmas incorrectas\n"
 
-#: g10/keyedit.c:193
+#: g10/keyedit.c:200
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 firma no comprobada por falta de clave\n"
 
-#: g10/keyedit.c:195
+#: g10/keyedit.c:202
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d firmas no comprobadas por falta de clave\n"
 
-#: g10/keyedit.c:197
+#: g10/keyedit.c:204
 msgid "1 signature not checked due to an error\n"
 msgstr "1 firma no comprobada por causa de un error\n"
 
-#: g10/keyedit.c:199
+#: g10/keyedit.c:206
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d firmas no comprobadas por causa de un error\n"
 
-#: g10/keyedit.c:201
+#: g10/keyedit.c:208
 msgid "1 user id without valid self-signature detected\n"
 msgstr "Detectado 1 identificativo de usuario sin autofirma v�lida\n"
 
-#: g10/keyedit.c:203
+#: g10/keyedit.c:210
 #, c-format
 msgid "%d user ids without valid self-signatures detected\n"
 msgstr "Detectados %d identificativos de usuario sin autofirma v�lida\n"
 
-#: g10/keyedit.c:281
+#. Fixme: see whether there is a revocation in which
+#. * case we should allow to sign it again.
+#: g10/keyedit.c:290
 #, c-format
 msgid "Already signed by key %08lX\n"
 msgstr "Ya firmada por la clave %08lX\n"
 
-#: g10/keyedit.c:289
+#: g10/keyedit.c:298
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Nada que firmar con la clave %08lX\n"
 
-#: g10/keyedit.c:298
+#: g10/keyedit.c:307
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -1768,35 +1799,35 @@ msgstr ""
 "�Est� realmente seguro de querer firmar esta clave\n"
 "con su clave: \""
 
-#: g10/keyedit.c:307
+#: g10/keyedit.c:316
 msgid ""
 "The signature will be marked as non-exportable.\n"
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:309
+#: g10/keyedit.c:321
 msgid "Really sign? "
 msgstr "�Firmar de verdad? "
 
-#: g10/keyedit.c:335 g10/sign.c:75
+#: g10/keyedit.c:347 g10/keyedit.c:1684 g10/keyedit.c:1733 g10/sign.c:75
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallida: %s\n"
 
-#: g10/keyedit.c:388
+#: g10/keyedit.c:400
 msgid "This key is not protected.\n"
 msgstr "Esta clave no est� protegida.\n"
 
-#: g10/keyedit.c:391
+#: g10/keyedit.c:403
 msgid "Key is protected.\n"
 msgstr "La clave est� protegida.\n"
 
-#: g10/keyedit.c:408
+#: g10/keyedit.c:420
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "No puede editarse esta clave: %s\n"
 
-#: g10/keyedit.c:413
+#: g10/keyedit.c:425
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -1804,7 +1835,7 @@ msgstr ""
 "Introduzca la nueva contrase�a para esta clave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:425
+#: g10/keyedit.c:437
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -1812,380 +1843,449 @@ msgstr ""
 "No ha especificado contrase�a. Esto es probablemente una *mala* idea.\n"
 "\n"
 
-#: g10/keyedit.c:428
+#: g10/keyedit.c:440
 msgid "Do you really want to do this? "
 msgstr "�Realmente quiere hacer esto? "
 
-#: g10/keyedit.c:487
+#: g10/keyedit.c:499
 msgid "moving a key signature to the correct place\n"
 msgstr "moviendo la firma de la clave al lugar correcto\n"
 
-#: g10/keyedit.c:523
+#: g10/keyedit.c:535
 msgid "quit"
 msgstr ""
 
-#: g10/keyedit.c:523
+#: g10/keyedit.c:535
 msgid "quit this menu"
 msgstr "sale de este men�"
 
-#: g10/keyedit.c:524
+#: g10/keyedit.c:536
 msgid "q"
 msgstr ""
 
-#: g10/keyedit.c:525
+#: g10/keyedit.c:537
 msgid "save"
 msgstr ""
 
-#: g10/keyedit.c:525
+#: g10/keyedit.c:537
 msgid "save and quit"
 msgstr "graba y sale"
 
-#: g10/keyedit.c:526
+#: g10/keyedit.c:538
 msgid "help"
 msgstr ""
 
-#: g10/keyedit.c:526
+#: g10/keyedit.c:538
 msgid "show this help"
 msgstr "muestra esta ayuda"
 
-#: g10/keyedit.c:528
+#: g10/keyedit.c:540
 msgid "fpr"
 msgstr ""
 
-#: g10/keyedit.c:528
+#: g10/keyedit.c:540
 msgid "show fingerprint"
 msgstr "muestra huella dactilar"
 
-#: g10/keyedit.c:529
+#: g10/keyedit.c:541
 msgid "list"
 msgstr ""
 
-#: g10/keyedit.c:529
+#: g10/keyedit.c:541
 msgid "list key and user ids"
 msgstr "lista clave e identificativos de usuario"
 
-#: g10/keyedit.c:530
+#: g10/keyedit.c:542
 msgid "l"
 msgstr ""
 
-#: g10/keyedit.c:531
+#: g10/keyedit.c:543
 msgid "uid"
 msgstr ""
 
-#: g10/keyedit.c:531
+#: g10/keyedit.c:543
 msgid "select user id N"
 msgstr "selecciona identificativo de usuario N"
 
-#: g10/keyedit.c:532
+#: g10/keyedit.c:544
 msgid "key"
 msgstr ""
 
-#: g10/keyedit.c:532
+#: g10/keyedit.c:544
 msgid "select secondary key N"
 msgstr "selecciona clave secundaria N"
 
-#: g10/keyedit.c:533
+#: g10/keyedit.c:545
 msgid "check"
 msgstr ""
 
-#: g10/keyedit.c:533
+#: g10/keyedit.c:545
 msgid "list signatures"
 msgstr "lista firmas"
 
-#: g10/keyedit.c:534
+#: g10/keyedit.c:546
 msgid "c"
 msgstr ""
 
-#: g10/keyedit.c:535
+#: g10/keyedit.c:547
 msgid "sign"
 msgstr ""
 
-#: g10/keyedit.c:535
+#: g10/keyedit.c:547
 msgid "sign the key"
 msgstr "firma la clave"
 
-#: g10/keyedit.c:536
+#: g10/keyedit.c:548
 msgid "s"
 msgstr ""
 
-#: g10/keyedit.c:537
+#: g10/keyedit.c:549
 #, fuzzy
 msgid "lsign"
 msgstr "firmando:"
 
-#: g10/keyedit.c:537
+#: g10/keyedit.c:549
 #, fuzzy
 msgid "sign the key locally"
 msgstr "firma la clave"
 
-#: g10/keyedit.c:538
+#: g10/keyedit.c:550
 msgid "debug"
 msgstr ""
 
-#: g10/keyedit.c:539
+#: g10/keyedit.c:551
 msgid "adduid"
 msgstr ""
 
-#: g10/keyedit.c:539
+#: g10/keyedit.c:551
 msgid "add a user id"
 msgstr "a�ade un identificativo de usuario"
 
-#: g10/keyedit.c:540
+#: g10/keyedit.c:552
 msgid "deluid"
 msgstr ""
 
-#: g10/keyedit.c:540
+#: g10/keyedit.c:552
 msgid "delete user id"
 msgstr "borra un identificativo de usuario"
 
-#: g10/keyedit.c:541
+#: g10/keyedit.c:553
 msgid "addkey"
 msgstr ""
 
-#: g10/keyedit.c:541
+#: g10/keyedit.c:553
 msgid "add a secondary key"
 msgstr "a�ade una clave secundaria"
 
-#: g10/keyedit.c:542
+#: g10/keyedit.c:554
 msgid "delkey"
 msgstr ""
 
-#: g10/keyedit.c:542
+#: g10/keyedit.c:554
 msgid "delete a secondary key"
 msgstr "borra una clave secundaria"
 
-#: g10/keyedit.c:543
+#: g10/keyedit.c:555
 msgid "expire"
 msgstr ""
 
-#: g10/keyedit.c:543
+#: g10/keyedit.c:555
 msgid "change the expire date"
 msgstr "cambia fecha de caducidad"
 
-#: g10/keyedit.c:544
+#: g10/keyedit.c:556
 msgid "toggle"
 msgstr ""
 
-#: g10/keyedit.c:544
+#: g10/keyedit.c:556
 msgid "toggle between secret and public key listing"
 msgstr "cambia entre lista de claves secretas y p�blicas"
 
-#: g10/keyedit.c:546
+#: g10/keyedit.c:558
 msgid "t"
 msgstr ""
 
-#: g10/keyedit.c:547
+#: g10/keyedit.c:559
 msgid "pref"
 msgstr ""
 
-#: g10/keyedit.c:547
+#: g10/keyedit.c:559
 msgid "list preferences"
 msgstr "muestra preferencias"
 
-#: g10/keyedit.c:548
+#: g10/keyedit.c:560
 msgid "passwd"
 msgstr ""
 
-#: g10/keyedit.c:548
+#: g10/keyedit.c:560
 msgid "change the passphrase"
 msgstr "cambia la contrase�a"
 
-#: g10/keyedit.c:549
+#: g10/keyedit.c:561
 msgid "trust"
 msgstr ""
 
-#: g10/keyedit.c:549
+#: g10/keyedit.c:561
 msgid "change the ownertrust"
 msgstr "cambia valores de confianza"
 
-#: g10/keyedit.c:568
+#: g10/keyedit.c:562
+msgid "revsig"
+msgstr ""
+
+#: g10/keyedit.c:562
+#, fuzzy
+msgid "revoke signatures"
+msgstr "fuerza firmas v3"
+
+#: g10/keyedit.c:563
+msgid "revkey"
+msgstr ""
+
+#: g10/keyedit.c:563
+#, fuzzy
+msgid "revoke a secondary key"
+msgstr "borra una clave secundaria"
+
+#: g10/keyedit.c:582
 msgid "can't do that in batchmode\n"
 msgstr "imposible hacer esto en modo de proceso por lotes\n"
 
 #. check that they match
 #. FIXME: check that they both match
-#: g10/keyedit.c:595
+#: g10/keyedit.c:609
 msgid "Secret key is available.\n"
 msgstr "Clave secreta disponible.\n"
 
-#: g10/keyedit.c:624
+#: g10/keyedit.c:638
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/keyedit.c:651
+#: g10/keyedit.c:665
 msgid "Need the secret key to do this.\n"
 msgstr "Se necesita la clave secreta para hacer esto\n"
 
-#: g10/keyedit.c:673
+#: g10/keyedit.c:687
 msgid "Save changes? "
 msgstr "�Grabar cambios? "
 
-#: g10/keyedit.c:676
+#: g10/keyedit.c:690
 msgid "Quit without saving? "
 msgstr "�Salir sin grabar? "
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:700
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualizaci�n fallida: %s\n"
 
-#: g10/keyedit.c:693
+#: g10/keyedit.c:707
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "actualizaci�n de la clave secreta fallida: %s\n"
 
-#: g10/keyedit.c:700
+#: g10/keyedit.c:714
 msgid "Key not changed so no update needed.\n"
 msgstr "Clave sin cambios, no se necesita actualizaci�n.\n"
 
-#: g10/keyedit.c:703 g10/keyedit.c:762
+#: g10/keyedit.c:717 g10/keyedit.c:776
 #, c-format
 msgid "update of trustdb failed: %s\n"
 msgstr "actualizaci�n de confianza fallida: %s\n"
 
-#: g10/keyedit.c:736
+#: g10/keyedit.c:750
 msgid "Really sign all user ids? "
 msgstr "�Firmar realmente todos los identificativos de usuario? "
 
-#: g10/keyedit.c:737
+#: g10/keyedit.c:751
 msgid "Hint: Select the user ids to sign\n"
 msgstr "Sugerencia: seleccione los identificativos de usuario a firmar\n"
 
-#: g10/keyedit.c:773
+#: g10/keyedit.c:787
 msgid "You must select at least one user id.\n"
 msgstr "Debe seleccionar por lo menos un identificativo de usuario.\n"
 
-#: g10/keyedit.c:775
+#: g10/keyedit.c:789
 msgid "You can't delete the last user id!\n"
 msgstr "�No puede borrar el �ltimo identificativo de usuario!\n"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:792
 msgid "Really remove all selected user ids? "
 msgstr "�Borrar realmente todos los identificativos seleccionados? "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:793
 msgid "Really remove this user id? "
 msgstr "�Borrar realmente este identificativo? "
 
-#: g10/keyedit.c:802
+#: g10/keyedit.c:816 g10/keyedit.c:838
 msgid "You must select at least one key.\n"
 msgstr "Debe seleccionar por lo menos una clave.\n"
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:820
 msgid "Do you really want to delete the selected keys? "
 msgstr "�Borrar realmente las claves seleccionadas? "
 
-#: g10/keyedit.c:807
+#: g10/keyedit.c:821
 msgid "Do you really want to delete this key? "
 msgstr "�Borrar realmente esta clave? "
 
-#: g10/keyedit.c:854
+#: g10/keyedit.c:842
+#, fuzzy
+msgid "Do you really want to revoke the selected keys? "
+msgstr "�Borrar realmente las claves seleccionadas? "
+
+#: g10/keyedit.c:843
+#, fuzzy
+msgid "Do you really want to revoke this key? "
+msgstr "�Borrar realmente esta clave? "
+
+#: g10/keyedit.c:897
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando no v�lido (pruebe \"help\")\n"
 
-#: g10/keyedit.c:1232
+#: g10/keyedit.c:1289
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor, quite la selecci�n de las claves secretas.\n"
 
-#: g10/keyedit.c:1238
+#: g10/keyedit.c:1295
 msgid "Please select at most one secondary key.\n"
 msgstr "Por favor, seleccione como m�ximo una clave secundaria\n"
 
-#: g10/keyedit.c:1242
+#: g10/keyedit.c:1299
 msgid "Changing exiration time for a secondary key.\n"
 msgstr "Cambiando caducidad de clave secundaria.\n"
 
-#: g10/keyedit.c:1244
+#: g10/keyedit.c:1301
 msgid "Changing exiration time for the primary key.\n"
 msgstr "Cambiando caducidad de clave primaria.\n"
 
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1342
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "No puede cambiar la fecha de caducidad de una clave v3\n"
 
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1358
 msgid "No corresponding signature in secret ring\n"
 msgstr "No hay firma correspondiente en anillo secreto\n"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1418
 #, c-format
 msgid "No user id with index %d\n"
 msgstr "No hay ning�n identificativo de usuario con el �ndice %d\n"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1464
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "No hay ninguna clave secundaria con el �ndice %d\n"
 
-#: g10/mainproc.c:184
+#: g10/keyedit.c:1562
+#, fuzzy
+msgid "user ID: \""
+msgstr "Introduzca el ID de usuario: "
+
+#: g10/keyedit.c:1565
+#, fuzzy, c-format
+msgid ""
+"\"\n"
+"signed with your key %08lX at %s\n"
+msgstr "Nada que firmar con la clave %08lX\n"
+
+#: g10/keyedit.c:1569
+#, fuzzy
+msgid "Create a revocation certificate for this signature? (y/N)"
+msgstr "genera un certificado de revocaci�n"
+
+#: g10/keyedit.c:1649
+#, fuzzy
+msgid "Really create the revocation certificates? (y/N)"
+msgstr "genera un certificado de revocaci�n"
+
+#: g10/keyedit.c:1672
+#, fuzzy
+msgid "no secret key\n"
+msgstr "Clave secreta incorrecta"
+
+#: g10/mainproc.c:185
 #, fuzzy, c-format
 msgid "public key is %08lX\n"
 msgstr "Clave p�blica no encontrada"
 
-#: g10/mainproc.c:212
+#: g10/mainproc.c:213
 msgid "public key encrypted data: good DEK\n"
 msgstr "datos cifrados de la clave p�blica: DEK bueno\n"
 
 #. fixme: defer this message until we have parsed all packets of
 #. * this type - do this by building a list of keys with their stati
-#. * and store it with the conetxt.  do_proc_packets can then use
+#. * and store it with the context.  do_proc_packets can then use
 #. * this list to display some information
-#: g10/mainproc.c:219
+#: g10/mainproc.c:220
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "descifrado de la clave p�blica fallido: %s\n"
 
-#: g10/mainproc.c:246
+#: g10/mainproc.c:249
 msgid "decryption okay\n"
 msgstr "descifrado correcto\n"
 
-#: g10/mainproc.c:249
+#: g10/mainproc.c:253
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "descifrado fallido: %s\n"
 
-#: g10/mainproc.c:266
+#: g10/mainproc.c:270
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "nota: el remitente solicit� \"s�lo-para-tus-ojos\"\n"
 
-#: g10/mainproc.c:268
+#: g10/mainproc.c:272
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nombre fichero original='%.*s'\n"
 
-#: g10/mainproc.c:849
+#: g10/mainproc.c:876
 msgid "signature verification suppressed\n"
 msgstr "suprimida la verificaci�n de la firma\n"
 
-#: g10/mainproc.c:855
+#: g10/mainproc.c:883
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Firma creada %.*s usando identificativo de clave %s %08lX\n"
 
+#: g10/mainproc.c:895
+#, fuzzy
+msgid "encrypted message is valid\n"
+msgstr "el algoritmo de resumen seleccionado no es v�lido\n"
+
+#: g10/mainproc.c:899
+msgid "WARNING: encrypted message has been manipulated!\n"
+msgstr ""
+
+#: g10/mainproc.c:904
+#, fuzzy, c-format
+msgid "Can't check MDC: %s\n"
+msgstr "Imposible comprobar la firma: %s\n"
+
 #. just in case that we have no userid
-#: g10/mainproc.c:881 g10/mainproc.c:892
+#: g10/mainproc.c:925 g10/mainproc.c:936
 msgid "BAD signature from \""
 msgstr "Firma INCORRECTA de \""
 
-#: g10/mainproc.c:882 g10/mainproc.c:893
+#: g10/mainproc.c:926 g10/mainproc.c:937
 msgid "Good signature from \""
 msgstr "Firma correcta de \""
 
-#: g10/mainproc.c:884
+#: g10/mainproc.c:928
 #, fuzzy
 msgid "                aka \""
 msgstr "                       importadas: %lu"
 
-#: g10/mainproc.c:930
+#: g10/mainproc.c:974
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposible comprobar la firma: %s\n"
 
-#: g10/mainproc.c:1003
+#: g10/mainproc.c:1047
 msgid "old style (PGP 2.x) signature\n"
 msgstr "firma viejo estilo (PGP 2.x)\n"
 
-#: g10/mainproc.c:1008
+#: g10/mainproc.c:1052
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquete ra�z no v�lido detectado en proc_tree()\n"
 
@@ -2210,7 +2310,7 @@ msgstr ""
 "Las claves RSA est�n en desuso, considere la creaci�n de una nueva clave "
 "para futuros usos\n"
 
-#: g10/misc.c:235
+#: g10/misc.c:236
 msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr ""
 "este algoritmo de cifrado est� en desuso; considere el uso de uno m�s "
@@ -2226,7 +2326,7 @@ msgstr "no puedo manejar el algoritmo de clave p�blica %d\n"
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "el sub-paquete de tipo %d tiene el bit cr�tico activado\n"
 
-#: g10/passphrase.c:151
+#: g10/passphrase.c:157
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2236,21 +2336,21 @@ msgstr ""
 "Necesita una contrase�a para desbloquear la clave secreta\n"
 "del usuario: \""
 
-#: g10/passphrase.c:160
+#: g10/passphrase.c:166
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "clave %2$s de %1$u bits, ID %3$08lX, creada el %4$s"
 
-#: g10/passphrase.c:165
+#: g10/passphrase.c:171
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr "(ID clave primaria %08lX)"
 
-#: g10/passphrase.c:184
+#: g10/passphrase.c:190
 msgid "Enter passphrase: "
 msgstr "Introduzca contrase�a: "
 
-#: g10/passphrase.c:188
+#: g10/passphrase.c:194
 msgid "Repeat passphrase: "
 msgstr "Repita contrase�a: "
 
@@ -2289,42 +2389,47 @@ msgstr "la codificaci�n vieja de DEK no est� soportada\n"
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr "nota: algoritmo de cifrado %d no encontrado en las preferencias\n"
 
-#: g10/seckey-cert.c:57
+#: g10/seckey-cert.c:55
 #, c-format
 msgid "protection algorithm %d is not supported\n"
 msgstr "el algoritmo de protecci�n %d no est� soportado\n"
 
-#: g10/seckey-cert.c:177
+#: g10/seckey-cert.c:171
 msgid "Invalid passphrase; please try again ...\n"
 msgstr "Contrase�a incorrecta, int�ntelo de nuevo...\n"
 
-#: g10/seckey-cert.c:232
+#: g10/seckey-cert.c:227
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "Aviso: detectada clave d�bil - por favor cambie la contrase�a.\n"
 
-#: g10/sig-check.c:195
+#: g10/sig-check.c:186
+#, fuzzy
+msgid "assuming bad MDC due to an unknown critical bit\n"
+msgstr "asumiendo firma mala debido a un bit cr�tico desconocido\n"
+
+#: g10/sig-check.c:282
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "�esto es una clave ElGamal generada por PGP que NO es segura para las "
 "firmas!\n"
 
-#: g10/sig-check.c:203
+#: g10/sig-check.c:290
 #, fuzzy, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "lid %lu: identificativo de usuario sin firma\n"
 
-#: g10/sig-check.c:204
+#: g10/sig-check.c:291
 #, fuzzy, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "lid %lu: identificativo de usuario sin firma\n"
 
-#: g10/sig-check.c:220
+#: g10/sig-check.c:307
 #, c-format
 msgid "NOTE: signature key expired %s\n"
 msgstr "atenci�n: clave de la firma caducada el %s\n"
 
-#: g10/sig-check.c:277
+#: g10/sig-check.c:364
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "asumiendo firma mala debido a un bit cr�tico desconocido\n"
 
@@ -2333,7 +2438,7 @@ msgstr "asumiendo firma mala debido a un bit cr�tico desconocido\n"
 msgid "%s signature from: %s\n"
 msgstr "firma %s de %s\n"
 
-#: g10/sign.c:210 g10/sign.c:493
+#: g10/sign.c:210 g10/sign.c:496
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "no puede crearse `%s': %s\n"
@@ -2342,11 +2447,6 @@ msgstr "no puede crearse `%s': %s\n"
 msgid "signing:"
 msgstr "firmando:"
 
-#: g10/sign.c:346
-#, c-format
-msgid "WARNING: `%s' is an empty file\n"
-msgstr "atenci�n: '%s' es un fichero vac�o\n"
-
 #: g10/textfilter.c:122
 #, fuzzy, c-format
 msgid "can't handle text lines longer than %d characters\n"
@@ -2357,12 +2457,12 @@ msgstr "armadura inv�lida: l�nea m�s larga de %d caracteres\n"
 msgid "input line longer than %d characters\n"
 msgstr "armadura inv�lida: l�nea m�s larga de %d caracteres\n"
 
-#: g10/tdbio.c:116 g10/tdbio.c:1504
+#: g10/tdbio.c:116 g10/tdbio.c:1505
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "registro base de datos de confianza %lu: lseek fallido: %s\n"
 
-#: g10/tdbio.c:122 g10/tdbio.c:1511
+#: g10/tdbio.c:122 g10/tdbio.c:1512
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
@@ -2392,12 +2492,12 @@ msgstr "%s: se ha creado el directorio\n"
 msgid "%s: directory does not exist!\n"
 msgstr "%s: el directorio no existe\n"
 
-#: g10/openfile.c:111 g10/openfile.c:181 g10/ringedit.c:1325 g10/tdbio.c:457
+#: g10/openfile.c:111 g10/openfile.c:181 g10/ringedit.c:1344 g10/tdbio.c:457
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: no puede crearse: %s\n"
 
-#: g10/tdbio.c:472 g10/tdbio.c:520
+#: g10/tdbio.c:472 g10/tdbio.c:521
 #, fuzzy, c-format
 msgid "%s: can't create lock\n"
 msgstr "%s: no puede crearse: %s\n"
@@ -2412,83 +2512,83 @@ msgstr "%s: fallo en la creaci�n del registro de versi�n: %s"
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: se ha creado base de datos de confianza no v�lida\n"
 
-#: g10/tdbio.c:492
+#: g10/tdbio.c:493
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: se ha creado base de datos de confianza\n"
 
-#: g10/tdbio.c:529
+#: g10/tdbio.c:530
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: base de datos de confianza no v�lida\n"
 
-#: g10/tdbio.c:562
+#: g10/tdbio.c:563
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: fallo en la creaci�n de la tabla hash: %s\n"
 
-#: g10/tdbio.c:570
+#: g10/tdbio.c:571
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: error actualizando el registro de versi�n: %s\n"
 
-#: g10/tdbio.c:586 g10/tdbio.c:625 g10/tdbio.c:647 g10/tdbio.c:677
-#: g10/tdbio.c:702 g10/tdbio.c:1437 g10/tdbio.c:1464
+#: g10/tdbio.c:587 g10/tdbio.c:626 g10/tdbio.c:648 g10/tdbio.c:678
+#: g10/tdbio.c:703 g10/tdbio.c:1438 g10/tdbio.c:1465
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: error lectura registro de versi�n: %s\n"
 
-#: g10/tdbio.c:599 g10/tdbio.c:658
+#: g10/tdbio.c:600 g10/tdbio.c:659
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: error escritura registro de versi�n: %s\n"
 
-#: g10/tdbio.c:1131
+#: g10/tdbio.c:1132
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "base de datos de confianza: fallo lseek: %s\n"
 
-#: g10/tdbio.c:1139
+#: g10/tdbio.c:1140
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "base de datos de confianza: error lectura (n=%d): %s\n"
 
-#: g10/tdbio.c:1160
+#: g10/tdbio.c:1161
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: no es una base de datos de confianza\n"
 
-#: g10/tdbio.c:1176
+#: g10/tdbio.c:1177
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: registro de versi�n con numero de registro %lu\n"
 
-#: g10/tdbio.c:1181
+#: g10/tdbio.c:1182
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: versi�n del fichero %d no v�lida\n"
 
-#: g10/tdbio.c:1470
+#: g10/tdbio.c:1471
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: error lectura registro libre: %s\n"
 
-#: g10/tdbio.c:1478
+#: g10/tdbio.c:1479
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: error escritura registro de directorio: %s\n"
 
-#: g10/tdbio.c:1488
+#: g10/tdbio.c:1489
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: fallo en poner a cero un registro: %s\n"
 
-#: g10/tdbio.c:1518
+#: g10/tdbio.c:1519
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: fallo al a�adir un registro: %s\n"
 
-#: g10/tdbio.c:1629
+#: g10/tdbio.c:1630
 msgid "The trustdb is corrupted; please run \"gpgm --fix-trustdb\".\n"
 msgstr ""
 "La base de datos de confianza est� da�ada. Por favor, ejecute\n"
@@ -2713,7 +2813,7 @@ msgstr "demasiadas preferencias"
 msgid "Too many preference items"
 msgstr "demasiados items de preferencias"
 
-#: g10/trustdb.c:1549 g10/trustdb.c:3045 g10/trustdb.c:3075
+#: g10/trustdb.c:1549 g10/trustdb.c:3075 g10/trustdb.c:3105
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "ATENC�ON: todav�a no puedo tratar registros de preferencias largos\n"
 
@@ -2881,22 +2981,22 @@ msgstr "clave %08lX.%lu: caducada el %s\n"
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "clave %08lX.%lu: comprobaci�n de confianza fallida: %s\n"
 
-#: g10/trustdb.c:2851
+#: g10/trustdb.c:2881
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "usuario '%s' no encontrado: %s\n"
 
-#: g10/trustdb.c:2853
+#: g10/trustdb.c:2883
 #, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "problema buscando '%s' en la tabla de confianza: %s\n"
 
-#: g10/trustdb.c:2856
+#: g10/trustdb.c:2886
 #, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr "usuario '%s' no est� en la tabla de confianza - insertando\n"
 
-#: g10/trustdb.c:2859
+#: g10/trustdb.c:2889
 #, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "fallo al poner '%s' en la tabla de confianza: %s\n"
@@ -2906,26 +3006,26 @@ msgstr "fallo al poner '%s' en la tabla de confianza: %s\n"
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s: no se puede crear el anillo: %s\n"
 
-#: g10/ringedit.c:322 g10/ringedit.c:1330
+#: g10/ringedit.c:333 g10/ringedit.c:1349
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: anillo creado\n"
 
-#: g10/ringedit.c:1507
+#: g10/ringedit.c:1526
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "ATENCI�N: existen 2 ficheros con informaci�n confidencial.\n"
 
-#: g10/ringedit.c:1508
+#: g10/ringedit.c:1527
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s es el que no se ha modificado\n"
 
-#: g10/ringedit.c:1509
+#: g10/ringedit.c:1528
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s es el nuevo\n"
 
-#: g10/ringedit.c:1510
+#: g10/ringedit.c:1529
 msgid "Please fix this possible security flaw\n"
 msgstr "Por favor arregle este posible fallo de seguridad\n"
 
@@ -2971,17 +3071,17 @@ msgstr "asumiendo que hay datos firmados en `%s'\n"
 msgid "%s: new options file created\n"
 msgstr "%s: se ha creado un nuevo fichero de opciones\n"
 
-#: g10/encr-data.c:59
+#: g10/encr-data.c:60
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "datos cifrados %s\n"
 
-#: g10/encr-data.c:61
+#: g10/encr-data.c:62
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrado con algoritmo desconocido %d\n"
 
-#: g10/encr-data.c:74
+#: g10/encr-data.c:77
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
@@ -3120,6 +3220,19 @@ msgstr "Ayuda no disponible"
 msgid "No help available for `%s'"
 msgstr "Ayuda no disponible para `%s'"
 
+#~ msgid "Usage: gpgm [options] [files] (-h for help)"
+#~ msgstr "Uso: gpgm [opciones] [ficheros] (-h para ayuda)"
+
+#~ msgid ""
+#~ "Syntax: gpgm [options] [files]\n"
+#~ "GnuPG maintenance utility\n"
+#~ msgstr ""
+#~ "Sintaxis: gpgm [opciones] [ficheros]\n"
+#~ "Utilidad de mantenimiento de GnuPG\n"
+
+#~ msgid "usage: gpgm [options] "
+#~ msgstr "uso: gpgm [opciones] "
+
 #~ msgid "|KEYID|ulimately trust this key"
 #~ msgstr "|ID-CLAVE|conf�a plenamente en esta clave"
 
@@ -3202,9 +3315,6 @@ msgstr "Ayuda no disponible para `%s'"
 #~ msgid "did not use primary key for insert_trust_record()\n"
 #~ msgstr "no se us� clave primaria para insert_trust_record()\n"
 
-#~ msgid "use this user-id for encryption"
-#~ msgstr "usa este usuario para cifrar"
-
 #~ msgid "second"
 #~ msgstr "segundo"
 
diff --git a/po/fr.po b/po/fr.po
index 63cb38a8b..381124f82 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 0.9.4a\n"
-"POT-Creation-Date: 1999-03-20 20:04+0100\n"
+"POT-Creation-Date: 1999-05-06 13:37+0200\n"
 "PO-Revision-Date: 1999-03-20 20:09+01:00\n"
 "Last-Translator: Ga�l Qu�ri <[email protected]>\n"
 "Language-Team: French <[email protected]>\n"
@@ -27,11 +27,11 @@ msgstr ""
 msgid "(you may have used the wrong program for this task)\n"
 msgstr "(vous avez peut-�tre utilis� le mauvais programme pour cette tache)\n"
 
-#: util/miscutil.c:143
+#: util/miscutil.c:156
 msgid "yes"
 msgstr "oui"
 
-#: util/miscutil.c:144
+#: util/miscutil.c:157
 msgid "yY"
 msgstr "oO"
 
@@ -223,6 +223,11 @@ msgstr "URI non support�e"
 msgid "network error"
 msgstr "erreur de r�seau"
 
+#: util/errors.c:102
+#, fuzzy
+msgid "not encrypted"
+msgstr "donn�es chiffr�es avec %s\n"
+
 #: util/logger.c:178
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
@@ -233,12 +238,12 @@ msgstr "... c'est un bug (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "vous avez trouv� un bug ... (%s:%d)\n"
 
-#: cipher/random.c:403
+#: cipher/random.c:408
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr ""
 "ATTENTION : utilisation d'un g�n�rateur de nombres al�atoires peu s�r !!\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:409
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -252,7 +257,7 @@ msgstr ""
 "N'UTILISEZ PAS LES DONN�ES G�N�R�ES PAR CE PROGRAMME !!\n"
 "\n"
 
-#: cipher/rndlinux.c:114
+#: cipher/rndlinux.c:110
 #, c-format
 msgid ""
 "\n"
@@ -263,7 +268,7 @@ msgstr ""
 "Il n'y a pas assez d'octets al�atoires disponibles. Faites autre chose\n"
 "pour que l'OS puisse amasser plus d'entropie ! (il faut %d octets de plus)\n"
 
-#: g10/g10.c:165
+#: g10/g10.c:163
 msgid ""
 "@Commands:\n"
 " "
@@ -271,128 +276,133 @@ msgstr ""
 "@Commandes:\n"
 " "
 
-#: g10/g10.c:168
+#: g10/g10.c:165
 msgid "|[file]|make a signature"
 msgstr "|[fichier]|faire une signature"
 
-#: g10/g10.c:169
+#: g10/g10.c:166
 msgid "|[file]|make a clear text signature"
 msgstr "|[fichier]|faire une signature en texte clair"
 
-#: g10/g10.c:170
+#: g10/g10.c:167
 msgid "make a detached signature"
 msgstr "faire une signature d�tach�e"
 
-#: g10/g10.c:171
+#: g10/g10.c:168
 msgid "encrypt data"
 msgstr "chiffrer les donn�es"
 
-#: g10/g10.c:172
+#: g10/g10.c:169
 msgid "encryption only with symmetric cipher"
 msgstr "chiffrement sym�trique seulement"
 
-#: g10/g10.c:173
+#: g10/g10.c:170
 msgid "store only"
 msgstr "pas d'action"
 
-#: g10/g10.c:174
+#: g10/g10.c:171
 msgid "decrypt data (default)"
 msgstr "d�chiffrer les donn�es (d�faut)"
 
-#: g10/g10.c:175
+#: g10/g10.c:172
 msgid "verify a signature"
 msgstr "v�rifier une signature"
 
-#: g10/g10.c:177
+#: g10/g10.c:173
 msgid "list keys"
 msgstr "lister les cl�s"
 
-#: g10/g10.c:178
+#: g10/g10.c:175
 msgid "list keys and signatures"
 msgstr "lister les cl�s et les signatures"
 
-#: g10/g10.c:179
+#: g10/g10.c:176
 msgid "check key signatures"
 msgstr "v�rifier les signatures des cl�s"
 
-#: g10/g10.c:180
+#: g10/g10.c:177
 msgid "list keys and fingerprints"
 msgstr "lister les cl�s et les empreintes"
 
-#: g10/g10.c:181
+#: g10/g10.c:178
 msgid "list secret keys"
 msgstr "lister les cl�s secr�tes"
 
-#: g10/g10.c:183
+#: g10/g10.c:179
 msgid "generate a new key pair"
 msgstr "g�n�rer une nouvelle paire de cl�s"
 
-#: g10/g10.c:185
+#: g10/g10.c:180
 msgid "remove key from the public keyring"
 msgstr "enlever la cl� du porte-cl�s public"
 
-#: g10/g10.c:187
+#: g10/g10.c:181
 msgid "sign or edit a key"
 msgstr "signer ou �diter une cl�"
 
-#: g10/g10.c:188
+#: g10/g10.c:182
 msgid "generate a revocation certificate"
 msgstr "g�n�rer un certificat de r�vocation"
 
-#: g10/g10.c:190
+#: g10/g10.c:183
 msgid "export keys"
 msgstr "exporter les cl�s"
 
-#: g10/g10.c:191
+#: g10/g10.c:184
 msgid "export keys to a key server"
 msgstr "exporter les cl�s vers un serveur de cl�s"
 
-#: g10/g10.c:194
+#: g10/g10.c:185
+#, fuzzy
+msgid "import keys from a key server"
+msgstr "exporter les cl�s vers un serveur de cl�s"
+
+#: g10/g10.c:188
 msgid "import/merge keys"
 msgstr "importer/fusionner les cl�s"
 
-#: g10/g10.c:196
+#: g10/g10.c:190
 msgid "list only the sequence of packets"
 msgstr "ne lister que les paquets"
 
-#: g10/g10.c:199
+#: g10/g10.c:192
 msgid "export the ownertrust values"
 msgstr "exporter les indices de confiance"
 
-#: g10/g10.c:201
+#: g10/g10.c:194
 msgid "import ownertrust values"
 msgstr "importer les indices de confiance"
 
 #
-#: g10/g10.c:203
+#: g10/g10.c:196
 msgid "|[NAMES]|update the trust database"
 msgstr "|[NOMS]|mettre la base de confiance � jour"
 
-#: g10/g10.c:205
+#: g10/g10.c:198
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMS]|v�rifier la base de confiance"
 
-#: g10/g10.c:206
+#: g10/g10.c:199
 msgid "fix a corrupted trust database"
 msgstr "r�parer une base de confiance corrompue"
 
-#: g10/g10.c:207
+#: g10/g10.c:200
 msgid "De-Armor a file or stdin"
 msgstr "Enlever l'armure d'un fichier ou de stdin"
 
-#: g10/g10.c:208
+#: g10/g10.c:201
 msgid "En-Armor a file or stdin"
 msgstr "Mettre une armure � un fichier ou � stdin"
 
-#: g10/g10.c:209
+#: g10/g10.c:202
 msgid "|algo [files]|print message digests"
 msgstr "|alg. [fich.]|indiquer les fonctions de hachage"
 
-#: g10/g10.c:210
+#: g10/g10.c:203
 msgid "print all message digests"
 msgstr "�crire toutes les fonctions de hachage"
 
-#: g10/g10.c:217
+#: g10/g10.c:209
 msgid ""
 "@\n"
 "Options:\n"
@@ -402,145 +412,149 @@ msgstr ""
 "Options:\n"
 " "
 
-#: g10/g10.c:219
+#: g10/g10.c:211
 msgid "create ascii armored output"
 msgstr "cr�er une sortie ascii armur�e"
 
-#: g10/g10.c:220
+#: g10/g10.c:212
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOM|chiffrer pour NOM"
 
-#: g10/g10.c:225
+#: g10/g10.c:216
 msgid "use this user-id to sign or decrypt"
 msgstr "utiliser ce nom pour signer ou d�chiffrer"
 
-#: g10/g10.c:226
+#: g10/g10.c:217
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|niveau de compression N (0 d�sactive)"
 
-#: g10/g10.c:228
+#: g10/g10.c:219
 msgid "use canonical text mode"
 msgstr "utiliser le mode de texte canonique"
 
-#: g10/g10.c:230
+#: g10/g10.c:220
 msgid "use as output file"
 msgstr "utiliser comme fichier de sortie"
 
-#: g10/g10.c:231
+#: g10/g10.c:221
 msgid "verbose"
 msgstr "bavard"
 
-#: g10/g10.c:232
+#: g10/g10.c:222
 msgid "be somewhat more quiet"
 msgstr "devenir beaucoup plus silencieux"
 
 #
-#: g10/g10.c:233
+#: g10/g10.c:223
 msgid "force v3 signatures"
 msgstr "forcer les signatures en v3"
 
-#: g10/g10.c:234
+#: g10/g10.c:224
+msgid "always use a MDC for encryption"
+msgstr ""
+
+#: g10/g10.c:225
 msgid "do not make any changes"
 msgstr "ne rien changer"
 
-#: g10/g10.c:235
+#: g10/g10.c:226
 msgid "batch mode: never ask"
 msgstr "mode automatique : ne jamais rien demander"
 
-#: g10/g10.c:236
+#: g10/g10.c:227
 msgid "assume yes on most questions"
 msgstr "r�pondre oui � la plupart des questions"
 
-#: g10/g10.c:237
+#: g10/g10.c:228
 msgid "assume no on most questions"
 msgstr "r�pondre non � la plupart des questions"
 
-#: g10/g10.c:238
+#: g10/g10.c:229
 msgid "add this keyring to the list of keyrings"
 msgstr "ajouter ce porte-cl�s � la liste des porte-cl�s"
 
-#: g10/g10.c:239
+#: g10/g10.c:230
 msgid "add this secret keyring to the list"
 msgstr "ajouter ce porte-cl�s secret � la liste"
 
-#: g10/g10.c:240
+#: g10/g10.c:231
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOM|utiliser NOM comme cl� secr�te par d�faut"
 
-#: g10/g10.c:241
+#: g10/g10.c:232
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|H�TE|utiliser ce serveur pour chercher des cl�s"
 
-#: g10/g10.c:242
+#: g10/g10.c:233
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOM|le terminal utilise la table de caract�res NOM"
 
-#: g10/g10.c:243
+#: g10/g10.c:234
 msgid "read options from file"
 msgstr "lire les options du fichier"
 
-#: g10/g10.c:245
+#: g10/g10.c:236
 msgid "set debugging flags"
 msgstr "choisir les attributs de d�boguage"
 
-#: g10/g10.c:246
+#: g10/g10.c:237
 msgid "enable full debugging"
 msgstr "permettre un d�boguage complet"
 
-#: g10/g10.c:247
+#: g10/g10.c:238
 msgid "|FD|write status info to this FD"
 msgstr "|FD|�crire l'�tat sur ce descripteur"
 
-#: g10/g10.c:248
+#: g10/g10.c:239
 msgid "do not write comment packets"
 msgstr "ne pas �crire de paquets de commentaire"
 
-#: g10/g10.c:249
+#: g10/g10.c:240
 msgid "(default is 1)"
 msgstr "(1 par d�faut)"
 
-#: g10/g10.c:250
+#: g10/g10.c:241
 msgid "(default is 3)"
 msgstr "(3 par d�faut)"
 
-#: g10/g10.c:252
+#: g10/g10.c:243
 msgid "|FILE|load extension module FILE"
 msgstr "|FICH|charger le module d'extension FICH"
 
-#: g10/g10.c:253
+#: g10/g10.c:244
 msgid "emulate the mode described in RFC1991"
 msgstr "imiter le mode d�crit dans la RFC1991"
 
 # FIXMOI : faudra trouver mieux ...
-#: g10/g10.c:254
+#: g10/g10.c:245
 msgid "|N|use passphrase mode N"
 msgstr "|N|utiliser le mode de codage des mots de passe N"
 
-#: g10/g10.c:256
+#: g10/g10.c:247
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NOM|utiliser le hachage NOM pour les mots de passe"
 
-#: g10/g10.c:258
+#: g10/g10.c:249
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NOM|utiliser le chiffre NOM pour les mots de passe"
 
-#: g10/g10.c:260
+#: g10/g10.c:250
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOM|utiliser l'algorithme de chiffrement NOM"
 
-#: g10/g10.c:261
+#: g10/g10.c:251
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOM|utiliser la fonction de hachage NOM"
 
-#: g10/g10.c:262
+#: g10/g10.c:252
 msgid "|N|use compress algorithm N"
 msgstr "|N|utiliser l'algorithme de compression N"
 
-#: g10/g10.c:263
+#: g10/g10.c:253
 msgid "throw keyid field of encrypted packets"
 msgstr "supprimer l'identification des paquets chiffr�s"
 
-#: g10/g10.c:271
+#: g10/g10.c:255
 msgid ""
 "@\n"
 "Examples:\n"
@@ -560,28 +574,15 @@ msgstr ""
 " --list-keys [utilisateur]    montrer les cl�s\n"
 " --fingerprint [utilisateur]  montrer les empreintes\n"
 
-#: g10/g10.c:351
+#: g10/g10.c:323
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Rapporter toutes anomalies � <[email protected]>.\n"
 
-#: g10/g10.c:356
-msgid "Usage: gpgm [options] [files] (-h for help)"
-msgstr "Utilisation: gpgm [options] [fichiers] (-h pour l'aide)"
-
-#: g10/g10.c:358
+#: g10/g10.c:327
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#
-#: g10/g10.c:363
-msgid ""
-"Syntax: gpgm [options] [files]\n"
-"GnuPG maintenance utility\n"
-msgstr ""
-"Syntaxe: gpgm [options] [fichiers]\n"
-"utilitaire de maitenance de GnuPG\n"
-
-#: g10/g10.c:366
+#: g10/g10.c:330
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -591,7 +592,7 @@ msgstr ""
 "signer, v�rifier, chiffer ou d�chiffrer\n"
 "l'op�ration par d�faut d�pend des donn�es entr�es\n"
 
-#: g10/g10.c:372
+#: g10/g10.c:335
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -599,222 +600,218 @@ msgstr ""
 "\n"
 "Algorithmes support�s:\n"
 
-#: g10/g10.c:447
-msgid "usage: gpgm [options] "
-msgstr "utilisation: gpgm [options] "
-
-#: g10/g10.c:449
+#: g10/g10.c:409
 msgid "usage: gpg [options] "
 msgstr "utilisation: gpg [options] "
 
-#: g10/g10.c:490
+#: g10/g10.c:449
 msgid "conflicting commands\n"
 msgstr "commandes en conflit\n"
 
-#: g10/g10.c:629
+#: g10/g10.c:576
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTE : pas de fichier d'options par d�faut `%s'\n"
 
-#: g10/g10.c:633
+#: g10/g10.c:580
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichier d'options `%s' : %s\n"
 
-#: g10/g10.c:640
+#: g10/g10.c:587
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lire les options de `%s'\n"
 
-#: g10/g10.c:794
+#: g10/g10.c:731
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s n'est pas une table de caract�res valide\n"
 
-#: g10/g10.c:835 g10/g10.c:847
+#: g10/g10.c:774 g10/g10.c:786
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorithme de chiffrement s�lectionn� est invalide\n"
 
-#: g10/g10.c:841 g10/g10.c:853
+#: g10/g10.c:780 g10/g10.c:792
 msgid "selected digest algorithm is invalid\n"
 msgstr "la fonction de hachage s�lectionn�e est invalide\n"
 
-#: g10/g10.c:856
+#: g10/g10.c:795
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "l'algorithme de compression doit faire partie de l'�chelle %d..%d\n"
 
-#: g10/g10.c:858
+#: g10/g10.c:797
 msgid "completes-needed must be greater than 0\n"
 msgstr "� completes-needed � doit �tre sup�rieur � 0\n"
 
-#: g10/g10.c:860
+#: g10/g10.c:799
 msgid "marginals-needed must be greater than 1\n"
 msgstr "� marginals-needed � doit �tre sup�rieur � 1\n"
 
-#: g10/g10.c:862
+#: g10/g10.c:801
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "� max-cert-depth � doit �tre compris entre 1 et 255\n"
 
-#: g10/g10.c:865
+#: g10/g10.c:804
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTE : le mode S2K simple (0) est fortement d�conseill�\n"
 
-#: g10/g10.c:869
+#: g10/g10.c:808
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mode S2K invalide ; doit �tre 0, 1 ou 3\n"
 
-#: g10/g10.c:946
+#: g10/g10.c:885
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "n'a pas pu initialiser la base de confiance : %s\n"
 
-#: g10/g10.c:952
+#: g10/g10.c:891
 msgid "--store [filename]"
 msgstr "--store [nom du fichier]"
 
-#: g10/g10.c:960
+#: g10/g10.c:898
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom du fichier]"
 
-#: g10/g10.c:968
+#: g10/g10.c:906
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom du fichier]"
 
-#: g10/g10.c:981
+#: g10/g10.c:919
 msgid "--sign [filename]"
 msgstr "--sign [nom du fichier]"
 
-#: g10/g10.c:994
+#: g10/g10.c:932
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom du fichier]"
 
-#: g10/g10.c:1008
+#: g10/g10.c:946
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom du fichier]"
 
-#: g10/g10.c:1020
+#: g10/g10.c:958
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom du fichier]"
 
-#: g10/g10.c:1029
+#: g10/g10.c:967
 msgid "--edit-key username [commands]"
 msgstr "--edit-key utilisateur [commandes]"
 
-#: g10/g10.c:1045
+#: g10/g10.c:981
 msgid "--delete-secret-key username"
 msgstr "--delete-secret-key utilisateur"
 
-#: g10/g10.c:1048
+#: g10/g10.c:984
 msgid "--delete-key username"
 msgstr "--delete-key utilisateur"
 
-#: g10/encode.c:229 g10/g10.c:1071 g10/sign.c:311
+#: g10/encode.c:234 g10/g10.c:1007 g10/sign.c:311
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "ne peut ouvrir %s: %s\n"
 
-#: g10/g10.c:1082
+#: g10/g10.c:1018
 msgid "-k[v][v][v][c] [userid] [keyring]"
 msgstr "-k[v][v][v][c] [utilisateur] [porte-cl�s]"
 
-#: g10/g10.c:1143
+#: g10/g10.c:1077
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "suppression d'armure non r�ussie : %s\n"
 
-#: g10/g10.c:1151
+#: g10/g10.c:1085
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "construction d'armure non r�ussie : %s \n"
 
-#: g10/g10.c:1217
+#: g10/g10.c:1151
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algorithme de hachage `%s' invalide\n"
 
-#: g10/g10.c:1296
+#: g10/g10.c:1226
 msgid "[filename]"
 msgstr "[nom du fichier]"
 
-#: g10/g10.c:1300
+#: g10/g10.c:1230
 msgid "Go ahead and type your message ...\n"
 msgstr "Continuez et tapez votre message...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1303 g10/verify.c:66
+#: g10/decrypt.c:59 g10/g10.c:1233 g10/verify.c:66
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "ne peut ouvrir `%s'\n"
 
-#: g10/armor.c:297
+#: g10/armor.c:296
 #, c-format
 msgid "armor: %s\n"
 msgstr "armure : %s\n"
 
-#: g10/armor.c:320
+#: g10/armor.c:319
 msgid "invalid armor header: "
 msgstr "en-t�te d'armure invalide : "
 
-#: g10/armor.c:327
+#: g10/armor.c:326
 msgid "armor header: "
 msgstr "en-t�te d'armure : "
 
-#: g10/armor.c:338
+#: g10/armor.c:337
 msgid "invalid clearsig header\n"
 msgstr "en-t�te de signature claire invalide\n"
 
-#: g10/armor.c:390
+#: g10/armor.c:389
 msgid "nested clear text signatures\n"
 msgstr "signatures en texte clair imbriqu�es\n"
 
-#: g10/armor.c:499
+#: g10/armor.c:498
 msgid "invalid dash escaped line: "
 msgstr "ligne de traits d'�chappement invalide : "
 
-#: g10/armor.c:507
+#: g10/armor.c:510
 msgid "unexpected armor:"
 msgstr "armure inattendue :"
 
-#: g10/armor.c:623
+#: g10/armor.c:627
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "caract�re %02x invalide en base 64 ignor�\n"
 
-#: g10/armor.c:666
+#: g10/armor.c:670
 msgid "premature eof (no CRC)\n"
 msgstr "fin de fichier pr�matur�e (pas de CRC)\n"
 
-#: g10/armor.c:700
+#: g10/armor.c:704
 msgid "premature eof (in CRC)\n"
 msgstr "fin de fichier pr�matur�e (dans le CRC)\n"
 
-#: g10/armor.c:704
+#: g10/armor.c:708
 msgid "malformed CRC\n"
 msgstr "CRC malform�\n"
 
-#: g10/armor.c:708
+#: g10/armor.c:712
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "Erreur de CRC ; %06lx - %06lx\n"
 
-#: g10/armor.c:725
+#: g10/armor.c:729
 msgid "premature eof (in Trailer)\n"
 msgstr "fin de fichier pr�matur�e (dans la remorque)\n"
 
-#: g10/armor.c:729
+#: g10/armor.c:733
 msgid "error in trailer line\n"
 msgstr "erreur dans la ligne de remorque\n"
 
-#: g10/armor.c:993
+#: g10/armor.c:997
 msgid "no valid OpenPGP data found.\n"
 msgstr "aucune de donn�e OpenPGP valide n'a �t� trouv�e.\n"
 
-#: g10/armor.c:997
+#: g10/armor.c:1001
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armure invalide : ligne plus longue que %d caract�res\n"
 
-#: g10/armor.c:1001
+#: g10/armor.c:1005
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -911,26 +908,31 @@ msgstr ""
 msgid "key %08lX: key has been revoked!\n"
 msgstr "cl� %08lX : la cl� a �t� r�voqu�e !\n"
 
-#: g10/pkclist.c:287 g10/pkclist.c:391
+#: g10/pkclist.c:287 g10/pkclist.c:297 g10/pkclist.c:403
 msgid "Use this key anyway? "
 msgstr "Utiliser cette cl� quand-m�me ? "
 
-#: g10/pkclist.c:311
+#: g10/pkclist.c:291
+#, fuzzy, c-format
+msgid "key %08lX: subkey has been revoked!\n"
+msgstr "cl� %08lX : la cl� a �t� r�voqu�e !\n"
+
+#: g10/pkclist.c:321
 #, c-format
 msgid "%08lX: key has expired\n"
 msgstr "%08lX : la cl� a expir�\n"
 
-#: g10/pkclist.c:317
+#: g10/pkclist.c:327
 #, c-format
 msgid "%08lX: no info to calculate a trust probability\n"
 msgstr "%08lX : pas d'information pour calculer une probabilit� de confiance\n"
 
-#: g10/pkclist.c:331
+#: g10/pkclist.c:341
 #, c-format
 msgid "%08lX: We do NOT trust this key\n"
 msgstr "%08lX : Nous ne faisons PAS confiance � cette cl�\n"
 
-#: g10/pkclist.c:337
+#: g10/pkclist.c:347
 #, c-format
 msgid ""
 "%08lX: It is not sure that this key really belongs to the owner\n"
@@ -940,15 +942,15 @@ msgstr ""
 "propri�taire\n"
 "mais elle est quand m�me accept�e\n"
 
-#: g10/pkclist.c:343
+#: g10/pkclist.c:353
 msgid "This key probably belongs to the owner\n"
 msgstr "Cette cl� appartient probablement � son propri�taire\n"
 
-#: g10/pkclist.c:348
+#: g10/pkclist.c:358
 msgid "This key belongs to us\n"
 msgstr "Cette cl� nous appartient\n"
 
-#: g10/pkclist.c:386
+#: g10/pkclist.c:398
 msgid ""
 "It is NOT certain that the key belongs to its owner.\n"
 "If you *really* know what you are doing, you may answer\n"
@@ -960,58 +962,63 @@ msgstr ""
 "oui � la prochaine question\n"
 "\n"
 
-#: g10/pkclist.c:399
+#: g10/pkclist.c:411
 msgid "WARNING: Using untrusted key!\n"
 msgstr "ATTENTION : Utilisation d'une cl� sans confiance !\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:447
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "ATTENTION : Cette cl� � �t� r�voqu�e par son propri�taire !\n"
 
-#: g10/pkclist.c:436
+#: g10/pkclist.c:448
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "         Cela pourrait signifier que la signature est fausse.\n"
 
-#: g10/pkclist.c:457
+#: g10/pkclist.c:452
+#, fuzzy
+msgid "WARNING: This subkey has been revoked by its owner!\n"
+msgstr "ATTENTION : Cette cl� � �t� r�voqu�e par son propri�taire !\n"
+
+#: g10/pkclist.c:473
 msgid "Note: This key has expired!\n"
 msgstr "Note : Cette cl� a expir� !\n"
 
-#: g10/pkclist.c:464
+#: g10/pkclist.c:480
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 "ATTENTION : Cette cl� n'est pas certifi�e avec une signature de confiance !\n"
 
-#: g10/pkclist.c:466
+#: g10/pkclist.c:482
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "         Rien ne dit que la signature appartient � son propri�taire.\n"
 
-#: g10/pkclist.c:482
+#: g10/pkclist.c:498
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "ATTENTION : Nous ne faisons PAS confiance � cette cl� !\n"
 
-#: g10/pkclist.c:483
+#: g10/pkclist.c:499
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         La signature est certainement FAUSSE.\n"
 
-#: g10/pkclist.c:490
+#: g10/pkclist.c:506
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "ATTENTION : Les signatures de cette cl� n'ont pas une confiance suffisante "
 "!\n"
 
-#: g10/pkclist.c:493
+#: g10/pkclist.c:509
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr ""
 "         Il n'est pas s�r que la signature appartient � son propri�taire.\n"
 
-#: g10/pkclist.c:546 g10/pkclist.c:559 g10/pkclist.c:622 g10/pkclist.c:650
+#: g10/pkclist.c:562 g10/pkclist.c:575 g10/pkclist.c:638 g10/pkclist.c:666
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s : ignor� : %s\n"
 
-#: g10/pkclist.c:568
+#: g10/pkclist.c:584
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1020,20 +1027,20 @@ msgstr ""
 "\"-r\")\n"
 "\n"
 
-#: g10/pkclist.c:573
+#: g10/pkclist.c:589
 msgid "Enter the user ID: "
 msgstr "Entrez le nom d'utilisateur : "
 
-#: g10/pkclist.c:584
+#: g10/pkclist.c:600
 msgid "No such user ID.\n"
 msgstr "Pas de tel utilisateur.\n"
 
-#: g10/pkclist.c:630
+#: g10/pkclist.c:646
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s : erreur pendant la v�rification de la cl� : %s\n"
 
-#: g10/pkclist.c:656
+#: g10/pkclist.c:672
 msgid "no valid addressees\n"
 msgstr "pas de destinataire valide\n"
 
@@ -1113,7 +1120,20 @@ msgstr "DSA permet seulement des tailles comprises entre 512 et 1024\n"
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "taille trop petite ; 768 est la plus petite valeur permise.\n"
 
-#: g10/keygen.c:459
+#. It is ridiculous and an annoyance to use larger key sizes!
+#. * GnuPG can handle much larger sizes; but it takes an eternity
+#. * to create such a key (but less than the time the Sirius
+#. * Computer Corporation needs to process one of the usual
+#. * complaints) and {de,en}cryption although needs some time.
+#. * So, before you complain about this limitation, I suggest that
+#. * you start a discussion with Marvin about this theme and then
+#. * do whatever you want.
+#: g10/keygen.c:466
+#, fuzzy, c-format
+msgid "keysize too large; %d is largest value allowed.\n"
+msgstr "taille trop petite ; 768 est la plus petite valeur permise.\n"
+
+#: g10/keygen.c:471
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1121,11 +1141,11 @@ msgstr ""
 "Les tailles sup�rieures � 2048 ne sont pas conseill�es car\n"
 "les calculs prennent VRAIMENT beaucoup de temps !\n"
 
-#: g10/keygen.c:462
+#: g10/keygen.c:474
 msgid "Are you sure that you want this keysize? "
 msgstr "Etes-vous s�r de vouloir cette taille ? "
 
-#: g10/keygen.c:463
+#: g10/keygen.c:475
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1133,21 +1153,21 @@ msgstr ""
 "D'accord, mais n'oubliez pas que les radiations de votre �cran et de votre\n"
 "clavier sont aussi tr�s vuln�rables aux attaques !\n"
 
-#: g10/keygen.c:471
+#: g10/keygen.c:483
 msgid "Do you really need such a large keysize? "
 msgstr "Avez-vous r�ellement besoin d'une taille aussi grande ? "
 
-#: g10/keygen.c:477
+#: g10/keygen.c:489
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "La taille demand�e est %u bits\n"
 
-#: g10/keygen.c:480 g10/keygen.c:484
+#: g10/keygen.c:492 g10/keygen.c:496
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrondie � %u bits\n"
 
-#: g10/keygen.c:497
+#: g10/keygen.c:509
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1163,29 +1183,29 @@ msgstr ""
 "      <n>m = la cl� expire dans n mois\n"
 "      <n>y = la cl� expire dans n ans\n"
 
-#: g10/keygen.c:512
+#: g10/keygen.c:524
 msgid "Key is valid for? (0) "
 msgstr "La cl� est valide pour ? (0) "
 
-#: g10/keygen.c:523
+#: g10/keygen.c:535
 msgid "invalid value\n"
 msgstr "valeur invalide\n"
 
-#: g10/keygen.c:528
+#: g10/keygen.c:540
 msgid "Key does not expire at all\n"
 msgstr "La cl� n'expire pas du tout\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:534
+#: g10/keygen.c:546
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "La cl� expire le %s\n"
 
-#: g10/keygen.c:540
+#: g10/keygen.c:552
 msgid "Is this correct (y/n)? "
 msgstr "Est-ce correct (o/n) ? "
 
-#: g10/keygen.c:583
+#: g10/keygen.c:595
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1201,44 +1221,44 @@ msgstr ""
 "   � Heinrich Heine (Der Dichter) <[email protected]> �\n"
 "\n"
 
-#: g10/keygen.c:594
+#: g10/keygen.c:606
 msgid "Real name: "
 msgstr "Nom r�el : "
 
-#: g10/keygen.c:598
+#: g10/keygen.c:610
 msgid "Invalid character in name\n"
 msgstr "Caract�re invalide dans le nom\n"
 
-#: g10/keygen.c:600
+#: g10/keygen.c:612
 msgid "Name may not start with a digit\n"
 msgstr "Le nom ne doit pas commencer avec un chiffre\n"
 
-#: g10/keygen.c:602
+#: g10/keygen.c:614
 msgid "Name must be at least 5 characters long\n"
 msgstr "Le nom doit faire au moins 5 caract�res de long\n"
 
-#: g10/keygen.c:610
+#: g10/keygen.c:622
 msgid "Email address: "
 msgstr "Adresse e-mail : "
 
-#: g10/keygen.c:621
+#: g10/keygen.c:633
 msgid "Not a valid email address\n"
 msgstr "Ce n'est pas une adresse e-mail valide\n"
 
-#: g10/keygen.c:629
+#: g10/keygen.c:641
 msgid "Comment: "
 msgstr "Commentaire : "
 
-#: g10/keygen.c:635
+#: g10/keygen.c:647
 msgid "Invalid character in comment\n"
 msgstr "Caract�re invalide dans le commentaire\n"
 
-#: g10/keygen.c:657
+#: g10/keygen.c:669
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Vous utilisez le jeu de caract�res '%s'.\n"
 
-#: g10/keygen.c:663
+#: g10/keygen.c:675
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1249,15 +1269,15 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:666
+#: g10/keygen.c:678
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:676
+#: g10/keygen.c:688
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Changer le (N)om, le (C)ommentaire, l'(E)-mail ou (O)K/(Q)uitter? "
 
-#: g10/keygen.c:728
+#: g10/keygen.c:740
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1265,11 +1285,11 @@ msgstr ""
 "Vous avez besoin d'un mot de passe pour prot�ger votre cl� secr�te.\n"
 "\n"
 
-#: g10/keyedit.c:421 g10/keygen.c:736
+#: g10/keyedit.c:433 g10/keygen.c:748
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "le mot de passe n'a pas �t� r�p�t� � l'identique ; recommencez.\n"
 
-#: g10/keygen.c:742
+#: g10/keygen.c:754
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1281,7 +1301,7 @@ msgstr ""
 "le d�sirez, en utilisant ce programme avec l'option � --edit-key �.\n"
 "\n"
 
-#: g10/keygen.c:763
+#: g10/keygen.c:775
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -1293,33 +1313,33 @@ msgstr ""
 "pendant la g�n�ration de nombres premiers ; cela donne au g�n�rateur de\n"
 "nombres al�atoires une meilleure chance d'avoir assez d'entropie.\n"
 
-#: g10/keygen.c:833
+#: g10/keygen.c:845
 msgid "Key generation can only be used in interactive mode\n"
 msgstr "La g�n�ration de cl� ne peut �tre faite qu'en mode interactif\n"
 
-#: g10/keygen.c:841
+#: g10/keygen.c:853
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "La paire de cl�s DSA fera 1024 bits.\n"
 
-#: g10/keygen.c:847
+#: g10/keygen.c:859
 msgid "Key generation cancelled.\n"
 msgstr "La g�n�ration a �t� annul�e.\n"
 
-#: g10/keygen.c:857
+#: g10/keygen.c:869
 #, c-format
 msgid "writing public certificate to `%s'\n"
 msgstr "�criture d'un certificat public � `%s'\n"
 
-#: g10/keygen.c:858
+#: g10/keygen.c:870
 #, c-format
 msgid "writing secret certificate to `%s'\n"
 msgstr "�criture d'un certificat secret � `%s'\n"
 
-#: g10/keygen.c:935
+#: g10/keygen.c:947
 msgid "public and secret key created and signed.\n"
 msgstr "les cl�s publique et secr�te ont �t� cr��es et sign�es.\n"
 
-#: g10/keygen.c:937
+#: g10/keygen.c:949
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1328,13 +1348,13 @@ msgstr ""
 "utiliser la commande � --edit-key � pour g�n�rer une cl� secondaire �\n"
 "cette fin.\n"
 
-#: g10/keygen.c:951 g10/keygen.c:1050
+#: g10/keygen.c:963 g10/keygen.c:1062
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "La g�n�ration de cl� a �chou� : %s\n"
 
 # on s'amuse comme on peut...
-#: g10/keygen.c:995 g10/sig-check.c:212 g10/sign.c:52
+#: g10/keygen.c:1007 g10/sig-check.c:299 g10/sign.c:52
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1342,7 +1362,7 @@ msgstr ""
 "la cl� a �t� cr��e %lu seconde dans le futur (discontinuit� temporelle ou\n"
 "probl�me d'horloge)\n"
 
-#: g10/keygen.c:997 g10/sig-check.c:214 g10/sign.c:54
+#: g10/keygen.c:1009 g10/sig-check.c:301 g10/sign.c:54
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1350,32 +1370,37 @@ msgstr ""
 "la cl� a �t� cr��e %lu secondes dans le futur (discontinuit� temporelle ou\n"
 "probl�me d'horloge\n"
 
-#: g10/keygen.c:1028
+#: g10/keygen.c:1040
 msgid "Really create? "
 msgstr "Cr�er vraiment ? "
 
-#: g10/encode.c:90 g10/openfile.c:86 g10/openfile.c:174 g10/tdbio.c:467
-#: g10/tdbio.c:527
+#: g10/encode.c:91 g10/openfile.c:86 g10/openfile.c:174 g10/tdbio.c:467
+#: g10/tdbio.c:528
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s : ne peut ouvrir : %s\n"
 
-#: g10/encode.c:112
+#: g10/encode.c:113
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erreur pendant la cr�ation du mot de passe : %s\n"
 
-#: g10/encode.c:166 g10/encode.c:285
+#: g10/encode.c:167 g10/encode.c:290
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s : ATTENTION : fichier vide\n"
 
-#: g10/encode.c:235
+#: g10/encode.c:240
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lecture de `%s'\n"
 
-#: g10/encode.c:413
+#: g10/encode.c:435 g10/sign.c:346
+#, c-format
+msgid "WARNING: `%s' is an empty file\n"
+msgstr "ATTENTION : `%s' est un fichier vide\n"
+
+#: g10/encode.c:605
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s chiffr� pour : %s\n"
@@ -1407,7 +1432,7 @@ msgstr "trop d'entr�es dans le cache pk - d�sactiv�\n"
 msgid "too many entries in unk cache - disabled\n"
 msgstr "trop d'entr�es dans le cache unk - d�sactiv�\n"
 
-#: g10/getkey.c:1531 g10/getkey.c:1587
+#: g10/getkey.c:1535 g10/getkey.c:1591
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr ""
@@ -1434,323 +1459,332 @@ msgstr "%lu cl�s trait�es jusqu'ici\n"
 msgid "read error: %s\n"
 msgstr "erreur de lecture : %s\n"
 
-#: g10/import.c:174
+#: g10/import.c:175
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "       Quantit� totale trait�e : %lu\n"
 
-#: g10/import.c:176
+#: g10/import.c:177
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "        sans nom d'utilisateur : %lu\n"
 
-#: g10/import.c:178
+#: g10/import.c:179
 #, c-format
 msgid "              imported: %lu"
 msgstr "                      import�e : %lu"
 
-#: g10/import.c:184
+#: g10/import.c:185
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                     inchang�e : %lu\n"
 
-#: g10/import.c:186
+#: g10/import.c:187
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "  nouveaux noms d'utilisateurs : %lu\n"
 
-#: g10/import.c:188
+#: g10/import.c:189
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           nouvelles sous-cl�s : %lu\n"
 
-#: g10/import.c:190
+#: g10/import.c:191
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "          nouvelles signatures : %lu\n"
 
-#: g10/import.c:192
+#: g10/import.c:193
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr " nouvelles r�vocations de cl�s : %lu\n"
 
-#: g10/import.c:194
+#: g10/import.c:195
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "            cl�s secr�tes lues : %lu\n"
 
-#: g10/import.c:196
+#: g10/import.c:197
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "       cl�s secr�tes import�es : %lu\n"
 
-#: g10/import.c:198
+#: g10/import.c:199
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "      cl�s secr�tes inchang�es : %lu\n"
 
-#: g10/import.c:340 g10/import.c:532
+#: g10/import.c:342 g10/import.c:534
 #, c-format
 msgid "key %08lX: no user id\n"
 msgstr "cl� %08lX : pas de nom d'utilisateur\n"
 
-#: g10/import.c:351
+#: g10/import.c:353
 #, c-format
 msgid "key %08lX: no valid user ids\n"
 msgstr "cl� %08lX : pas de nom d'utilisateur valide\n"
 
-#: g10/import.c:353
+#: g10/import.c:355
 msgid "this may be caused by a missing self-signature\n"
 msgstr "cela peut provenir d'une auto-signature manquante\n"
 
-#: g10/import.c:364 g10/import.c:600
+#: g10/import.c:366 g10/import.c:604
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "cl� %08lX : cl� publique pas trouv�e: %s\n"
 
-#: g10/import.c:370
+#: g10/import.c:372
 msgid "no default public keyring\n"
 msgstr "pas de porte-cl�s public par d�faut\n"
 
-#: g10/import.c:374 g10/openfile.c:115 g10/sign.c:215 g10/sign.c:498
+#: g10/import.c:376 g10/openfile.c:115 g10/sign.c:215 g10/sign.c:501
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "�criture de `%s'\n"
 
-#: g10/import.c:378 g10/import.c:438 g10/import.c:654
+#: g10/import.c:380 g10/import.c:440 g10/import.c:658
 #, c-format
 msgid "can't lock public keyring: %s\n"
 msgstr "ne peut verrouiller le porte-cl�s public : %s\n"
 
-#: g10/import.c:381
+#: g10/import.c:383
 #, c-format
 msgid "can't write to keyring: %s\n"
 msgstr "ne peut �crire le porte-cl�s : %s\n"
 
-#: g10/import.c:385
+#: g10/import.c:387
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "cl� %08lX : cl� publique import�e\n"
 
-#: g10/import.c:398
+#: g10/import.c:400
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "cl� %08lX : ne ressemble pas � notre copie\n"
 
-#: g10/import.c:411 g10/import.c:609
+#: g10/import.c:413 g10/import.c:613
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "cl� %08lX : ne peut trouver le bloc de cl�s original : %s\n"
 
-#: g10/import.c:418 g10/import.c:616
+#: g10/import.c:420 g10/import.c:620
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "cl� %08lX : ne peut lire le bloc de cl�s original : %s\n"
 
-#: g10/import.c:435 g10/import.c:547 g10/import.c:651
+#: g10/import.c:437 g10/import.c:549 g10/import.c:655
 msgid "writing keyblock\n"
 msgstr "�criture du bloc de cl�s\n"
 
-#: g10/import.c:441 g10/import.c:657
+#: g10/import.c:443 g10/import.c:661
 #, c-format
 msgid "can't write keyblock: %s\n"
 msgstr "ne peut �crire le bloc de cl�s : %s\n"
 
-#: g10/import.c:446
+#: g10/import.c:448
 #, c-format
 msgid "key %08lX: 1 new user-id\n"
 msgstr "cl� %08lX : un nouvel utilisateur\n"
 
-#: g10/import.c:449
+#: g10/import.c:451
 #, c-format
 msgid "key %08lX: %d new user-ids\n"
 msgstr "cl� %08lX : %d nouveaux utilisateurs\n"
 
-#: g10/import.c:452
+#: g10/import.c:454
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "cl� %08lX : une nouvelle signature\n"
 
-#: g10/import.c:455
+#: g10/import.c:457
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "cl� %08lX : %d nouvelles signatures\n"
 
-#: g10/import.c:458
+#: g10/import.c:460
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "cl� %08lX : une nouvelle sous-cl�\n"
 
-#: g10/import.c:461
+#: g10/import.c:463
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "cl� %08lX : %d nouvelles sous-cl�s\n"
 
-#: g10/import.c:471
+#: g10/import.c:473
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "cl� %08lX : n'a pas chang�\n"
 
-#: g10/import.c:550
+#: g10/import.c:552
 #, c-format
 msgid "can't lock secret keyring: %s\n"
 msgstr "ne peut verrouiller le porte-cl�s secret : %s\n"
 
-#: g10/import.c:553
+#: g10/import.c:555
 #, c-format
 msgid "can't write keyring: %s\n"
 msgstr "ne peut �crire le porte-cl�s : %s\n"
 
-#. we are ready
-#: g10/import.c:556
+#: g10/import.c:559
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "cl� %08lX : cl� secr�te import�e\n"
 
 #. we can't merge secret keys
-#: g10/import.c:560
+#: g10/import.c:564
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "cl� %08lX : d�j� dans le porte-cl�s secret\n"
 
-#: g10/import.c:565
+#: g10/import.c:569
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "cl� %08lX : cl� secr�te pas trouv�e: %s\n"
 
-#: g10/import.c:594
+#: g10/import.c:598
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "cl� %08lX : pas de cl� publique - ne peut appliquer le certificat de\n"
 "r�vocation\n"
 
-#: g10/import.c:627
+#: g10/import.c:631
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "cl� %08lX : certificat de r�vocation invalide : %s - rejet�\n"
 
-#: g10/import.c:661
+#: g10/import.c:665
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "cl� %08lX : certificat de r�vocation import�\n"
 
-#: g10/import.c:695
+#: g10/import.c:699
 #, c-format
 msgid "key %08lX: no user-id for signature\n"
 msgstr "cl� %08lX : pas d'utilisateur pour la signature\n"
 
-#: g10/import.c:702 g10/import.c:727
+#: g10/import.c:706 g10/import.c:731
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "cl� %08lX : algorithme de cl� publique non support�\n"
 
-#: g10/import.c:703
+#: g10/import.c:707
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "cl� %08lX : auto-signature invalide\n"
 
-#: g10/import.c:719
+#: g10/import.c:723
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "cl� %08lX : pas de sous-cl� pour relier la cl�\n"
 
-#: g10/import.c:728
+#: g10/import.c:732
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "cl� %08lX : liaison avec la sous-cl� invalide\n"
 
-#: g10/import.c:760
+#: g10/import.c:764
 #, c-format
 msgid "key %08lX: skipped userid '"
 msgstr "cl� %08lX : utilisateur non pris en compte '"
 
-#: g10/import.c:780
+#: g10/import.c:787
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "cl� %08lX : sous-cl� non prise en compte\n"
 
-#: g10/import.c:800
+#. here we violate the rfc a bit by still allowing
+#. * to import non-exportable signature when we have the
+#. * the secret key used to create this signature - it
+#. * seems that this makes sense
+#: g10/import.c:812
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "cl� %08lX : signature non exportable (classe %02x) - ignor�e\n"
 
-#: g10/import.c:809
+#: g10/import.c:821
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "cl� %08lX : certificat de r�vocation au mauvais endroit - ignor�e\n"
 
-#: g10/import.c:817
+#: g10/import.c:829
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "cl� %08lX : certificat de r�vocation invalide : %s - ignor�e\n"
 
-#: g10/import.c:878
+#: g10/import.c:890
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "cl� %08lX : certificat de r�vocation ajout�\n"
 
-#: g10/import.c:992 g10/import.c:1047
+#: g10/import.c:1008 g10/import.c:1063
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "cl� %08lX : notre copie n'a pas d'auto-signature\n"
 
-#: g10/keyedit.c:88
+#: g10/keyedit.c:91
 #, c-format
 msgid "%s: user not found\n"
 msgstr "%s : utilisateur non trouv�\n"
 
-#: g10/keyedit.c:171
+#: g10/keyedit.c:177
+msgid "[revocation]"
+msgstr ""
+
+#: g10/keyedit.c:178
 msgid "[self-signature]"
 msgstr "[auto-signature]"
 
-#: g10/keyedit.c:189
+#: g10/keyedit.c:196
 msgid "1 bad signature\n"
 msgstr "une mauvaise signature\n"
 
-#: g10/keyedit.c:191
+#: g10/keyedit.c:198
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d mauvaises signatures\n"
 
-#: g10/keyedit.c:193
+#: g10/keyedit.c:200
 msgid "1 signature not checked due to a missing key\n"
 msgstr "une signature non v�rifi�e � cause d'une cl� manquante\n"
 
-#: g10/keyedit.c:195
+#: g10/keyedit.c:202
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d signatures non v�rifi�es � cause de cl�s manquantes\n"
 
-#: g10/keyedit.c:197
+#: g10/keyedit.c:204
 msgid "1 signature not checked due to an error\n"
 msgstr "une signature non v�rifi�e � cause d'une erreur\n"
 
-#: g10/keyedit.c:199
+#: g10/keyedit.c:206
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d signatures non v�rifi�es � cause d'erreurs\n"
 
-#: g10/keyedit.c:201
+#: g10/keyedit.c:208
 msgid "1 user id without valid self-signature detected\n"
 msgstr "un nom d'utilisateur sans auto-signature valide d�tect�\n"
 
-#: g10/keyedit.c:203
+#: g10/keyedit.c:210
 #, c-format
 msgid "%d user ids without valid self-signatures detected\n"
 msgstr "%d nom d'utilisateurs sans auto-signature valide d�tect�\n"
 
-#: g10/keyedit.c:281
+#. Fixme: see whether there is a revocation in which
+#. * case we should allow to sign it again.
+#: g10/keyedit.c:290
 #, c-format
 msgid "Already signed by key %08lX\n"
 msgstr "D�j� sign� par la cl� %08lX\n"
 
-#: g10/keyedit.c:289
+#: g10/keyedit.c:298
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Rien � signer avec la cl� %08lX\n"
 
-#: g10/keyedit.c:298
+#: g10/keyedit.c:307
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -1758,7 +1792,7 @@ msgstr ""
 "Etes-vous vraiment s�r(e) que vous voulez signer cette cl�\n"
 "avec la v�tre : \""
 
-#: g10/keyedit.c:307
+#: g10/keyedit.c:316
 msgid ""
 "The signature will be marked as non-exportable.\n"
 "\n"
@@ -1766,35 +1800,35 @@ msgstr ""
 "La signature sera marqu�e comme non-exportable.\n"
 "\n"
 
-#: g10/keyedit.c:309
+#: g10/keyedit.c:321
 msgid "Really sign? "
 msgstr "Signer r�ellement ? "
 
-#: g10/keyedit.c:335 g10/sign.c:75
+#: g10/keyedit.c:347 g10/keyedit.c:1684 g10/keyedit.c:1733 g10/sign.c:75
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "la signature a �chou� : %s\n"
 
-#: g10/keyedit.c:388
+#: g10/keyedit.c:400
 msgid "This key is not protected.\n"
 msgstr "Cette cl� n'est pas prot�g�e.\n"
 
-#: g10/keyedit.c:391
+#: g10/keyedit.c:403
 msgid "Key is protected.\n"
 msgstr "La cl� est prot�g�e.\n"
 
-#: g10/keyedit.c:408
+#: g10/keyedit.c:420
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Ne peut �diter cette cl� : %s\n"
 
-#: g10/keyedit.c:413
+#: g10/keyedit.c:425
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
 msgstr "Entrez le nouveau mot de passe pour cette cl� secr�te.\n"
 
-#: g10/keyedit.c:425
+#: g10/keyedit.c:437
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -1803,379 +1837,451 @@ msgstr ""
 "*mauvaise* id�e\n"
 "\n"
 
-#: g10/keyedit.c:428
+#: g10/keyedit.c:440
 msgid "Do you really want to do this? "
 msgstr "Voulez-vous vraiment faire cela? "
 
-#: g10/keyedit.c:487
+#: g10/keyedit.c:499
 msgid "moving a key signature to the correct place\n"
 msgstr "replacer la signature d'une cl� � l'endroit correct\n"
 
-#: g10/keyedit.c:523
+#: g10/keyedit.c:535
 msgid "quit"
 msgstr "quitter"
 
-#: g10/keyedit.c:523
+#: g10/keyedit.c:535
 msgid "quit this menu"
 msgstr "quitter ce menu"
 
-#: g10/keyedit.c:524
+#: g10/keyedit.c:536
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:525
+#: g10/keyedit.c:537
 msgid "save"
 msgstr "enregistrer"
 
-#: g10/keyedit.c:525
+#: g10/keyedit.c:537
 msgid "save and quit"
 msgstr "enregistrer et quitter"
 
 # FIXMOI : si je mets aide �a va demander de taper "aide"...
-#: g10/keyedit.c:526
+#: g10/keyedit.c:538
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:526
+#: g10/keyedit.c:538
 msgid "show this help"
 msgstr "afficher cette aide"
 
 # g10/keyedit.c:556 ???
-#: g10/keyedit.c:528
+#: g10/keyedit.c:540
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:528
+#: g10/keyedit.c:540
 msgid "show fingerprint"
 msgstr "afficher l'empreinte"
 
-#: g10/keyedit.c:529
+#: g10/keyedit.c:541
 msgid "list"
 msgstr "lister"
 
-#: g10/keyedit.c:529
+#: g10/keyedit.c:541
 msgid "list key and user ids"
 msgstr "lister la cl� et les noms d'utilisateurs"
 
-#: g10/keyedit.c:530
+#: g10/keyedit.c:542
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:531
+#: g10/keyedit.c:543
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:531
+#: g10/keyedit.c:543
 msgid "select user id N"
 msgstr "s�lectionner le nom d'utilisateur N"
 
-#: g10/keyedit.c:532
+#: g10/keyedit.c:544
 msgid "key"
 msgstr "cl�"
 
-#: g10/keyedit.c:532
+#: g10/keyedit.c:544
 msgid "select secondary key N"
 msgstr "s�lectionner la cl� secondaire N"
 
-#: g10/keyedit.c:533
+#: g10/keyedit.c:545
 msgid "check"
 msgstr "v�rifier"
 
-#: g10/keyedit.c:533
+#: g10/keyedit.c:545
 msgid "list signatures"
 msgstr "lister les signatures"
 
-#: g10/keyedit.c:534
+#: g10/keyedit.c:546
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:535
+#: g10/keyedit.c:547
 msgid "sign"
 msgstr "signer"
 
-#: g10/keyedit.c:535
+#: g10/keyedit.c:547
 msgid "sign the key"
 msgstr "signer la cl�"
 
-#: g10/keyedit.c:536
+#: g10/keyedit.c:548
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:537
+#: g10/keyedit.c:549
 msgid "lsign"
 msgstr "lsigner"
 
-#: g10/keyedit.c:537
+#: g10/keyedit.c:549
 msgid "sign the key locally"
 msgstr "signer la cl� localement"
 
-#: g10/keyedit.c:538
+#: g10/keyedit.c:550
 msgid "debug"
 msgstr "d�boguer"
 
-#: g10/keyedit.c:539
+#: g10/keyedit.c:551
 msgid "adduid"
 msgstr "aj.ut"
 
-#: g10/keyedit.c:539
+#: g10/keyedit.c:551
 msgid "add a user id"
 msgstr "ajouter un utilisateur"
 
-#: g10/keyedit.c:540
+#: g10/keyedit.c:552
 msgid "deluid"
 msgstr "suppr.ut"
 
-#: g10/keyedit.c:540
+#: g10/keyedit.c:552
 msgid "delete user id"
 msgstr "enlever un utilisateur"
 
-#: g10/keyedit.c:541
+#: g10/keyedit.c:553
 msgid "addkey"
 msgstr "aj.cl�"
 
-#: g10/keyedit.c:541
+#: g10/keyedit.c:553
 msgid "add a secondary key"
 msgstr "ajouter une cl� secondaire"
 
-#: g10/keyedit.c:542
+#: g10/keyedit.c:554
 msgid "delkey"
 msgstr "suppr.cl�"
 
-#: g10/keyedit.c:542
+#: g10/keyedit.c:554
 msgid "delete a secondary key"
 msgstr "enlever une cl� secondaire"
 
-#: g10/keyedit.c:543
+#: g10/keyedit.c:555
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:543
+#: g10/keyedit.c:555
 msgid "change the expire date"
 msgstr "changer la date d'expiration"
 
-#: g10/keyedit.c:544
+#: g10/keyedit.c:556
 msgid "toggle"
 msgstr "changer"
 
-#: g10/keyedit.c:544
+#: g10/keyedit.c:556
 msgid "toggle between secret and public key listing"
 msgstr "passer de la liste des cl�s secr�tes aux cl�s priv�es et inversement"
 
-#: g10/keyedit.c:546
+#: g10/keyedit.c:558
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:547
+#: g10/keyedit.c:559
 msgid "pref"
 msgstr "pr�f"
 
-#: g10/keyedit.c:547
+#: g10/keyedit.c:559
 msgid "list preferences"
 msgstr "lister les pr�f�rences"
 
-#: g10/keyedit.c:548
+#: g10/keyedit.c:560
 msgid "passwd"
 msgstr "mot.pas"
 
-#: g10/keyedit.c:548
+#: g10/keyedit.c:560
 msgid "change the passphrase"
 msgstr "changer le mot de passe"
 
-#: g10/keyedit.c:549
+#: g10/keyedit.c:561
 msgid "trust"
 msgstr "confi."
 
-#: g10/keyedit.c:549
+#: g10/keyedit.c:561
 msgid "change the ownertrust"
 msgstr "changer la confiance"
 
-#: g10/keyedit.c:568
+#: g10/keyedit.c:562
+#, fuzzy
+msgid "revsig"
+msgstr "signer"
+
+#
+#: g10/keyedit.c:562
+#, fuzzy
+msgid "revoke signatures"
+msgstr "forcer les signatures en v3"
+
+#: g10/keyedit.c:563
+#, fuzzy
+msgid "revkey"
+msgstr "cl�"
+
+#: g10/keyedit.c:563
+#, fuzzy
+msgid "revoke a secondary key"
+msgstr "enlever une cl� secondaire"
+
+#: g10/keyedit.c:582
 msgid "can't do that in batchmode\n"
 msgstr "ne peut faire cela en mode automatique\n"
 
 #. check that they match
 #. FIXME: check that they both match
-#: g10/keyedit.c:595
+#: g10/keyedit.c:609
 msgid "Secret key is available.\n"
 msgstr "La cl� secr�te est disponible.\n"
 
-#: g10/keyedit.c:624
+#: g10/keyedit.c:638
 msgid "Command> "
 msgstr "Commande> "
 
-#: g10/keyedit.c:651
+#: g10/keyedit.c:665
 msgid "Need the secret key to do this.\n"
 msgstr "Il faut la cl� secr�te pour faire cela.\n"
 
-#: g10/keyedit.c:673
+#: g10/keyedit.c:687
 msgid "Save changes? "
 msgstr "Enregistrer les changements? "
 
-#: g10/keyedit.c:676
+#: g10/keyedit.c:690
 msgid "Quit without saving? "
 msgstr "Quitter sans enregistrer? "
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:700
 #, c-format
 msgid "update failed: %s\n"
 msgstr "la mise � jour a �chou� : %s\n"
 
-#: g10/keyedit.c:693
+#: g10/keyedit.c:707
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "la mise � jour de la cl� secr�te a �chou� : %s\n"
 
-#: g10/keyedit.c:700
+#: g10/keyedit.c:714
 msgid "Key not changed so no update needed.\n"
 msgstr "La cl� n'a pas chang� donc la mise � jour est inutile.\n"
 
-#: g10/keyedit.c:703 g10/keyedit.c:762
+#: g10/keyedit.c:717 g10/keyedit.c:776
 #, c-format
 msgid "update of trustdb failed: %s\n"
 msgstr "la mise � jour de la base de confiance a �chou� : %s\n"
 
-#: g10/keyedit.c:736
+#: g10/keyedit.c:750
 msgid "Really sign all user ids? "
 msgstr "Signer vraiment tous les utilisateurs ? "
 
-#: g10/keyedit.c:737
+#: g10/keyedit.c:751
 msgid "Hint: Select the user ids to sign\n"
 msgstr "Aide : S�lectionner les utilisateurs � signer\n"
 
-#: g10/keyedit.c:773
+#: g10/keyedit.c:787
 msgid "You must select at least one user id.\n"
 msgstr "Vous devez s�lectionner au moins un utilisateur.\n"
 
-#: g10/keyedit.c:775
+#: g10/keyedit.c:789
 msgid "You can't delete the last user id!\n"
 msgstr "Vous ne pouvez pas supprimer le dernier utilisateur !\n"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:792
 msgid "Really remove all selected user ids? "
 msgstr "Enlever r�ellement tous les utilisateurs s�lectionn�s ? "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:793
 msgid "Really remove this user id? "
 msgstr "Enlever r�ellement cet utilisateur ? "
 
-#: g10/keyedit.c:802
+#: g10/keyedit.c:816 g10/keyedit.c:838
 msgid "You must select at least one key.\n"
 msgstr "Vous devez s�lectionner au moins une cl�.\n"
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:820
 msgid "Do you really want to delete the selected keys? "
 msgstr "Voulez-vous vraiment supprimer les cl�s s�lectionn�es ? "
 
-#: g10/keyedit.c:807
+#: g10/keyedit.c:821
 msgid "Do you really want to delete this key? "
 msgstr "Voulez-vous vraiment supprimer cette cl� ? "
 
-#: g10/keyedit.c:854
+#: g10/keyedit.c:842
+#, fuzzy
+msgid "Do you really want to revoke the selected keys? "
+msgstr "Voulez-vous vraiment supprimer les cl�s s�lectionn�es ? "
+
+#: g10/keyedit.c:843
+#, fuzzy
+msgid "Do you really want to revoke this key? "
+msgstr "Voulez-vous vraiment supprimer cette cl� ? "
+
+#: g10/keyedit.c:897
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Commande invalide  (essayez � help �)\n"
 
-#: g10/keyedit.c:1232
+#: g10/keyedit.c:1289
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Enlevez les s�lections des cl�s secr�tes.\n"
 
-#: g10/keyedit.c:1238
+#: g10/keyedit.c:1295
 msgid "Please select at most one secondary key.\n"
 msgstr "Vous devez s�lectionner au plus une cl� secondaire.\n"
 
-#: g10/keyedit.c:1242
+#: g10/keyedit.c:1299
 msgid "Changing exiration time for a secondary key.\n"
 msgstr "Changer la date d'expiration d'une cl� secondaire.\n"
 
-#: g10/keyedit.c:1244
+#: g10/keyedit.c:1301
 msgid "Changing exiration time for the primary key.\n"
 msgstr "Changer la date d'expiration de la cl� principale.\n"
 
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1342
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Vous ne pouvez pas changer la date d'expiration d'une cl� v3\n"
 
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1358
 msgid "No corresponding signature in secret ring\n"
 msgstr "Pas de signature correspondante dans le porte-cl�s secret\n"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1418
 #, c-format
 msgid "No user id with index %d\n"
 msgstr "Pas d'utilisateur avec l'index %d\n"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1464
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Pas de cl� secondaire avec l'index %d\n"
 
-#: g10/mainproc.c:184
+#: g10/keyedit.c:1562
+#, fuzzy
+msgid "user ID: \""
+msgstr "Entrez le nom d'utilisateur : "
+
+#: g10/keyedit.c:1565
+#, fuzzy, c-format
+msgid ""
+"\"\n"
+"signed with your key %08lX at %s\n"
+msgstr "Rien � signer avec la cl� %08lX\n"
+
+#: g10/keyedit.c:1569
+#, fuzzy
+msgid "Create a revocation certificate for this signature? (y/N)"
+msgstr "g�n�rer un certificat de r�vocation"
+
+#: g10/keyedit.c:1649
+#, fuzzy
+msgid "Really create the revocation certificates? (y/N)"
+msgstr "g�n�rer un certificat de r�vocation"
+
+#: g10/keyedit.c:1672
+#, fuzzy
+msgid "no secret key\n"
+msgstr "mauvaise cl� secr�te"
+
+#: g10/mainproc.c:185
 #, c-format
 msgid "public key is %08lX\n"
 msgstr "la cl� publique est %08lX\n"
 
-#: g10/mainproc.c:212
+#: g10/mainproc.c:213
 msgid "public key encrypted data: good DEK\n"
 msgstr "donn�es chiffr�es avec la cl� publique : bonne cl� de chiffrement\n"
 
 #. fixme: defer this message until we have parsed all packets of
 #. * this type - do this by building a list of keys with their stati
-#. * and store it with the conetxt.  do_proc_packets can then use
+#. * and store it with the context.  do_proc_packets can then use
 #. * this list to display some information
-#: g10/mainproc.c:219
+#: g10/mainproc.c:220
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "le d�chiffrement de la cl� publique a �chou� : %s\n"
 
-#: g10/mainproc.c:246
+#: g10/mainproc.c:249
 msgid "decryption okay\n"
 msgstr "le d�chiffrement a r�ussi\n"
 
-#: g10/mainproc.c:249
+#: g10/mainproc.c:253
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "le d�chiffrement a �chou� : %s\n"
 
-#: g10/mainproc.c:266
+#: g10/mainproc.c:270
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTE : l'exp�diteur a demand� � pour vos yeux seulement �\n"
 
-#: g10/mainproc.c:268
+#: g10/mainproc.c:272
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nom de fichier original : '%.*s'\n"
 
-#: g10/mainproc.c:849
+#: g10/mainproc.c:876
 msgid "signature verification suppressed\n"
 msgstr "v�rification de signature supprim�e\n"
 
-#: g10/mainproc.c:855
+#: g10/mainproc.c:883
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Signature faite %.*s avec une cl� %s ID %08lX\n"
 
+#: g10/mainproc.c:895
+#, fuzzy
+msgid "encrypted message is valid\n"
+msgstr "la fonction de hachage s�lectionn�e est invalide\n"
+
+#: g10/mainproc.c:899
+msgid "WARNING: encrypted message has been manipulated!\n"
+msgstr ""
+
+#: g10/mainproc.c:904
+#, fuzzy, c-format
+msgid "Can't check MDC: %s\n"
+msgstr "Ne peut v�rifier la signature : %s\n"
+
 #. just in case that we have no userid
-#: g10/mainproc.c:881 g10/mainproc.c:892
+#: g10/mainproc.c:925 g10/mainproc.c:936
 msgid "BAD signature from \""
 msgstr "MAUVAISE signature de \""
 
-#: g10/mainproc.c:882 g10/mainproc.c:893
+#: g10/mainproc.c:926 g10/mainproc.c:937
 msgid "Good signature from \""
 msgstr "Bonne signature de \""
 
-#: g10/mainproc.c:884
+#: g10/mainproc.c:928
 msgid "                aka \""
 msgstr "              alias \""
 
-#: g10/mainproc.c:930
+#: g10/mainproc.c:974
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Ne peut v�rifier la signature : %s\n"
 
-#: g10/mainproc.c:1003
+#: g10/mainproc.c:1047
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signature d'un ancien style (PGP 2.x)\n"
 
-#: g10/mainproc.c:1008
+#: g10/mainproc.c:1052
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquet racine invalide d�tect� dans proc_tree()\n"
 
@@ -2200,7 +2306,7 @@ msgstr ""
 "Les cl�s RSA sont d�conseill�es : consid�rez cr�er une nouvelle cl�\n"
 "et l'utiliser dans l'avenir\n"
 
-#: g10/misc.c:235
+#: g10/misc.c:236
 msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr ""
 "Cet algorithme de chiffrement est d�conseill� ; utilisez-en un\n"
@@ -2216,7 +2322,7 @@ msgstr "ne peut g�rer l'algorithme � cl� publique %d\n"
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "un sous-paquet de type %d poss�de un bit critique\n"
 
-#: g10/passphrase.c:151
+#: g10/passphrase.c:157
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2226,21 +2332,21 @@ msgstr ""
 "Vous avez besoin d'un mot de passe pour d�verrouiller la cl� secr�te pour\n"
 "l'utilisateur: \""
 
-#: g10/passphrase.c:160
+#: g10/passphrase.c:166
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "cl� de %u bits %s, ID %08lX, cr��e le %s"
 
-#: g10/passphrase.c:165
+#: g10/passphrase.c:171
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (ID cl� principale %08lX)"
 
-#: g10/passphrase.c:184
+#: g10/passphrase.c:190
 msgid "Enter passphrase: "
 msgstr "Entrez le mot de passe : "
 
-#: g10/passphrase.c:188
+#: g10/passphrase.c:194
 msgid "Repeat passphrase: "
 msgstr "R�p�tez le mot de passe : "
 
@@ -2283,42 +2389,49 @@ msgstr ""
 "NOTE : l'algorithme de chiffrement %d n'a pas �t� trouv� dans les "
 "pr�f�rences\n"
 
-#: g10/seckey-cert.c:57
+#: g10/seckey-cert.c:55
 #, c-format
 msgid "protection algorithm %d is not supported\n"
 msgstr "l'algorithme de protection %d n'est pas support�\n"
 
-#: g10/seckey-cert.c:177
+#: g10/seckey-cert.c:171
 msgid "Invalid passphrase; please try again ...\n"
 msgstr "Mot de passe invalide ; r�essayez...\n"
 
-#: g10/seckey-cert.c:232
+#: g10/seckey-cert.c:227
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "ATTENTION : Cl� faible d�tect�e - changez encore le mot de passe.\n"
 
-#: g10/sig-check.c:195
+#: g10/sig-check.c:186
+#, fuzzy
+msgid "assuming bad MDC due to an unknown critical bit\n"
+msgstr ""
+"la signature est suppos�e �tre fausse car un bit critique est\n"
+"inconnu\n"
+
+#: g10/sig-check.c:282
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "Ceci est une cl� ElGamal g�n�r�e par PGP qui n'est PAS s�re pour les\n"
 "signatures !\n"
 
-#: g10/sig-check.c:203
+#: g10/sig-check.c:290
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "la cl� publique est plus r�cente de %lu seconde que la signature\n"
 
-#: g10/sig-check.c:204
+#: g10/sig-check.c:291
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "la cl� publique est plus r�cente de %lu secondes que la signature\n"
 
-#: g10/sig-check.c:220
+#: g10/sig-check.c:307
 #, c-format
 msgid "NOTE: signature key expired %s\n"
 msgstr "NOTE : la cl� de signature a expir� le %s\n"
 
-#: g10/sig-check.c:277
+#: g10/sig-check.c:364
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 "la signature est suppos�e �tre fausse car un bit critique est\n"
@@ -2329,7 +2442,7 @@ msgstr ""
 msgid "%s signature from: %s\n"
 msgstr "Signature %s de : %s\n"
 
-#: g10/sign.c:210 g10/sign.c:493
+#: g10/sign.c:210 g10/sign.c:496
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "ne peut cr�er %s : %s\n"
@@ -2338,11 +2451,6 @@ msgstr "ne peut cr�er %s : %s\n"
 msgid "signing:"
 msgstr "signature :"
 
-#: g10/sign.c:346
-#, c-format
-msgid "WARNING: `%s' is an empty file\n"
-msgstr "ATTENTION : `%s' est un fichier vide\n"
-
 #: g10/textfilter.c:122
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
@@ -2353,12 +2461,12 @@ msgstr "ne peut pas traiter les ligne plus longues que %d caract�res\n"
 msgid "input line longer than %d characters\n"
 msgstr "la ligne d'entr�e est plus longue que %d caract�res\n"
 
-#: g10/tdbio.c:116 g10/tdbio.c:1504
+#: g10/tdbio.c:116 g10/tdbio.c:1505
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "enregistrement de base de confiance %lu : lseek a �chou� : %s\n"
 
-#: g10/tdbio.c:122 g10/tdbio.c:1511
+#: g10/tdbio.c:122 g10/tdbio.c:1512
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
@@ -2389,12 +2497,12 @@ msgstr "%s : r�pertoire cr��\n"
 msgid "%s: directory does not exist!\n"
 msgstr "%s : le r�pertoire n'existe pas !\n"
 
-#: g10/openfile.c:111 g10/openfile.c:181 g10/ringedit.c:1325 g10/tdbio.c:457
+#: g10/openfile.c:111 g10/openfile.c:181 g10/ringedit.c:1344 g10/tdbio.c:457
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s : ne peut cr�er : %s\n"
 
-#: g10/tdbio.c:472 g10/tdbio.c:520
+#: g10/tdbio.c:472 g10/tdbio.c:521
 #, c-format
 msgid "%s: can't create lock\n"
 msgstr "%s : ne peut cr�er de verrouillage\n"
@@ -2409,86 +2517,86 @@ msgstr "%s : n'a pas pu cr�er un enregistrement de version : %s"
 msgid "%s: invalid trustdb created\n"
 msgstr "%s : base de confiance invalide cr��e\n"
 
-#: g10/tdbio.c:492
+#: g10/tdbio.c:493
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s : base de confiance cr��e\n"
 
-#: g10/tdbio.c:529
+#: g10/tdbio.c:530
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s : base de confiance invalide\n"
 
-#: g10/tdbio.c:562
+#: g10/tdbio.c:563
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s : la cr�ation de la table de hachage a �chou� : %s\n"
 
-#: g10/tdbio.c:570
+#: g10/tdbio.c:571
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr ""
 "%s : erreur pendant la mise � jour de l'enregistrement de version : %s\n"
 
-#: g10/tdbio.c:586 g10/tdbio.c:625 g10/tdbio.c:647 g10/tdbio.c:677
-#: g10/tdbio.c:702 g10/tdbio.c:1437 g10/tdbio.c:1464
+#: g10/tdbio.c:587 g10/tdbio.c:626 g10/tdbio.c:648 g10/tdbio.c:678
+#: g10/tdbio.c:703 g10/tdbio.c:1438 g10/tdbio.c:1465
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s : erreur pendant la lecture de l'enregistrement de version : %s\n"
 
-#: g10/tdbio.c:599 g10/tdbio.c:658
+#: g10/tdbio.c:600 g10/tdbio.c:659
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s : erreur pendant l'�criture de l'enregistrement de version : %s\n"
 
-#: g10/tdbio.c:1131
+#: g10/tdbio.c:1132
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "base de confiance : � lseek() � a �chou� : %s\n"
 
-#: g10/tdbio.c:1139
+#: g10/tdbio.c:1140
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "base de confiance : la lecture a �chou� (n=%d) : %s\n"
 
-#: g10/tdbio.c:1160
+#: g10/tdbio.c:1161
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s : ce n'est pas un fichier de base de confiance\n"
 
-#: g10/tdbio.c:1176
+#: g10/tdbio.c:1177
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s : enregistrement de version avec un num�ro %lu\n"
 
-#: g10/tdbio.c:1181
+#: g10/tdbio.c:1182
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s : version %d du fichier invalide\n"
 
-#: g10/tdbio.c:1470
+#: g10/tdbio.c:1471
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s : erreur pendant la lecture de l'enregistrement libre : %s\n"
 
-#: g10/tdbio.c:1478
+#: g10/tdbio.c:1479
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr ""
 "%s : erreur pendant l'�criture de l'enregistrement de\n"
 "r�pertoire : %s\n"
 
-#: g10/tdbio.c:1488
+#: g10/tdbio.c:1489
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s : n'a pu mettre un enregistrement � z�ro : %s\n"
 
-#: g10/tdbio.c:1518
+#: g10/tdbio.c:1519
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s : n'a pas pu ajouter un enregistrement : %s\n"
 
-#: g10/tdbio.c:1629
+#: g10/tdbio.c:1630
 msgid "The trustdb is corrupted; please run \"gpgm --fix-trustdb\".\n"
 msgstr ""
 "La base de confiance est corrompue ; ex�cutez � gpgm --fix-trustdb �.\n"
@@ -2713,7 +2821,7 @@ msgstr "Trop de pr�f�rences"
 msgid "Too many preference items"
 msgstr "Trop d'items de pr�f�rence"
 
-#: g10/trustdb.c:1549 g10/trustdb.c:3045 g10/trustdb.c:3075
+#: g10/trustdb.c:1549 g10/trustdb.c:3075 g10/trustdb.c:3105
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr ""
 "ATTENTION : les enregistrements de pr�f�rences longs ne sont pas encore\n"
@@ -2886,22 +2994,22 @@ msgstr "cl� %08lX.%lu : a expir� le %s\n"
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "cl� %08lX.%lu : la v�rification de confiance a �chou�: %s\n"
 
-#: g10/trustdb.c:2851
+#: g10/trustdb.c:2881
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "l'utilisateur '%s' n'a pas �t� trouv� : %s\n"
 
-#: g10/trustdb.c:2853
+#: g10/trustdb.c:2883
 #, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "probl�me de recherche de '%s' dans la base de confiance : %s\n"
 
-#: g10/trustdb.c:2856
+#: g10/trustdb.c:2886
 #, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr "l'utilisateur '%s' n'est pas dans la base de confiance - insertion\n"
 
-#: g10/trustdb.c:2859
+#: g10/trustdb.c:2889
 #, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "n'a pas pu ins�rer '%s' dans la base de confiance : %s\n"
@@ -2911,27 +3019,27 @@ msgstr "n'a pas pu ins�rer '%s' dans la base de confiance : %s\n"
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s : ne peut cr�er le porte-cl�s : %s\n"
 
-#: g10/ringedit.c:322 g10/ringedit.c:1330
+#: g10/ringedit.c:333 g10/ringedit.c:1349
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s : porte-cl�s cr��\n"
 
-#: g10/ringedit.c:1507
+#: g10/ringedit.c:1526
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr ""
 "ATTENTION : 2 fichiers avec des informations confidentielles existent.\n"
 
-#: g10/ringedit.c:1508
+#: g10/ringedit.c:1527
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s est le fichier original\n"
 
-#: g10/ringedit.c:1509
+#: g10/ringedit.c:1528
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s est le nouveau\n"
 
-#: g10/ringedit.c:1510
+#: g10/ringedit.c:1529
 msgid "Please fix this possible security flaw\n"
 msgstr "R�parez ce probl�me de s�curit� possible\n"
 
@@ -2979,17 +3087,17 @@ msgstr "les donn�es sign�es sont suppos�es �tre dans `%s'\n"
 msgid "%s: new options file created\n"
 msgstr "%s : nouveau fichier d'options cr��\n"
 
-#: g10/encr-data.c:59
+#: g10/encr-data.c:60
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "donn�es chiffr�es avec %s\n"
 
-#: g10/encr-data.c:61
+#: g10/encr-data.c:62
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "chiffr� avec l'algorithme inconnu %d\n"
 
-#: g10/encr-data.c:74
+#: g10/encr-data.c:77
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
@@ -3162,3 +3270,17 @@ msgstr "Pas d'aide disponible"
 #, c-format
 msgid "No help available for `%s'"
 msgstr "Pas d'aide disponible pour `%s'"
+
+#~ msgid "Usage: gpgm [options] [files] (-h for help)"
+#~ msgstr "Utilisation: gpgm [options] [fichiers] (-h pour l'aide)"
+
+#
+#~ msgid ""
+#~ "Syntax: gpgm [options] [files]\n"
+#~ "GnuPG maintenance utility\n"
+#~ msgstr ""
+#~ "Syntaxe: gpgm [options] [fichiers]\n"
+#~ "utilitaire de maitenance de GnuPG\n"
+
+#~ msgid "usage: gpgm [options] "
+#~ msgstr "utilisation: gpgm [options] "
diff --git a/po/it.po b/po/it.po
index 362a25f28..8efbf3907 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-0.4.3\n"
-"POT-Creation-Date: 1999-03-20 13:40+0100\n"
+"POT-Creation-Date: 1999-05-06 13:37+0200\n"
 "PO-Revision-Date: 1998-11-09 16:19+01:00\n"
 "Last-Translator: Marco d'Itri <[email protected]>\n"
 "Language-Team: Italian <[email protected]>\n"
@@ -25,11 +25,11 @@ msgstr ""
 msgid "(you may have used the wrong program for this task)\n"
 msgstr ""
 
-#: util/miscutil.c:143
+#: util/miscutil.c:156
 msgid "yes"
 msgstr "s�"
 
-#: util/miscutil.c:144
+#: util/miscutil.c:157
 msgid "yY"
 msgstr "sS"
 
@@ -268,6 +268,11 @@ msgstr "Non gestito"
 msgid "network error"
 msgstr "Errore generale"
 
+#: util/errors.c:102
+#, fuzzy
+msgid "not encrypted"
+msgstr "cifra dati"
+
 #: util/logger.c:178
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
@@ -278,13 +283,13 @@ msgstr "... questo � un bug (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "Hai trovato un bug... (%s:%d)\n"
 
-#: cipher/random.c:403
+#: cipher/random.c:408
 #, fuzzy
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr ""
 "Attenzione: si sta usando un generatore di numeri casuali non sicuro!!\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:409
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -307,7 +312,7 @@ msgstr ""
 "altra cosa per dare all'OS la possibilit� di raccogliere altra entropia!\n"
 "(Servono ancora %d altri byte)\n"
 
-#: g10/g10.c:166
+#: g10/g10.c:163
 msgid ""
 "@Commands:\n"
 " "
@@ -315,131 +320,131 @@ msgstr ""
 "@Comandi:\n"
 " "
 
-#: g10/g10.c:169
+#: g10/g10.c:165
 msgid "|[file]|make a signature"
 msgstr "|[file]|fai una firma"
 
-#: g10/g10.c:170
+#: g10/g10.c:166
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|fai una firma mantenendo il testo in chiaro"
 
-#: g10/g10.c:171
+#: g10/g10.c:167
 msgid "make a detached signature"
 msgstr "fai una firma separata"
 
-#: g10/g10.c:172
+#: g10/g10.c:168
 msgid "encrypt data"
 msgstr "cifra dati"
 
-#: g10/g10.c:173
+#: g10/g10.c:169
 msgid "encryption only with symmetric cipher"
 msgstr "cifra solo con un cifrario simmetrico"
 
-#: g10/g10.c:174
+#: g10/g10.c:170
 msgid "store only"
 msgstr "immagazzina soltanto"
 
-#: g10/g10.c:175
+#: g10/g10.c:171
 msgid "decrypt data (default)"
 msgstr "decifra dati (predefinito)"
 
-#: g10/g10.c:176
+#: g10/g10.c:172
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/g10.c:178
+#: g10/g10.c:173
 msgid "list keys"
 msgstr "elenca le chiavi"
 
-#: g10/g10.c:179
+#: g10/g10.c:175
 msgid "list keys and signatures"
 msgstr "elenca le chiavi e le firme"
 
-#: g10/g10.c:180
+#: g10/g10.c:176
 msgid "check key signatures"
 msgstr "controlla le firme delle chiavi"
 
-#: g10/g10.c:181
+#: g10/g10.c:177
 msgid "list keys and fingerprints"
 msgstr "elenca le chiavi e le impronte digitali"
 
-#: g10/g10.c:182
+#: g10/g10.c:178
 msgid "list secret keys"
 msgstr "elenca le chiavi segrete"
 
-#: g10/g10.c:184
+#: g10/g10.c:179
 msgid "generate a new key pair"
 msgstr "genera una nuova coppia di chiavi"
 
-#: g10/g10.c:186
+#: g10/g10.c:180
 msgid "remove key from the public keyring"
 msgstr "rimuove una chiave dal portachiavi pubblico"
 
-#: g10/g10.c:188
+#: g10/g10.c:181
 msgid "sign or edit a key"
 msgstr "firma o modifica una chiave"
 
-#: g10/g10.c:189
+#: g10/g10.c:182
 msgid "generate a revocation certificate"
 msgstr "genera un certificato di revoca"
 
-#: g10/g10.c:191
+#: g10/g10.c:183
 msgid "export keys"
 msgstr "esporta delle chiavi"
 
-#: g10/g10.c:192
+#: g10/g10.c:184
 msgid "export keys to a key server"
 msgstr ""
 
-#: g10/g10.c:193
+#: g10/g10.c:185
 msgid "import keys from a key server"
 msgstr ""
 
-#: g10/g10.c:196
+#: g10/g10.c:188
 msgid "import/merge keys"
 msgstr "importa/aggiungi delle chiavi"
 
-#: g10/g10.c:198
+#: g10/g10.c:190
 msgid "list only the sequence of packets"
 msgstr "elenca solo la sequenza dei pacchetti"
 
-#: g10/g10.c:201
+#: g10/g10.c:192
 msgid "export the ownertrust values"
 msgstr "esporta i valori di fiducia"
 
-#: g10/g10.c:203
+#: g10/g10.c:194
 msgid "import ownertrust values"
 msgstr "importa i valori di fiducia"
 
-#: g10/g10.c:205
+#: g10/g10.c:196
 msgid "|[NAMES]|update the trust database"
 msgstr "|[NAMES]|controlla il database della fiducia"
 
-#: g10/g10.c:207
+#: g10/g10.c:198
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NAMES]|controlla il database della fiducia"
 
-#: g10/g10.c:208
+#: g10/g10.c:199
 msgid "fix a corrupted trust database"
 msgstr "ripara un database della fiducia rovinato"
 
-#: g10/g10.c:209
+#: g10/g10.c:200
 msgid "De-Armor a file or stdin"
 msgstr "rimuovi l'armatura a un file o a stdin"
 
-#: g10/g10.c:210
+#: g10/g10.c:201
 msgid "En-Armor a file or stdin"
 msgstr "crea l'armatura a un file o a stdin"
 
-#: g10/g10.c:211
+#: g10/g10.c:202
 msgid "|algo [files]|print message digests"
 msgstr "|algo [files]|stampa tutti i message digests"
 
-#: g10/g10.c:212
+#: g10/g10.c:203
 msgid "print all message digests"
 msgstr "stampa tutti i message digests"
 
-#: g10/g10.c:219
+#: g10/g10.c:209
 msgid ""
 "@\n"
 "Options:\n"
@@ -449,145 +454,150 @@ msgstr ""
 "Opzioni:\n"
 " "
 
-#: g10/g10.c:221
+#: g10/g10.c:211
 msgid "create ascii armored output"
 msgstr "crea un output ascii con armatura"
 
-#: g10/g10.c:222
+#: g10/g10.c:212
 #, fuzzy
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|usa l'algoritmo di cifratura NOME"
 
-#: g10/g10.c:227
+#: g10/g10.c:216
 msgid "use this user-id to sign or decrypt"
 msgstr "usa questo user-id per firmare o decifrare"
 
-#: g10/g10.c:228
+#: g10/g10.c:217
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|imposta il livello di compressione (0 disabilita)"
 
-#: g10/g10.c:230
+#: g10/g10.c:219
 msgid "use canonical text mode"
 msgstr "usa il modo testo canonico"
 
-#: g10/g10.c:232
+#: g10/g10.c:220
 msgid "use as output file"
 msgstr "usa come file di output"
 
-#: g10/g10.c:233
+#: g10/g10.c:221
 msgid "verbose"
 msgstr "prolisso"
 
-#: g10/g10.c:234
+#: g10/g10.c:222
 msgid "be somewhat more quiet"
 msgstr "meno prolisso"
 
-#: g10/g10.c:235
+#: g10/g10.c:223
 msgid "force v3 signatures"
 msgstr "forza l'uso di firme v3"
 
-#: g10/g10.c:236
+#: g10/g10.c:224
+#, fuzzy
+msgid "always use a MDC for encryption"
+msgstr "usa questo user-id per cifrare"
+
+#: g10/g10.c:225
 msgid "do not make any changes"
 msgstr ""
 
-#: g10/g10.c:237
+#: g10/g10.c:226
 msgid "batch mode: never ask"
 msgstr "modo batch: non fare domande"
 
-#: g10/g10.c:238
+#: g10/g10.c:227
 msgid "assume yes on most questions"
 msgstr "assumi \"s�\" a quasi tutte le domande"
 
-#: g10/g10.c:239
+#: g10/g10.c:228
 msgid "assume no on most questions"
 msgstr "assumi \"no\" a quasi tutte le domande"
 
-#: g10/g10.c:240
+#: g10/g10.c:229
 msgid "add this keyring to the list of keyrings"
 msgstr "aggiungi questo portachiavi alla lista"
 
-#: g10/g10.c:241
+#: g10/g10.c:230
 msgid "add this secret keyring to the list"
 msgstr "aggiungi questo portachiavi segreto alla lista"
 
-#: g10/g10.c:242
+#: g10/g10.c:231
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|usa NAME come chiave segreta predefinita"
 
-#: g10/g10.c:243
+#: g10/g10.c:232
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr ""
 
-#: g10/g10.c:244
+#: g10/g10.c:233
 #, fuzzy
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAME|usa l'algoritmo di cifratura NOME"
 
-#: g10/g10.c:245
+#: g10/g10.c:234
 msgid "read options from file"
 msgstr "leggi le opzioni dal file"
 
-#: g10/g10.c:247
+#: g10/g10.c:236
 msgid "set debugging flags"
 msgstr "imposta i flag di debugging"
 
-#: g10/g10.c:248
+#: g10/g10.c:237
 msgid "enable full debugging"
 msgstr "abilita il debugging completo"
 
-#: g10/g10.c:249
+#: g10/g10.c:238
 msgid "|FD|write status info to this FD"
 msgstr "|FD|scrivi le informazioni di stato su questo fd"
 
-#: g10/g10.c:250
+#: g10/g10.c:239
 msgid "do not write comment packets"
 msgstr "non scrivere pacchetti di commento"
 
-#: g10/g10.c:251
+#: g10/g10.c:240
 msgid "(default is 1)"
 msgstr "(predefinito � 1)"
 
-#: g10/g10.c:252
+#: g10/g10.c:241
 msgid "(default is 3)"
 msgstr "(predefinito � 3)"
 
-#: g10/g10.c:254
+#: g10/g10.c:243
 msgid "|FILE|load extension module FILE"
 msgstr "|FILE|carica il modulo di estensione FILE"
 
-#: g10/g10.c:255
+#: g10/g10.c:244
 msgid "emulate the mode described in RFC1991"
 msgstr "emula il modo descritto nel RFC1991"
 
-#: g10/g10.c:256
+#: g10/g10.c:245
 msgid "|N|use passphrase mode N"
 msgstr "|N|usa il modo N per la passphrase"
 
-#: g10/g10.c:258
+#: g10/g10.c:247
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAME|usa l'algoritmo di message digest NOME"
 
-#: g10/g10.c:260
+#: g10/g10.c:249
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAME|usa l'alg. di cifratura NOME per le passphrase"
 
-#: g10/g10.c:262
+#: g10/g10.c:250
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|usa l'algoritmo di cifratura NOME"
 
-#: g10/g10.c:263
+#: g10/g10.c:251
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|usa l'algoritmo di message digest NOME"
 
-#: g10/g10.c:264
+#: g10/g10.c:252
 msgid "|N|use compress algorithm N"
 msgstr "|N|usa l'algoritmo di compressione N"
 
-#: g10/g10.c:265
+#: g10/g10.c:253
 msgid "throw keyid field of encrypted packets"
 msgstr "elimina il campo keyid dei pacchetti crittografati"
 
-#: g10/g10.c:273
+#: g10/g10.c:255
 msgid ""
 "@\n"
 "Examples:\n"
@@ -607,27 +617,15 @@ msgstr ""
 " --list-keys [nomi]         mostra le chiavi\n"
 " --fingerprint [nomi]       mostra le impronte digitali\n"
 
-#: g10/g10.c:353
+#: g10/g10.c:323
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Per favore segnala i bug a <[email protected]>.\n"
 
-#: g10/g10.c:358
-msgid "Usage: gpgm [options] [files] (-h for help)"
-msgstr "Uso: gpgm [opzioni] [file] (-h per l'aiuto)"
-
-#: g10/g10.c:360
+#: g10/g10.c:327
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opzioni] [file] (-h per l'aiuto)"
 
-#: g10/g10.c:365
-msgid ""
-"Syntax: gpgm [options] [files]\n"
-"GnuPG maintenance utility\n"
-msgstr ""
-"Sintassi: gpgm [opzioni] [file]\n"
-"Utility di manutenzione di GnuPG\n"
-
-#: g10/g10.c:368
+#: g10/g10.c:330
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -637,7 +635,7 @@ msgstr ""
 "firma, controlla, cifra o decifra\n"
 "l'operazione predefinita dipende dai dati di input\n"
 
-#: g10/g10.c:374
+#: g10/g10.c:335
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -645,227 +643,223 @@ msgstr ""
 "\n"
 "Algoritmi gestiti:\n"
 
-#: g10/g10.c:449
-msgid "usage: gpgm [options] "
-msgstr "uso: gpgm [options] "
-
-#: g10/g10.c:451
+#: g10/g10.c:409
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [options] "
 
-#: g10/g10.c:492
+#: g10/g10.c:449
 msgid "conflicting commands\n"
 msgstr "comandi in conflitto\n"
 
-#: g10/g10.c:631
+#: g10/g10.c:576
 #, fuzzy, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "nota: nessun file con opzioni predefinite `%s'\n"
 
-#: g10/g10.c:635
+#: g10/g10.c:580
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file con opzioni predefinite `%s': %s\n"
 
-#: g10/g10.c:642
+#: g10/g10.c:587
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lettura delle opzioni da `%s'\n"
 
-#: g10/g10.c:797
+#: g10/g10.c:731
 #, fuzzy, c-format
 msgid "%s is not a valid character set\n"
 msgstr "Carattere non valido nel commento\n"
 
-#: g10/g10.c:838 g10/g10.c:850
+#: g10/g10.c:774 g10/g10.c:786
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non � valido\n"
 
-#: g10/g10.c:844 g10/g10.c:856
+#: g10/g10.c:780 g10/g10.c:792
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non � valido\n"
 
-#: g10/g10.c:859
+#: g10/g10.c:795
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "l'algoritmo di compressione deve essere tra %d e %d\n"
 
-#: g10/g10.c:861
+#: g10/g10.c:797
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve essere maggiore di 0\n"
 
-#: g10/g10.c:863
+#: g10/g10.c:799
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve essere maggiore di 1\n"
 
-#: g10/g10.c:865
+#: g10/g10.c:801
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr ""
 
-#: g10/g10.c:868
+#: g10/g10.c:804
 #, fuzzy
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "nota: il modo S2K semplice (0) � fortemente scoraggiato\n"
 
-#: g10/g10.c:872
+#: g10/g10.c:808
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K non valido; deve essere 0, 1 o 3\n"
 
-#: g10/g10.c:949
+#: g10/g10.c:885
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: g10/g10.c:955
+#: g10/g10.c:891
 msgid "--store [filename]"
 msgstr "--store [nomefile]"
 
-#: g10/g10.c:963
+#: g10/g10.c:898
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nomefile]"
 
-#: g10/g10.c:971
+#: g10/g10.c:906
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nomefile]"
 
-#: g10/g10.c:984
+#: g10/g10.c:919
 msgid "--sign [filename]"
 msgstr "--sign [nomefile]"
 
-#: g10/g10.c:997
+#: g10/g10.c:932
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/g10.c:1011
+#: g10/g10.c:946
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nomefile]"
 
-#: g10/g10.c:1023
+#: g10/g10.c:958
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nomefile]"
 
-#: g10/g10.c:1032
+#: g10/g10.c:967
 #, fuzzy
 msgid "--edit-key username [commands]"
 msgstr "--edit-key nomeutente"
 
-#: g10/g10.c:1048
+#: g10/g10.c:981
 msgid "--delete-secret-key username"
 msgstr "--delete-secret-key nomeutente"
 
-#: g10/g10.c:1051
+#: g10/g10.c:984
 msgid "--delete-key username"
 msgstr "--delete-key nomeutente"
 
-#: g10/encode.c:229 g10/g10.c:1074 g10/sign.c:311
+#: g10/encode.c:234 g10/g10.c:1007 g10/sign.c:311
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "impossibile aprire `%s': %s\n"
 
-#: g10/g10.c:1085
+#: g10/g10.c:1018
 msgid "-k[v][v][v][c] [userid] [keyring]"
 msgstr "-k[v][v][v][c] [userid] [portachiavi]"
 
-#: g10/g10.c:1149
+#: g10/g10.c:1077
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "rimozione dell'armatura fallita: %s\n"
 
-#: g10/g10.c:1157
+#: g10/g10.c:1085
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creazione dell'armatura fallita: %s\n"
 
-#: g10/g10.c:1223
+#: g10/g10.c:1151
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo di hash non valido `%s'\n"
 
-#: g10/g10.c:1302
+#: g10/g10.c:1226
 msgid "[filename]"
 msgstr "[nomefile]"
 
-#: g10/g10.c:1306
+#: g10/g10.c:1230
 msgid "Go ahead and type your message ...\n"
 msgstr ""
 
-#: g10/decrypt.c:59 g10/g10.c:1309 g10/verify.c:66
+#: g10/decrypt.c:59 g10/g10.c:1233 g10/verify.c:66
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossibile aprire `%s'\n"
 
-#: g10/armor.c:297
+#: g10/armor.c:296
 #, c-format
 msgid "armor: %s\n"
 msgstr "armatura: %s\n"
 
-#: g10/armor.c:320
+#: g10/armor.c:319
 msgid "invalid armor header: "
 msgstr "header dell'armatura non valido: "
 
-#: g10/armor.c:327
+#: g10/armor.c:326
 msgid "armor header: "
 msgstr "header dell'armatura: "
 
-#: g10/armor.c:338
+#: g10/armor.c:337
 msgid "invalid clearsig header\n"
 msgstr "header della firma in chiaro non valido\n"
 
-#: g10/armor.c:390
+#: g10/armor.c:389
 #, fuzzy
 msgid "nested clear text signatures\n"
 msgstr "|[file]|fai una firma mantenendo il testo in chiaro"
 
-#: g10/armor.c:499
+#: g10/armor.c:498
 msgid "invalid dash escaped line: "
 msgstr "riga protetta con il trattino non valida: "
 
-#: g10/armor.c:511
+#: g10/armor.c:510
 #, fuzzy
 msgid "unexpected armor:"
 msgstr "Dati inaspettati"
 
-#: g10/armor.c:628
+#: g10/armor.c:627
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "Carattere radix64 non valido %02x saltato\n"
 
-#: g10/armor.c:671
+#: g10/armor.c:670
 msgid "premature eof (no CRC)\n"
 msgstr "eof prematura (nessun CRC)\n"
 
-#: g10/armor.c:705
+#: g10/armor.c:704
 msgid "premature eof (in CRC)\n"
 msgstr "eof prematura (nel CRC)\n"
 
-#: g10/armor.c:709
+#: g10/armor.c:708
 msgid "malformed CRC\n"
 msgstr "CRC malformato\n"
 
-#: g10/armor.c:713
+#: g10/armor.c:712
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "errore nel CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:730
+#: g10/armor.c:729
 msgid "premature eof (in Trailer)\n"
 msgstr "eof prematura (nella coda)\n"
 
-#: g10/armor.c:734
+#: g10/armor.c:733
 msgid "error in trailer line\n"
 msgstr "errore nella riga della coda\n"
 
-#: g10/armor.c:998
+#: g10/armor.c:997
 #, fuzzy
 msgid "no valid OpenPGP data found.\n"
 msgstr "Non sono stati trovati dati RFC1991 o OpenPGP validi.\n"
 
-#: g10/armor.c:1002
+#: g10/armor.c:1001
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr ""
 
-#: g10/armor.c:1006
+#: g10/armor.c:1005
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -961,41 +955,46 @@ msgstr ""
 msgid "key %08lX: key has been revoked!\n"
 msgstr "chiave %08lX: accettata come chiave segreta\n"
 
-#: g10/pkclist.c:287 g10/pkclist.c:391
+#: g10/pkclist.c:287 g10/pkclist.c:297 g10/pkclist.c:403
 msgid "Use this key anyway? "
 msgstr "Uso lo stesso questa chiave? "
 
-#: g10/pkclist.c:311
+#: g10/pkclist.c:291
+#, fuzzy, c-format
+msgid "key %08lX: subkey has been revoked!\n"
+msgstr "chiave %08lX: accettata come chiave segreta\n"
+
+#: g10/pkclist.c:321
 #, fuzzy, c-format
 msgid "%08lX: key has expired\n"
 msgstr "Nota: questa chiave � scaduta!\n"
 
-#: g10/pkclist.c:317
+#: g10/pkclist.c:327
 #, c-format
 msgid "%08lX: no info to calculate a trust probability\n"
 msgstr ""
 
-#: g10/pkclist.c:331
+#: g10/pkclist.c:341
 #, fuzzy, c-format
 msgid "%08lX: We do NOT trust this key\n"
 msgstr "ATTENZIONE: NON ci fidiamo di questa chiave!\n"
 
-#: g10/pkclist.c:337
+#: g10/pkclist.c:347
 #, c-format
 msgid ""
 "%08lX: It is not sure that this key really belongs to the owner\n"
 "but it is accepted anyway\n"
 msgstr ""
 
-#: g10/pkclist.c:343
+#: g10/pkclist.c:353
 msgid "This key probably belongs to the owner\n"
 msgstr ""
 
-#: g10/pkclist.c:348
+#: g10/pkclist.c:358
 msgid "This key belongs to us\n"
 msgstr ""
 
-#: g10/pkclist.c:386
+#: g10/pkclist.c:398
 msgid ""
 "It is NOT certain that the key belongs to its owner.\n"
 "If you *really* know what you are doing, you may answer\n"
@@ -1007,56 +1006,61 @@ msgstr ""
 "prossima domanda.\n"
 "\n"
 
-#: g10/pkclist.c:399
+#: g10/pkclist.c:411
 msgid "WARNING: Using untrusted key!\n"
 msgstr "ATTENZIONE: uso di una chiave non fidata!\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:447
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "ATTENZIONE: questa chiave � stata revocata dal suo proprietario!\n"
 
-#: g10/pkclist.c:436
+#: g10/pkclist.c:448
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "         Questo pu� significare che la firma � stata falsificata.\n"
 
-#: g10/pkclist.c:457
+#: g10/pkclist.c:452
+#, fuzzy
+msgid "WARNING: This subkey has been revoked by its owner!\n"
+msgstr "ATTENZIONE: questa chiave � stata revocata dal suo proprietario!\n"
+
+#: g10/pkclist.c:473
 msgid "Note: This key has expired!\n"
 msgstr "Nota: questa chiave � scaduta!\n"
 
-#: g10/pkclist.c:464
+#: g10/pkclist.c:480
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "ATTENZIONE: questa chiave non � certificata con una firma fidata!\n"
 
-#: g10/pkclist.c:466
+#: g10/pkclist.c:482
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         Non ci sono indicazioni che la firma appartenga al proprietario.\n"
 
-#: g10/pkclist.c:482
+#: g10/pkclist.c:498
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "ATTENZIONE: NON ci fidiamo di questa chiave!\n"
 
-#: g10/pkclist.c:483
+#: g10/pkclist.c:499
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "          La firma � probabilmente un FALSO.\n"
 
-#: g10/pkclist.c:490
+#: g10/pkclist.c:506
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "ATTENZIONE: questa chiave non � certificata con firme abbastanza fidate!\n"
 
-#: g10/pkclist.c:493
+#: g10/pkclist.c:509
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Non � sicuro che la firma appartenga al proprietario.\n"
 
-#: g10/pkclist.c:546 g10/pkclist.c:559 g10/pkclist.c:622 g10/pkclist.c:650
+#: g10/pkclist.c:562 g10/pkclist.c:575 g10/pkclist.c:638 g10/pkclist.c:666
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: saltata: %s\n"
 
-#: g10/pkclist.c:568
+#: g10/pkclist.c:584
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1064,20 +1068,20 @@ msgstr ""
 "Non hai specificato un user ID. (puoi usare \"-r\")\n"
 "\n"
 
-#: g10/pkclist.c:573
+#: g10/pkclist.c:589
 msgid "Enter the user ID: "
 msgstr "Inserisci l'user ID: "
 
-#: g10/pkclist.c:584
+#: g10/pkclist.c:600
 msgid "No such user ID.\n"
 msgstr "User ID inesistente.\n"
 
-#: g10/pkclist.c:630
+#: g10/pkclist.c:646
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: errore nel controllare la chiave: %s\n"
 
-#: g10/pkclist.c:656
+#: g10/pkclist.c:672
 msgid "no valid addressees\n"
 msgstr "nessun indirizzo valido\n"
 
@@ -1156,7 +1160,20 @@ msgstr "DSA permette solo chiavi di dimensioni da 512 a 1024\n"
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "la chiave � troppo corta; 768 � il minimo valore permesso.\n"
 
-#: g10/keygen.c:459
+#. It is ridiculous and an annoyance to use larger key sizes!
+#. * GnuPG can handle much larger sizes; but it takes an eternity
+#. * to create such a key (but less than the time the Sirius
+#. * Computer Corporation needs to process one of the usual
+#. * complaints) and {de,en}cryption although needs some time.
+#. * So, before you complain about this limitation, I suggest that
+#. * you start a discussion with Marvin about this theme and then
+#. * do whatever you want.
+#: g10/keygen.c:466
+#, fuzzy, c-format
+msgid "keysize too large; %d is largest value allowed.\n"
+msgstr "la chiave � troppo corta; 768 � il minimo valore permesso.\n"
+
+#: g10/keygen.c:471
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1164,11 +1181,11 @@ msgstr ""
 "Chiavi pi� lunghe di 2048 non sono consigliate perch� i calcoli sono \n"
 "VERAMENTE lunghi!\n"
 
-#: g10/keygen.c:462
+#: g10/keygen.c:474
 msgid "Are you sure that you want this keysize? "
 msgstr "Sei sicuro di volere una chiave di queste dimensioni? "
 
-#: g10/keygen.c:463
+#: g10/keygen.c:475
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1176,21 +1193,21 @@ msgstr ""
 "Va bene, ma ricordati che anche le radiazioni emesse dal tuo monitor e dalla "
 "tua tastiera sono molto vulnerabili ad attacchi!\n"
 
-#: g10/keygen.c:471
+#: g10/keygen.c:483
 msgid "Do you really need such a large keysize? "
 msgstr "Ti serve davvero una chiave cos� lunga? "
 
-#: g10/keygen.c:477
+#: g10/keygen.c:489
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Le dimensioni della chiave richieste sono %u bit\n"
 
-#: g10/keygen.c:480 g10/keygen.c:484
+#: g10/keygen.c:492 g10/keygen.c:496
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrotondate a %u bit\n"
 
-#: g10/keygen.c:497
+#: g10/keygen.c:509
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1205,29 +1222,29 @@ msgstr ""
 "      <n>m = la chiave scadr� dopo n mesi\n"
 "      <n>y = la chiave scadr� dopo n anni\n"
 
-#: g10/keygen.c:512
+#: g10/keygen.c:524
 msgid "Key is valid for? (0) "
 msgstr "Chiave valida per? (0) "
 
-#: g10/keygen.c:523
+#: g10/keygen.c:535
 msgid "invalid value\n"
 msgstr "valore non valido\n"
 
-#: g10/keygen.c:528
+#: g10/keygen.c:540
 msgid "Key does not expire at all\n"
 msgstr "La chiave non scade\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:534
+#: g10/keygen.c:546
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "La chiave scadr� il %s\n"
 
-#: g10/keygen.c:540
+#: g10/keygen.c:552
 msgid "Is this correct (y/n)? "
 msgstr "� giusto (s/n)? "
 
-#: g10/keygen.c:583
+#: g10/keygen.c:595
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1243,44 +1260,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:594
+#: g10/keygen.c:606
 msgid "Real name: "
 msgstr "Nome e Cognome: "
 
-#: g10/keygen.c:598
+#: g10/keygen.c:610
 msgid "Invalid character in name\n"
 msgstr "Carattere non valido nel nome\n"
 
-#: g10/keygen.c:600
+#: g10/keygen.c:612
 msgid "Name may not start with a digit\n"
 msgstr "Il nome non pu� iniziare con una cifra\n"
 
-#: g10/keygen.c:602
+#: g10/keygen.c:614
 msgid "Name must be at least 5 characters long\n"
 msgstr "Il nome deve essere lungo almeno 5 caratteri\n"
 
-#: g10/keygen.c:610
+#: g10/keygen.c:622
 msgid "Email address: "
 msgstr "Indirizzo di Email: "
 
-#: g10/keygen.c:621
+#: g10/keygen.c:633
 msgid "Not a valid email address\n"
 msgstr "L'indirizzo di email non � valido\n"
 
-#: g10/keygen.c:629
+#: g10/keygen.c:641
 msgid "Comment: "
 msgstr "Commento: "
 
-#: g10/keygen.c:635
+#: g10/keygen.c:647
 msgid "Invalid character in comment\n"
 msgstr "Carattere non valido nel commento\n"
 
-#: g10/keygen.c:657
+#: g10/keygen.c:669
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr ""
 
-#: g10/keygen.c:663
+#: g10/keygen.c:675
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1291,15 +1308,15 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:666
+#: g10/keygen.c:678
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:676
+#: g10/keygen.c:688
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Modifica (N)ome, (C)ommento, (E)mail oppure (O)kay/(Q)uit? "
 
-#: g10/keygen.c:728
+#: g10/keygen.c:740
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1307,11 +1324,11 @@ msgstr ""
 "Ti serve una passphrase per proteggere la tua chiave segreta.\n"
 "\n"
 
-#: g10/keyedit.c:421 g10/keygen.c:736
+#: g10/keyedit.c:433 g10/keygen.c:748
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "passphrase non ripetuta correttamente; riprova.\n"
 
-#: g10/keygen.c:742
+#: g10/keygen.c:754
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1323,13 +1340,13 @@ msgstr ""
 "programma con l'opzione \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:763
+#: g10/keygen.c:775
 #, fuzzy
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
-"the disks) during the prime generation; this gives the random\n"
-"number generator a better chance to gain enough entropy.\n"
+"disks) during the prime generation; this gives the random number\n"
+"generator a better chance to gain enough entropy.\n"
 msgstr ""
 "Dobbiamo generare un mucchio di byte casuali. � una buona idea eseguire\n"
 "qualche altra azione (lavorare in un'altra finestra, muovere il mouse, "
@@ -1338,33 +1355,33 @@ msgstr ""
 "generatore di numeri casuali la possibilit� di raccogliere abbastanza\n"
 "entropia.\n"
 
-#: g10/keygen.c:833
+#: g10/keygen.c:845
 msgid "Key generation can only be used in interactive mode\n"
 msgstr "Una chiave pu� essere generata solo in modo interattivo\n"
 
-#: g10/keygen.c:841
+#: g10/keygen.c:853
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "La coppia DSA avr� 1024 bit.\n"
 
-#: g10/keygen.c:847
+#: g10/keygen.c:859
 msgid "Key generation cancelled.\n"
 msgstr "Generazione della chiave annullata.\n"
 
-#: g10/keygen.c:857
+#: g10/keygen.c:869
 #, c-format
 msgid "writing public certificate to `%s'\n"
 msgstr "scrittura del certificato pubblico in `%s'\n"
 
-#: g10/keygen.c:858
+#: g10/keygen.c:870
 #, c-format
 msgid "writing secret certificate to `%s'\n"
 msgstr "scrittura del certificato privato in `%s'\n"
 
-#: g10/keygen.c:935
+#: g10/keygen.c:947
 msgid "public and secret key created and signed.\n"
 msgstr "chiavi pubbliche e segrete create e firmate.\n"
 
-#: g10/keygen.c:937
+#: g10/keygen.c:949
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -1374,12 +1391,12 @@ msgstr ""
 "vorrai usare il comando \"--add-key\" per generare una chiave secondaria\n"
 "per questo scopo.\n"
 
-#: g10/keygen.c:951 g10/keygen.c:1050
+#: g10/keygen.c:963 g10/keygen.c:1062
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generazione della chiave fallita: %s\n"
 
-#: g10/keygen.c:995 g10/sig-check.c:212 g10/sign.c:52
+#: g10/keygen.c:1007 g10/sig-check.c:299 g10/sign.c:52
 #, fuzzy, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1387,7 +1404,7 @@ msgstr ""
 "chiave pubblica creata nel futuro (salto nel tempo o problema con\n"
 "l'orologio)\n"
 
-#: g10/keygen.c:997 g10/sig-check.c:214 g10/sign.c:54
+#: g10/keygen.c:1009 g10/sig-check.c:301 g10/sign.c:54
 #, fuzzy, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1395,32 +1412,37 @@ msgstr ""
 "chiave pubblica creata nel futuro (salto nel tempo o problema con\n"
 "l'orologio)\n"
 
-#: g10/keygen.c:1028
+#: g10/keygen.c:1040
 msgid "Really create? "
 msgstr "Crea davvero? "
 
-#: g10/encode.c:90 g10/openfile.c:86 g10/openfile.c:174 g10/tdbio.c:467
-#: g10/tdbio.c:527
+#: g10/encode.c:91 g10/openfile.c:86 g10/openfile.c:174 g10/tdbio.c:467
+#: g10/tdbio.c:528
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: impossibile aprire: %s\n"
 
-#: g10/encode.c:112
+#: g10/encode.c:113
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: g10/encode.c:166 g10/encode.c:285
+#: g10/encode.c:167 g10/encode.c:290
 #, fuzzy, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: attenzione: file vuoto\n"
 
-#: g10/encode.c:235
+#: g10/encode.c:240
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lettura da `%s'\n"
 
-#: g10/encode.c:413
+#: g10/encode.c:435 g10/sign.c:346
+#, fuzzy, c-format
+msgid "WARNING: `%s' is an empty file\n"
+msgstr "%s: attenzione: file vuoto\n"
+
+#: g10/encode.c:605
 #, fuzzy, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s crittografato per: %s\n"
@@ -1453,7 +1475,7 @@ msgstr ""
 msgid "too many entries in unk cache - disabled\n"
 msgstr ""
 
-#: g10/getkey.c:1531 g10/getkey.c:1587
+#: g10/getkey.c:1535 g10/getkey.c:1591
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "uso la chiave secondaria %08lX invece della chiave primaria %08lX\n"
@@ -1478,323 +1500,332 @@ msgstr "Per ora sono state esaminate %lu chiavi\n"
 msgid "read error: %s\n"
 msgstr "errore di lettura: %s\n"
 
-#: g10/import.c:174
+#: g10/import.c:175
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Numero totale esaminato: %lu\n"
 
-#: g10/import.c:176
+#: g10/import.c:177
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "senza user ID: %lu\n"
 
-#: g10/import.c:178
+#: g10/import.c:179
 #, c-format
 msgid "              imported: %lu"
 msgstr "importate: %lu"
 
-#: g10/import.c:184
+#: g10/import.c:185
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "non modificate: %lu\n"
 
-#: g10/import.c:186
+#: g10/import.c:187
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "nuovi user ID: %lu\n"
 
-#: g10/import.c:188
+#: g10/import.c:189
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "nuove subchiavi: %lu\n"
 
-#: g10/import.c:190
+#: g10/import.c:191
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "nuove firme: %lu\n"
 
-#: g10/import.c:192
+#: g10/import.c:193
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "nuove revoche di chiavi: %lu\n"
 
-#: g10/import.c:194
+#: g10/import.c:195
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "chiavi segrete lette: %lu\n"
 
-#: g10/import.c:196
+#: g10/import.c:197
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "chiavi segrete importate %lu\n"
 
-#: g10/import.c:198
+#: g10/import.c:199
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "chiavi segrete non cambiate %lu\n"
 
-#: g10/import.c:340 g10/import.c:532
+#: g10/import.c:342 g10/import.c:534
 #, c-format
 msgid "key %08lX: no user id\n"
 msgstr "chiave %08lX: nessun user id\n"
 
-#: g10/import.c:351
+#: g10/import.c:353
 #, c-format
 msgid "key %08lX: no valid user ids\n"
 msgstr "chiave %08lX: nessun user id valido\n"
 
-#: g10/import.c:353
+#: g10/import.c:355
 msgid "this may be caused by a missing self-signature\n"
 msgstr "questo pu� essere causato da una autofirma mancante\n"
 
-#: g10/import.c:364 g10/import.c:600
+#: g10/import.c:366 g10/import.c:604
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "chiave %08lX: chiave pubblica non trovata: %s\n"
 
-#: g10/import.c:370
+#: g10/import.c:372
 msgid "no default public keyring\n"
 msgstr "nessun portachiavi pubblico predefinito\n"
 
-#: g10/import.c:374 g10/openfile.c:115 g10/sign.c:215 g10/sign.c:498
+#: g10/import.c:376 g10/openfile.c:115 g10/sign.c:215 g10/sign.c:501
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "scrittura in `%s'\n"
 
-#: g10/import.c:378 g10/import.c:438 g10/import.c:654
+#: g10/import.c:380 g10/import.c:440 g10/import.c:658
 #, c-format
 msgid "can't lock public keyring: %s\n"
 msgstr "impossibile bloccare il portachiavi pubblico: %s\n"
 
-#: g10/import.c:381
+#: g10/import.c:383
 #, c-format
 msgid "can't write to keyring: %s\n"
 msgstr "impossibile scrivere sul portachiavi pubblico: %s\n"
 
-#: g10/import.c:385
+#: g10/import.c:387
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "chiave %08lX: chiave pubblica importata\n"
 
-#: g10/import.c:398
+#: g10/import.c:400
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "chiave %08lX: non corrisponde alla nostra copia\n"
 
-#: g10/import.c:411 g10/import.c:609
+#: g10/import.c:413 g10/import.c:613
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "chiave %08lX: impossibile individuare il keyblock originale: %s\n"
 
-#: g10/import.c:418 g10/import.c:616
+#: g10/import.c:420 g10/import.c:620
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "chiave %08lX: impossibile leggere il keyblock originale: %s\n"
 
-#: g10/import.c:435 g10/import.c:547 g10/import.c:651
+#: g10/import.c:437 g10/import.c:549 g10/import.c:655
 msgid "writing keyblock\n"
 msgstr "scrittura del keyblock\n"
 
-#: g10/import.c:441 g10/import.c:657
+#: g10/import.c:443 g10/import.c:661
 #, c-format
 msgid "can't write keyblock: %s\n"
 msgstr "impossibile aprire il keyblock: %s\n"
 
-#: g10/import.c:446
+#: g10/import.c:448
 #, c-format
 msgid "key %08lX: 1 new user-id\n"
 msgstr "chiave %08lX: un nuovo user id\n"
 
-#: g10/import.c:449
+#: g10/import.c:451
 #, c-format
 msgid "key %08lX: %d new user-ids\n"
 msgstr "chiave %08lX: %d nuovi user id\n"
 
-#: g10/import.c:452
+#: g10/import.c:454
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "chiave %08lX: una nuova firma\n"
 
-#: g10/import.c:455
+#: g10/import.c:457
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "chiave %08lX: %d nuove firme\n"
 
-#: g10/import.c:458
+#: g10/import.c:460
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "chiave %08lX: una nuova subchiave\n"
 
-#: g10/import.c:461
+#: g10/import.c:463
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "chiave %08lX: %d nuove subchiavi\n"
 
-#: g10/import.c:471
+#: g10/import.c:473
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "chiave %08lX: non cambiata\n"
 
-#: g10/import.c:550
+#: g10/import.c:552
 #, c-format
 msgid "can't lock secret keyring: %s\n"
 msgstr "impossibile bloccare il portachiavi segreto: %s\n"
 
-#: g10/import.c:553
+#: g10/import.c:555
 #, c-format
 msgid "can't write keyring: %s\n"
 msgstr "impossibile scrivere il portachiavi: %s\n"
 
-#. we are ready
-#: g10/import.c:556
+#: g10/import.c:559
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "chiave %08lX: chiave segreta importata\n"
 
 #. we can't merge secret keys
-#: g10/import.c:560
+#: g10/import.c:564
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "chiave %08lX: gi� nel portachiavi segreto\n"
 
-#: g10/import.c:565
+#: g10/import.c:569
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "chiave %08lX: chiave segreta non trovata: %s\n"
 
-#: g10/import.c:594
+#: g10/import.c:598
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "chiave %08lX: manca la chiave pubblica - impossibile applicare il\n"
 "certificato di revoca\n"
 
-#: g10/import.c:627
+#: g10/import.c:631
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "chiave %08lX: certificato di revoca non valido: %s - rifiutato\n"
 
-#: g10/import.c:661
+#: g10/import.c:665
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "chiave %08lX: certificato di revoca importato\n"
 
-#: g10/import.c:695
+#: g10/import.c:699
 #, c-format
 msgid "key %08lX: no user-id for signature\n"
 msgstr "chiave %08lX: nessun user id per la firma\n"
 
-#: g10/import.c:702 g10/import.c:727
+#: g10/import.c:706 g10/import.c:731
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "chiave %08lX: algoritmo a chiave pubblica non gestito\n"
 
-#: g10/import.c:703
+#: g10/import.c:707
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "chiave %08lX: autofirma non valida\n"
 
-#: g10/import.c:719
+#: g10/import.c:723
 #, fuzzy, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "chiave %08lX.%lu: Legame con la subchiave corretto\n"
 
-#: g10/import.c:728
+#: g10/import.c:732
 #, fuzzy, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "chiave %08lX.%lu: Legame con la subchiave non valido: %s\n"
 
-#: g10/import.c:760
+#: g10/import.c:764
 #, c-format
 msgid "key %08lX: skipped userid '"
 msgstr "chiave %08lX: saltato l'user id '"
 
-#: g10/import.c:780
+#: g10/import.c:787
 #, fuzzy, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "chiave %08lX: una nuova subchiave\n"
 
-#: g10/import.c:800
+#. here we violate the rfc a bit by still allowing
+#. * to import non-exportable signature when we have the
+#. * the secret key used to create this signature - it
+#. * seems that this makes sense
+#: g10/import.c:812
 #, fuzzy, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "chiave %08lX: certificato di revoca nel posto sbagliato - saltato\n"
 
-#: g10/import.c:809
+#: g10/import.c:821
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "chiave %08lX: certificato di revoca nel posto sbagliato - saltato\n"
 
-#: g10/import.c:817
+#: g10/import.c:829
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "chiave %08lX: certificato di revoca non valido: %s - saltato\n"
 
-#: g10/import.c:878
+#: g10/import.c:890
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "chiave %08lX: certificato di revoca aggiunto\n"
 
-#: g10/import.c:992 g10/import.c:1047
+#: g10/import.c:1008 g10/import.c:1063
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "chiave %08lX: la nostra copia non ha autofirma\n"
 
-#: g10/keyedit.c:88
+#: g10/keyedit.c:91
 #, c-format
 msgid "%s: user not found\n"
 msgstr "%s: utente non trovato\n"
 
-#: g10/keyedit.c:171
+#: g10/keyedit.c:177
+msgid "[revocation]"
+msgstr ""
+
+#: g10/keyedit.c:178
 msgid "[self-signature]"
 msgstr "[autofirma]"
 
-#: g10/keyedit.c:189
+#: g10/keyedit.c:196
 msgid "1 bad signature\n"
 msgstr "una firma non corretta\n"
 
-#: g10/keyedit.c:191
+#: g10/keyedit.c:198
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d firme non corrette\n"
 
-#: g10/keyedit.c:193
+#: g10/keyedit.c:200
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 firma non controllata per mancanza della chiave\n"
 
-#: g10/keyedit.c:195
+#: g10/keyedit.c:202
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d firme non controllate per mancanza delle chiavi\n"
 
-#: g10/keyedit.c:197
+#: g10/keyedit.c:204
 msgid "1 signature not checked due to an error\n"
 msgstr "1 firma non controllata a causa di un errore\n"
 
-#: g10/keyedit.c:199
+#: g10/keyedit.c:206
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d firme non controllate a causa di errori\n"
 
-#: g10/keyedit.c:201
+#: g10/keyedit.c:208
 msgid "1 user id without valid self-signature detected\n"
 msgstr "Trovato 1 user id senza autofirma valida\n"
 
-#: g10/keyedit.c:203
+#: g10/keyedit.c:210
 #, c-format
 msgid "%d user ids without valid self-signatures detected\n"
 msgstr "Trovati %d user id senza autofirme valide\n"
 
-#: g10/keyedit.c:281
+#. Fixme: see whether there is a revocation in which
+#. * case we should allow to sign it again.
+#: g10/keyedit.c:290
 #, c-format
 msgid "Already signed by key %08lX\n"
 msgstr "Gi� firmato dalla chiave %08lX\n"
 
-#: g10/keyedit.c:289
+#: g10/keyedit.c:298
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Niente da firmare con la chiave %08lX\n"
 
-#: g10/keyedit.c:298
+#: g10/keyedit.c:307
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -1802,35 +1833,35 @@ msgstr ""
 "Sei davvero sicuro di volere firmare questa chiave\n"
 "con la tua chiave: \""
 
-#: g10/keyedit.c:307
+#: g10/keyedit.c:316
 msgid ""
 "The signature will be marked as non-exportable.\n"
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:309
+#: g10/keyedit.c:321
 msgid "Really sign? "
 msgstr "Firmo davvero? "
 
-#: g10/keyedit.c:335 g10/sign.c:75
+#: g10/keyedit.c:347 g10/keyedit.c:1684 g10/keyedit.c:1733 g10/sign.c:75
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallita: %s\n"
 
-#: g10/keyedit.c:388
+#: g10/keyedit.c:400
 msgid "This key is not protected.\n"
 msgstr "Questa chiave non � protetta.\n"
 
-#: g10/keyedit.c:391
+#: g10/keyedit.c:403
 msgid "Key is protected.\n"
 msgstr "La chiave � protetta.\n"
 
-#: g10/keyedit.c:408
+#: g10/keyedit.c:420
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Impossibile modificare questa chiave: %s\n"
 
-#: g10/keyedit.c:413
+#: g10/keyedit.c:425
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -1838,7 +1869,7 @@ msgstr ""
 "Inserisci la nuova passphrase per questa chiave segreta.\n"
 "\n"
 
-#: g10/keyedit.c:425
+#: g10/keyedit.c:437
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -1846,383 +1877,454 @@ msgstr ""
 "Non vuoi una passphrase - questa � probabilmente una *cattiva* idea!\n"
 "\n"
 
-#: g10/keyedit.c:428
+#: g10/keyedit.c:440
 msgid "Do you really want to do this? "
 msgstr "Vuoi veramente farlo?"
 
-#: g10/keyedit.c:487
+#: g10/keyedit.c:499
 msgid "moving a key signature to the correct place\n"
 msgstr ""
 
-#: g10/keyedit.c:523
+#: g10/keyedit.c:535
 msgid "quit"
 msgstr "quit"
 
-#: g10/keyedit.c:523
+#: g10/keyedit.c:535
 msgid "quit this menu"
 msgstr "abbandona questo men�"
 
-#: g10/keyedit.c:524
+#: g10/keyedit.c:536
 msgid "q"
 msgstr "q"
 
-#: g10/keyedit.c:525
+#: g10/keyedit.c:537
 msgid "save"
 msgstr "save"
 
-#: g10/keyedit.c:525
+#: g10/keyedit.c:537
 msgid "save and quit"
 msgstr "salva ed esci"
 
-#: g10/keyedit.c:526
+#: g10/keyedit.c:538
 msgid "help"
 msgstr "help"
 
-#: g10/keyedit.c:526
+#: g10/keyedit.c:538
 msgid "show this help"
 msgstr "mostra questo aiuto"
 
-#: g10/keyedit.c:528
+#: g10/keyedit.c:540
 msgid "fpr"
 msgstr "fpr"
 
-#: g10/keyedit.c:528
+#: g10/keyedit.c:540
 msgid "show fingerprint"
 msgstr "mostra le impronte digitali"
 
-#: g10/keyedit.c:529
+#: g10/keyedit.c:541
 msgid "list"
 msgstr "list"
 
-#: g10/keyedit.c:529
+#: g10/keyedit.c:541
 msgid "list key and user ids"
 msgstr "elenca le chiavi e gli user id"
 
-#: g10/keyedit.c:530
+#: g10/keyedit.c:542
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:531
+#: g10/keyedit.c:543
 msgid "uid"
 msgstr "uid"
 
-#: g10/keyedit.c:531
+#: g10/keyedit.c:543
 msgid "select user id N"
 msgstr "scegli l'user id N"
 
-#: g10/keyedit.c:532
+#: g10/keyedit.c:544
 msgid "key"
 msgstr "key"
 
-#: g10/keyedit.c:532
+#: g10/keyedit.c:544
 msgid "select secondary key N"
 msgstr "scegli la chiave secondaria N"
 
-#: g10/keyedit.c:533
+#: g10/keyedit.c:545
 msgid "check"
 msgstr "check"
 
-#: g10/keyedit.c:533
+#: g10/keyedit.c:545
 msgid "list signatures"
 msgstr "elenca le firme"
 
-#: g10/keyedit.c:534
+#: g10/keyedit.c:546
 msgid "c"
 msgstr "c"
 
-#: g10/keyedit.c:535
+#: g10/keyedit.c:547
 msgid "sign"
 msgstr "sign"
 
-#: g10/keyedit.c:535
+#: g10/keyedit.c:547
 msgid "sign the key"
 msgstr "firma la chiave"
 
-#: g10/keyedit.c:536
+#: g10/keyedit.c:548
 msgid "s"
 msgstr "s"
 
-#: g10/keyedit.c:537
+#: g10/keyedit.c:549
 #, fuzzy
 msgid "lsign"
 msgstr "sign"
 
-#: g10/keyedit.c:537
+#: g10/keyedit.c:549
 #, fuzzy
 msgid "sign the key locally"
 msgstr "firma la chiave"
 
-#: g10/keyedit.c:538
+#: g10/keyedit.c:550
 msgid "debug"
 msgstr "debug"
 
-#: g10/keyedit.c:539
+#: g10/keyedit.c:551
 msgid "adduid"
 msgstr "adduid"
 
-#: g10/keyedit.c:539
+#: g10/keyedit.c:551
 msgid "add a user id"
 msgstr "aggiungi un user id"
 
-#: g10/keyedit.c:540
+#: g10/keyedit.c:552
 msgid "deluid"
 msgstr "deluid"
 
-#: g10/keyedit.c:540
+#: g10/keyedit.c:552
 msgid "delete user id"
 msgstr "cancella un user id"
 
-#: g10/keyedit.c:541
+#: g10/keyedit.c:553
 msgid "addkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:541
+#: g10/keyedit.c:553
 msgid "add a secondary key"
 msgstr "aggiungi una chiave secondaria"
 
-#: g10/keyedit.c:542
+#: g10/keyedit.c:554
 msgid "delkey"
 msgstr "delkey"
 
-#: g10/keyedit.c:542
+#: g10/keyedit.c:554
 msgid "delete a secondary key"
 msgstr "cancella una chiave secondaria"
 
-#: g10/keyedit.c:543
+#: g10/keyedit.c:555
 msgid "expire"
 msgstr "expire"
 
-#: g10/keyedit.c:543
+#: g10/keyedit.c:555
 msgid "change the expire date"
 msgstr "cambia la data di scadenza"
 
-#: g10/keyedit.c:544
+#: g10/keyedit.c:556
 msgid "toggle"
 msgstr "toggle"
 
-#: g10/keyedit.c:544
+#: g10/keyedit.c:556
 msgid "toggle between secret and public key listing"
 msgstr "cambia tra visualizzare la chiave segreta e la chiave pubblica"
 
-#: g10/keyedit.c:546
+#: g10/keyedit.c:558
 msgid "t"
 msgstr "t"
 
-#: g10/keyedit.c:547
+#: g10/keyedit.c:559
 msgid "pref"
 msgstr "pref"
 
-#: g10/keyedit.c:547
+#: g10/keyedit.c:559
 msgid "list preferences"
 msgstr "elenca le impostazioni"
 
-#: g10/keyedit.c:548
+#: g10/keyedit.c:560
 msgid "passwd"
 msgstr "passwd"
 
-#: g10/keyedit.c:548
+#: g10/keyedit.c:560
 msgid "change the passphrase"
 msgstr "cambia la passphrase"
 
-#: g10/keyedit.c:549
+#: g10/keyedit.c:561
 msgid "trust"
 msgstr "trust"
 
-#: g10/keyedit.c:549
+#: g10/keyedit.c:561
 msgid "change the ownertrust"
 msgstr "cambia il valore di fiducia"
 
-#: g10/keyedit.c:568
+#: g10/keyedit.c:562
+#, fuzzy
+msgid "revsig"
+msgstr "sign"
+
+#: g10/keyedit.c:562
+#, fuzzy
+msgid "revoke signatures"
+msgstr "forza l'uso di firme v3"
+
+#: g10/keyedit.c:563
+#, fuzzy
+msgid "revkey"
+msgstr "key"
+
+#: g10/keyedit.c:563
+#, fuzzy
+msgid "revoke a secondary key"
+msgstr "cancella una chiave secondaria"
+
+#: g10/keyedit.c:582
 msgid "can't do that in batchmode\n"
 msgstr "impossibile fare questo in batch mode\n"
 
 #. check that they match
 #. FIXME: check that they both match
-#: g10/keyedit.c:595
+#: g10/keyedit.c:609
 msgid "Secret key is available.\n"
 msgstr "� disponibile una chiave segreta.\n"
 
-#: g10/keyedit.c:624
+#: g10/keyedit.c:638
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/keyedit.c:651
+#: g10/keyedit.c:665
 msgid "Need the secret key to do this.\n"
 msgstr "Per fare questo serve la chiave segreta.\n"
 
-#: g10/keyedit.c:673
+#: g10/keyedit.c:687
 msgid "Save changes? "
 msgstr "Salvo i cambiamenti? "
 
-#: g10/keyedit.c:676
+#: g10/keyedit.c:690
 msgid "Quit without saving? "
 msgstr "Esco senza salvare? "
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:700
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aggiornamento fallito: %s\n"
 
-#: g10/keyedit.c:693
+#: g10/keyedit.c:707
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aggiornamento della chiave segreta fallito: %s\n"
 
-#: g10/keyedit.c:700
+#: g10/keyedit.c:714
 msgid "Key not changed so no update needed.\n"
 msgstr "La chiave non � cambiata quindi non sono necessari aggiornamenti.\n"
 
-#: g10/keyedit.c:703 g10/keyedit.c:762
+#: g10/keyedit.c:717 g10/keyedit.c:776
 #, fuzzy, c-format
 msgid "update of trustdb failed: %s\n"
 msgstr "aggiornamento del trustdb fallito: %s\n"
 
-#: g10/keyedit.c:736
+#: g10/keyedit.c:750
 msgid "Really sign all user ids? "
 msgstr "Firmo davvero tutti gli user id? "
 
-#: g10/keyedit.c:737
+#: g10/keyedit.c:751
 msgid "Hint: Select the user ids to sign\n"
 msgstr "Suggerimento: seleziona gli user id da firmare\n"
 
-#: g10/keyedit.c:773
+#: g10/keyedit.c:787
 msgid "You must select at least one user id.\n"
 msgstr "Devi selezionare almeno un user id.\n"
 
-#: g10/keyedit.c:775
+#: g10/keyedit.c:789
 msgid "You can't delete the last user id!\n"
 msgstr "Non puoi cancellare l'ultimo user id!\n"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:792
 msgid "Really remove all selected user ids? "
 msgstr "Tolgo davvero tutti gli user id selezionati? "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:793
 msgid "Really remove this user id? "
 msgstr "Tolgo davvero questo user id? "
 
-#: g10/keyedit.c:802
+#: g10/keyedit.c:816 g10/keyedit.c:838
 msgid "You must select at least one key.\n"
 msgstr "Devi selezionare almeno una chiave.\n"
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:820
 msgid "Do you really want to delete the selected keys? "
 msgstr "Vuoi davvero cancellare le chiavi selezionate? "
 
-#: g10/keyedit.c:807
+#: g10/keyedit.c:821
 msgid "Do you really want to delete this key? "
 msgstr "Vuoi davvero cancellare questa chiave? "
 
-#: g10/keyedit.c:854
+#: g10/keyedit.c:842
+#, fuzzy
+msgid "Do you really want to revoke the selected keys? "
+msgstr "Vuoi davvero cancellare le chiavi selezionate? "
+
+#: g10/keyedit.c:843
+#, fuzzy
+msgid "Do you really want to revoke this key? "
+msgstr "Vuoi davvero cancellare questa chiave? "
+
+#: g10/keyedit.c:897
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando non valido (prova \"help\")\n"
 
-#: g10/keyedit.c:1232
+#: g10/keyedit.c:1289
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Togli le selezioni dalle chiavi segrete.\n"
 
-#: g10/keyedit.c:1238
+#: g10/keyedit.c:1295
 msgid "Please select at most one secondary key.\n"
 msgstr "Seleziona al massimo una chiave secondaria.\n"
 
-#: g10/keyedit.c:1242
+#: g10/keyedit.c:1299
 msgid "Changing exiration time for a secondary key.\n"
 msgstr "Modifico il tempo di scadenza per una chiave secondaria.\n"
 
-#: g10/keyedit.c:1244
+#: g10/keyedit.c:1301
 msgid "Changing exiration time for the primary key.\n"
 msgstr "Modifico il tempo di scadenza per la chiave primaria.\n"
 
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1342
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr ""
 
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1358
 msgid "No corresponding signature in secret ring\n"
 msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1418
 #, c-format
 msgid "No user id with index %d\n"
 msgstr "Nessun user id con l'indice %d\n"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1464
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Nessuna chiave secondaria con l'indice %d\n"
 
-#: g10/mainproc.c:184
+#: g10/keyedit.c:1562
+#, fuzzy
+msgid "user ID: \""
+msgstr "Inserisci l'user ID: "
+
+#: g10/keyedit.c:1565
+#, fuzzy, c-format
+msgid ""
+"\"\n"
+"signed with your key %08lX at %s\n"
+msgstr "Niente da firmare con la chiave %08lX\n"
+
+#: g10/keyedit.c:1569
+#, fuzzy
+msgid "Create a revocation certificate for this signature? (y/N)"
+msgstr "genera un certificato di revoca"
+
+#: g10/keyedit.c:1649
+#, fuzzy
+msgid "Really create the revocation certificates? (y/N)"
+msgstr "genera un certificato di revoca"
+
+#: g10/keyedit.c:1672
+#, fuzzy
+msgid "no secret key\n"
+msgstr "Chiave segreta errata o danneggiata"
+
+#: g10/mainproc.c:185
 #, fuzzy, c-format
 msgid "public key is %08lX\n"
 msgstr "Chiave pubblica non trovata"
 
-#: g10/mainproc.c:212
+#: g10/mainproc.c:213
 #, fuzzy
 msgid "public key encrypted data: good DEK\n"
 msgstr "Decifratura della chiave pubblica fallita: %s\n"
 
 #. fixme: defer this message until we have parsed all packets of
 #. * this type - do this by building a list of keys with their stati
-#. * and store it with the conetxt.  do_proc_packets can then use
+#. * and store it with the context.  do_proc_packets can then use
 #. * this list to display some information
-#: g10/mainproc.c:219
+#: g10/mainproc.c:220
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "Decifratura della chiave pubblica fallita: %s\n"
 
-#: g10/mainproc.c:246
+#: g10/mainproc.c:249
 #, fuzzy
 msgid "decryption okay\n"
 msgstr "decifratura fallita: %s\n"
 
-#: g10/mainproc.c:249
+#: g10/mainproc.c:253
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decifratura fallita: %s\n"
 
-#: g10/mainproc.c:266
+#: g10/mainproc.c:270
 #, fuzzy
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "nota: il mittente ha richiesto \"solo-per-i-tuoi-occhi\"\n"
 
-#: g10/mainproc.c:268
+#: g10/mainproc.c:272
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr ""
 
-#: g10/mainproc.c:849
+#: g10/mainproc.c:876
 msgid "signature verification suppressed\n"
 msgstr ""
 
-#: g10/mainproc.c:855
+#: g10/mainproc.c:883
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Firma fatta %.*s usando %s key ID %08lX\n"
 
+#: g10/mainproc.c:895
+#, fuzzy
+msgid "encrypted message is valid\n"
+msgstr "l'algoritmo di digest selezionato non � valido\n"
+
+#: g10/mainproc.c:899
+msgid "WARNING: encrypted message has been manipulated!\n"
+msgstr ""
+
+#: g10/mainproc.c:904
+#, fuzzy, c-format
+msgid "Can't check MDC: %s\n"
+msgstr "Impossibile controllare la firma: %s\n"
+
 #. just in case that we have no userid
-#: g10/mainproc.c:881 g10/mainproc.c:892
+#: g10/mainproc.c:925 g10/mainproc.c:936
 msgid "BAD signature from \""
 msgstr "Firma NON corretta da \""
 
-#: g10/mainproc.c:882 g10/mainproc.c:893
+#: g10/mainproc.c:926 g10/mainproc.c:937
 msgid "Good signature from \""
 msgstr "Buona firma da \""
 
-#: g10/mainproc.c:884
+#: g10/mainproc.c:928
 #, fuzzy
 msgid "                aka \""
 msgstr "importate: %lu"
 
-#: g10/mainproc.c:930
+#: g10/mainproc.c:974
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossibile controllare la firma: %s\n"
 
-#: g10/mainproc.c:1003
+#: g10/mainproc.c:1047
 msgid "old style (PGP 2.x) signature\n"
 msgstr ""
 
-#: g10/mainproc.c:1008
+#: g10/mainproc.c:1052
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
@@ -2247,7 +2349,7 @@ msgstr ""
 "L'uso di chiavi RSA � deprecato; per favore in futuro considera di creare e\n"
 "usare una nuova chiave.\n"
 
-#: g10/misc.c:235
+#: g10/misc.c:236
 msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr ""
 
@@ -2261,7 +2363,7 @@ msgstr "impossibile bloccare il portachiavi pubblico: %s\n"
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
 
-#: g10/passphrase.c:151
+#: g10/passphrase.c:157
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2271,22 +2373,22 @@ msgstr ""
 "Ti serve una passphrase per sbloccare la chiave segreta\n"
 "dell'utente: \""
 
-#: g10/passphrase.c:160
+#: g10/passphrase.c:166
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "(chiave %2$s di %1$u-bit, ID %3$08lX, creata il %4$s)\n"
 
-#: g10/passphrase.c:165
+#: g10/passphrase.c:171
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr ""
 
-#: g10/passphrase.c:184
+#: g10/passphrase.c:190
 #, fuzzy
 msgid "Enter passphrase: "
 msgstr "Inserisci la passphrase: "
 
-#: g10/passphrase.c:188
+#: g10/passphrase.c:194
 #, fuzzy
 msgid "Repeat passphrase: "
 msgstr "Ripeti la passphrase: "
@@ -2329,44 +2431,48 @@ msgstr "l'algoritmo di protezione %d non � gestito\n"
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr "nota: algoritmo di cifratura %d non trovato nelle impostazioni\n"
 
-#: g10/seckey-cert.c:57
+#: g10/seckey-cert.c:55
 #, c-format
 msgid "protection algorithm %d is not supported\n"
 msgstr "l'algoritmo di protezione %d non � gestito\n"
 
-#: g10/seckey-cert.c:177
+#: g10/seckey-cert.c:171
 msgid "Invalid passphrase; please try again ...\n"
 msgstr "Passphrase non valida; riprova...\n"
 
-#: g10/seckey-cert.c:232
+#: g10/seckey-cert.c:227
 #, fuzzy
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "Attenzione: individuata una chiave debole - per favore cambia ancora la\n"
 "passphrase.\n"
 
-#: g10/sig-check.c:195
+#: g10/sig-check.c:186
+msgid "assuming bad MDC due to an unknown critical bit\n"
+msgstr ""
+
+#: g10/sig-check.c:282
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "questa � una chiave ElGamal generata da PGP che NON � sicura per le firme!\n"
 
-#: g10/sig-check.c:203
+#: g10/sig-check.c:290
 #, fuzzy, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "chiave %08lX: user id senza firma\n"
 
-#: g10/sig-check.c:204
+#: g10/sig-check.c:291
 #, fuzzy, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "chiave %08lX: user id senza firma\n"
 
-#: g10/sig-check.c:220
+#: g10/sig-check.c:307
 #, fuzzy, c-format
 msgid "NOTE: signature key expired %s\n"
 msgstr "attenzione: firma della chiave scaduta il %s\n"
 
-#: g10/sig-check.c:277
+#: g10/sig-check.c:364
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 
@@ -2375,7 +2481,7 @@ msgstr ""
 msgid "%s signature from: %s\n"
 msgstr "Firma NON corretta da \""
 
-#: g10/sign.c:210 g10/sign.c:493
+#: g10/sign.c:210 g10/sign.c:496
 #, fuzzy, c-format
 msgid "can't create %s: %s\n"
 msgstr "%s: impossibile creare: %s\n"
@@ -2385,11 +2491,6 @@ msgstr "%s: impossibile creare: %s\n"
 msgid "signing:"
 msgstr "sign"
 
-#: g10/sign.c:346
-#, fuzzy, c-format
-msgid "WARNING: `%s' is an empty file\n"
-msgstr "%s: attenzione: file vuoto\n"
-
 #: g10/textfilter.c:122
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
@@ -2400,12 +2501,12 @@ msgstr ""
 msgid "input line longer than %d characters\n"
 msgstr ""
 
-#: g10/tdbio.c:116 g10/tdbio.c:1504
+#: g10/tdbio.c:116 g10/tdbio.c:1505
 #, fuzzy, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "aggiornamento della chiave segreta fallito: %s\n"
 
-#: g10/tdbio.c:122 g10/tdbio.c:1511
+#: g10/tdbio.c:122 g10/tdbio.c:1512
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
@@ -2434,12 +2535,12 @@ msgstr "%s: impossibile creare: %s\n"
 msgid "%s: directory does not exist!\n"
 msgstr ""
 
-#: g10/openfile.c:111 g10/openfile.c:181 g10/ringedit.c:1325 g10/tdbio.c:457
+#: g10/openfile.c:111 g10/openfile.c:181 g10/ringedit.c:1344 g10/tdbio.c:457
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: impossibile creare: %s\n"
 
-#: g10/tdbio.c:472 g10/tdbio.c:520
+#: g10/tdbio.c:472 g10/tdbio.c:521
 #, fuzzy, c-format
 msgid "%s: can't create lock\n"
 msgstr "%s: impossibile creare: %s\n"
@@ -2454,83 +2555,83 @@ msgstr ""
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: impossibile creare: %s\n"
 
-#: g10/tdbio.c:492
+#: g10/tdbio.c:493
 #, fuzzy, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: impossibile creare: %s\n"
 
-#: g10/tdbio.c:529
+#: g10/tdbio.c:530
 #, fuzzy, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "aggiornamento del trustdb fallito: %s\n"
 
-#: g10/tdbio.c:562
+#: g10/tdbio.c:563
 #, fuzzy, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: impossibile creare: %s\n"
 
-#: g10/tdbio.c:570
+#: g10/tdbio.c:571
 #, fuzzy, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: errore nel controllare la chiave: %s\n"
 
-#: g10/tdbio.c:586 g10/tdbio.c:625 g10/tdbio.c:647 g10/tdbio.c:677
-#: g10/tdbio.c:702 g10/tdbio.c:1437 g10/tdbio.c:1464
+#: g10/tdbio.c:587 g10/tdbio.c:626 g10/tdbio.c:648 g10/tdbio.c:678
+#: g10/tdbio.c:703 g10/tdbio.c:1438 g10/tdbio.c:1465
 #, fuzzy, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: errore nel controllare la chiave: %s\n"
 
-#: g10/tdbio.c:599 g10/tdbio.c:658
+#: g10/tdbio.c:600 g10/tdbio.c:659
 #, fuzzy, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: errore nel controllare la chiave: %s\n"
 
-#: g10/tdbio.c:1131
+#: g10/tdbio.c:1132
 #, fuzzy, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "aggiornamento della chiave segreta fallito: %s\n"
 
-#: g10/tdbio.c:1139
+#: g10/tdbio.c:1140
 #, fuzzy, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "aggiornamento del trustdb fallito: %s\n"
 
-#: g10/tdbio.c:1160
+#: g10/tdbio.c:1161
 #, fuzzy, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "aggiornamento del trustdb fallito: %s\n"
 
-#: g10/tdbio.c:1176
+#: g10/tdbio.c:1177
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr ""
 
-#: g10/tdbio.c:1181
+#: g10/tdbio.c:1182
 #, fuzzy, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "header della firma in chiaro non valido\n"
 
-#: g10/tdbio.c:1470
+#: g10/tdbio.c:1471
 #, fuzzy, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: errore nel controllare la chiave: %s\n"
 
-#: g10/tdbio.c:1478
+#: g10/tdbio.c:1479
 #, fuzzy, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: errore nel controllare la chiave: %s\n"
 
-#: g10/tdbio.c:1488
+#: g10/tdbio.c:1489
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1518
+#: g10/tdbio.c:1519
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1629
+#: g10/tdbio.c:1630
 #, fuzzy
 msgid "The trustdb is corrupted; please run \"gpgm --fix-trustdb\".\n"
 msgstr "Il trustdb � rovinato; per favore esegui \"gpgm --fix-trust-db\".\n"
@@ -2743,7 +2844,7 @@ msgstr "Troppe preferenze"
 msgid "Too many preference items"
 msgstr "Troppi elementi di preferenza"
 
-#: g10/trustdb.c:1549 g10/trustdb.c:3045 g10/trustdb.c:3075
+#: g10/trustdb.c:1549 g10/trustdb.c:3075 g10/trustdb.c:3105
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr ""
 
@@ -2912,22 +3013,22 @@ msgstr "chiave %08lX.%lu: scaduta il %s\n"
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "chiave %08lX.%lu: controllo della fiducia fallito: %s\n"
 
-#: g10/trustdb.c:2851
+#: g10/trustdb.c:2881
 #, fuzzy, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "%s: utente non trovato\n"
 
-#: g10/trustdb.c:2853
+#: g10/trustdb.c:2883
 #, fuzzy, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: g10/trustdb.c:2856
+#: g10/trustdb.c:2886
 #, fuzzy, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr "aggiornamento del trustdb fallito: %s\n"
 
-#: g10/trustdb.c:2859
+#: g10/trustdb.c:2889
 #, fuzzy, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
@@ -2937,26 +3038,26 @@ msgstr "inizializzazione del trustdb fallita: %s\n"
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s: impossibile creare: %s\n"
 
-#: g10/ringedit.c:322 g10/ringedit.c:1330
+#: g10/ringedit.c:333 g10/ringedit.c:1349
 #, fuzzy, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: creato un nuovo file delle opzioni\n"
 
-#: g10/ringedit.c:1507
+#: g10/ringedit.c:1526
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr ""
 
-#: g10/ringedit.c:1508
+#: g10/ringedit.c:1527
 #, fuzzy, c-format
 msgid "%s is the unchanged one\n"
 msgstr "chiavi segrete non cambiate %lu\n"
 
-#: g10/ringedit.c:1509
+#: g10/ringedit.c:1528
 #, c-format
 msgid "%s is the new one\n"
 msgstr ""
 
-#: g10/ringedit.c:1510
+#: g10/ringedit.c:1529
 msgid "Please fix this possible security flaw\n"
 msgstr ""
 
@@ -3001,17 +3102,17 @@ msgstr "presumo che i dati firmati siano in `%s'\n"
 msgid "%s: new options file created\n"
 msgstr "%s: creato un nuovo file delle opzioni\n"
 
-#: g10/encr-data.c:59
+#: g10/encr-data.c:60
 #, fuzzy, c-format
 msgid "%s encrypted data\n"
 msgstr "cifra dati"
 
-#: g10/encr-data.c:61
+#: g10/encr-data.c:62
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr ""
 
-#: g10/encr-data.c:74
+#: g10/encr-data.c:77
 #, fuzzy
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -3153,6 +3254,19 @@ msgstr "Nessun aiuto disponibile"
 msgid "No help available for `%s'"
 msgstr "Nessun aiuto disponibile per `%s'"
 
+#~ msgid "Usage: gpgm [options] [files] (-h for help)"
+#~ msgstr "Uso: gpgm [opzioni] [file] (-h per l'aiuto)"
+
+#~ msgid ""
+#~ "Syntax: gpgm [options] [files]\n"
+#~ "GnuPG maintenance utility\n"
+#~ msgstr ""
+#~ "Sintassi: gpgm [opzioni] [file]\n"
+#~ "Utility di manutenzione di GnuPG\n"
+
+#~ msgid "usage: gpgm [options] "
+#~ msgstr "uso: gpgm [options] "
+
 #~ msgid "chained sigrec %lu has a wrong owner\n"
 #~ msgstr "la chained sigrec %lu ha il proprietario sbagliato\n"
 
@@ -3224,9 +3338,6 @@ msgstr "Nessun aiuto disponibile per `%s'"
 #~ msgid "Hmmm, public key lost?"
 #~ msgstr "chiave pubblica perduta"
 
-#~ msgid "use this user-id for encryption"
-#~ msgstr "usa questo user-id per cifrare"
-
 #~ msgid "invalid clear text header: "
 #~ msgstr "header del testo in chiaro non valido: "
 
diff --git a/po/pl.po b/po/pl.po
index 864de73b0..6449a8976 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-0.9.2\n"
-"POT-Creation-Date: 1999-03-20 13:40+0100\n"
+"POT-Creation-Date: 1999-05-06 13:37+0200\n"
 "PO-Revision-Date: 1999-01-26 01:30+01:00\n"
 "Last-Translator: Janusz A. Urbanowicz <[email protected]>\n"
 "Language-Team: Polish <[email protected]>\n"
@@ -34,11 +34,11 @@ msgstr ""
 msgid "(you may have used the wrong program for this task)\n"
 msgstr ""
 
-#: util/miscutil.c:143
+#: util/miscutil.c:156
 msgid "yes"
 msgstr "tak"
 
-#: util/miscutil.c:144
+#: util/miscutil.c:157
 msgid "yY"
 msgstr "tT"
 
@@ -230,6 +230,11 @@ msgstr "URI nie obs�ugiwanego typu"
 msgid "network error"
 msgstr "b��d sieci"
 
+#: util/errors.c:102
+#, fuzzy
+msgid "not encrypted"
+msgstr "%s zaszyfrowane dane\n"
+
 #: util/logger.c:178
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
@@ -240,13 +245,13 @@ msgstr "... to jest b��d w programie (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "znalaz�e�(a�) b��d w programie ... (%s:%d)\n"
 
-#: cipher/random.c:403
+#: cipher/random.c:408
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr ""
 "OSTRZE�ENIE: u�ywany generator liczb losowych\n"
 "nie jest kryptograficznie bezpieczny!!\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:409
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -272,7 +277,7 @@ msgstr ""
 "Prosz� kontynuowa� inne dzia�ania aby system m�g� zebra� odpowiedni�\n"
 "ilo�� entropii do ich wygenerowania (brakuje %d bajt�w).\n"
 
-#: g10/g10.c:166
+#: g10/g10.c:163
 msgid ""
 "@Commands:\n"
 " "
@@ -280,132 +285,132 @@ msgstr ""
 "@Polecenia:\n"
 " "
 
-#: g10/g10.c:169
+#: g10/g10.c:165
 msgid "|[file]|make a signature"
 msgstr "|[plik]|z�o�enie podpisu"
 
-#: g10/g10.c:170
+#: g10/g10.c:166
 msgid "|[file]|make a clear text signature"
 msgstr "|[plik]|z�o�enie podpisu na czytelnym dokumencie"
 
-#: g10/g10.c:171
+#: g10/g10.c:167
 msgid "make a detached signature"
 msgstr "sporz�dzenie podpisu oddzielonego od dokumentu"
 
-#: g10/g10.c:172
+#: g10/g10.c:168
 msgid "encrypt data"
 msgstr "szyfrowanie danych"
 
-#: g10/g10.c:173
+#: g10/g10.c:169
 msgid "encryption only with symmetric cipher"
 msgstr "szyfrowanie tylko szyfrem symetrycznym"
 
-#: g10/g10.c:174
+#: g10/g10.c:170
 msgid "store only"
 msgstr "tylko zapis"
 
-#: g10/g10.c:175
+#: g10/g10.c:171
 msgid "decrypt data (default)"
 msgstr "odszyfrowywanie danych (domy�lnie)"
 
-#: g10/g10.c:176
+#: g10/g10.c:172
 msgid "verify a signature"
 msgstr "sprawdzenie podpisu"
 
-#: g10/g10.c:178
+#: g10/g10.c:173
 msgid "list keys"
 msgstr "lista kluczy"
 
-#: g10/g10.c:179
+#: g10/g10.c:175
 msgid "list keys and signatures"
 msgstr "lista kluczy i podpis�w"
 
-#: g10/g10.c:180
+#: g10/g10.c:176
 msgid "check key signatures"
 msgstr "sprawdzenie podpis�w kluczy"
 
-#: g10/g10.c:181
+#: g10/g10.c:177
 msgid "list keys and fingerprints"
 msgstr "lista kluczy i ich odcisk�w"
 
-#: g10/g10.c:182
+#: g10/g10.c:178
 msgid "list secret keys"
 msgstr "lista kluczy tajnych"
 
-#: g10/g10.c:184
+#: g10/g10.c:179
 msgid "generate a new key pair"
 msgstr "generacja nowej pary klucza"
 
-#: g10/g10.c:186
+#: g10/g10.c:180
 msgid "remove key from the public keyring"
 msgstr "usuni�cie klucza ze zbioru kluczy publicznych"
 
-#: g10/g10.c:188
+#: g10/g10.c:181
 msgid "sign or edit a key"
 msgstr "podpisanie lub modyfikacja klucza"
 
-#: g10/g10.c:189
+#: g10/g10.c:182
 msgid "generate a revocation certificate"
 msgstr "generacja certyfikatu uniewa�nienia klucza"
 
-#: g10/g10.c:191
+#: g10/g10.c:183
 msgid "export keys"
 msgstr "eksport kluczy do pliku"
 
-#: g10/g10.c:192
+#: g10/g10.c:184
 msgid "export keys to a key server"
 msgstr "eksport kluczy do serwera kluczy"
 
-#: g10/g10.c:193
+#: g10/g10.c:185
 #, fuzzy
 msgid "import keys from a key server"
 msgstr "eksport kluczy do serwera kluczy"
 
-#: g10/g10.c:196
+#: g10/g10.c:188
 msgid "import/merge keys"
 msgstr "do��czanie klucza do zbioru"
 
-#: g10/g10.c:198
+#: g10/g10.c:190
 msgid "list only the sequence of packets"
 msgstr "wypisane sekwencji pakiet�w"
 
-#: g10/g10.c:201
+#: g10/g10.c:192
 msgid "export the ownertrust values"
 msgstr "eksport warto�ci zaufania"
 
-#: g10/g10.c:203
+#: g10/g10.c:194
 msgid "import ownertrust values"
 msgstr "wczytanie warto��i zaufania"
 
-#: g10/g10.c:205
+#: g10/g10.c:196
 msgid "|[NAMES]|update the trust database"
 msgstr "|[NAZWY]|naniesienie poprawek do bazy zaufania"
 
-#: g10/g10.c:207
+#: g10/g10.c:198
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NAZWY]|sprawdzenie bazy zaufania"
 
-#: g10/g10.c:208
+#: g10/g10.c:199
 msgid "fix a corrupted trust database"
 msgstr "naprawa uszkodzonej Bazy Zaufania"
 
-#: g10/g10.c:209
+#: g10/g10.c:200
 msgid "De-Armor a file or stdin"
 msgstr "Zdj�cie opakowania ASCII pliku lub potoku"
 
-#: g10/g10.c:210
+#: g10/g10.c:201
 msgid "En-Armor a file or stdin"
 msgstr "Opakowanie ASCII pliku lub potoku"
 
-#: g10/g10.c:211
+#: g10/g10.c:202
 msgid "|algo [files]|print message digests"
 msgstr "|algo [pliki]|skr�ty wiadomo�ci"
 
-#: g10/g10.c:212
+#: g10/g10.c:203
 msgid "print all message digests"
 msgstr "wszystkie skr�ty wiadomo�ci"
 
-#: g10/g10.c:219
+#: g10/g10.c:209
 msgid ""
 "@\n"
 "Options:\n"
@@ -415,144 +420,149 @@ msgstr ""
 "Opcje:\n"
 " "
 
-#: g10/g10.c:221
+#: g10/g10.c:211
 msgid "create ascii armored output"
 msgstr "plik wynikowy w opakowaniu ASCII"
 
-#: g10/g10.c:222
+#: g10/g10.c:212
 #, fuzzy
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAZWA|zestaw znak�w terminala NAZWA"
 
-#: g10/g10.c:227
+#: g10/g10.c:216
 msgid "use this user-id to sign or decrypt"
 msgstr "identyfikator do podpisania lub odszyfrowania"
 
-#: g10/g10.c:228
+#: g10/g10.c:217
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|poziom kompresji N (0 - brak)"
 
-#: g10/g10.c:230
+#: g10/g10.c:219
 msgid "use canonical text mode"
 msgstr "kanoniczny format tekstowy"
 
-#: g10/g10.c:232
+#: g10/g10.c:220
 msgid "use as output file"
 msgstr "plik wyj�ciowy"
 
-#: g10/g10.c:233
+#: g10/g10.c:221
 msgid "verbose"
 msgstr "z informacjami dodatkowymi"
 
-#: g10/g10.c:234
+#: g10/g10.c:222
 msgid "be somewhat more quiet"
 msgstr "mniej komunikat�ww"
 
-#: g10/g10.c:235
+#: g10/g10.c:223
 msgid "force v3 signatures"
 msgstr "wymuszenie trzeciej wersji formatu podpis�w"
 
-#: g10/g10.c:236
+#: g10/g10.c:224
+#, fuzzy
+msgid "always use a MDC for encryption"
+msgstr "u�y� tego identyfikatora do szyfrowania"
+
+#: g10/g10.c:225
 msgid "do not make any changes"
 msgstr ""
 
-#: g10/g10.c:237
+#: g10/g10.c:226
 msgid "batch mode: never ask"
 msgstr "tryb wsadowy: �adnych pyta�"
 
-#: g10/g10.c:238
+#: g10/g10.c:227
 msgid "assume yes on most questions"
 msgstr "automatyczna odpowied� tak na wi�kszo�� pyta�"
 
-#: g10/g10.c:239
+#: g10/g10.c:228
 msgid "assume no on most questions"
 msgstr "automatyczna odpowied� nie na wi�kszo�� pyta�"
 
-#: g10/g10.c:240
+#: g10/g10.c:229
 msgid "add this keyring to the list of keyrings"
 msgstr "doda� zbi�r kluczy do listy"
 
-#: g10/g10.c:241
+#: g10/g10.c:230
 msgid "add this secret keyring to the list"
 msgstr "doda� zbi�r kluczy tajnych do listy"
 
-#: g10/g10.c:242
+#: g10/g10.c:231
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAZWA|u�ycie NAZWA jako domy�lnego klucza tajnego"
 
-#: g10/g10.c:243
+#: g10/g10.c:232
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|serwer kluczy w kt�rym b�d� poszukiwane"
 
-#: g10/g10.c:244
+#: g10/g10.c:233
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAZWA|zestaw znak�w terminala NAZWA"
 
-#: g10/g10.c:245
+#: g10/g10.c:234
 msgid "read options from file"
 msgstr "wczytanie opcji z pliku"
 
-#: g10/g10.c:247
+#: g10/g10.c:236
 msgid "set debugging flags"
 msgstr "ustawienie opcji �ledzenia wykonania programu"
 
-#: g10/g10.c:248
+#: g10/g10.c:237
 msgid "enable full debugging"
 msgstr "umo�liwienie pe�nego �ledzenia programu"
 
-#: g10/g10.c:249
+#: g10/g10.c:238
 msgid "|FD|write status info to this FD"
 msgstr "|FD|zapisa� opis stanu do FD"
 
-#: g10/g10.c:250
+#: g10/g10.c:239
 msgid "do not write comment packets"
 msgstr "nie zapisywa� pakiet�w z komentarzem"
 
-#: g10/g10.c:251
+#: g10/g10.c:240
 msgid "(default is 1)"
 msgstr "(domy�lnie 1)"
 
-#: g10/g10.c:252
+#: g10/g10.c:241
 msgid "(default is 3)"
 msgstr "(domy�lnie 3)"
 
-#: g10/g10.c:254
+#: g10/g10.c:243
 msgid "|FILE|load extension module FILE"
 msgstr "|PLIK|�adowanie modu�u rozszerzenia z PLIK"
 
-#: g10/g10.c:255
+#: g10/g10.c:244
 msgid "emulate the mode described in RFC1991"
 msgstr "emulacja trybu opisanego w RFC1991"
 
-#: g10/g10.c:256
+#: g10/g10.c:245
 msgid "|N|use passphrase mode N"
 msgstr "|N|N-ty tryb wprowadzania wyra�enia przej�ciowego"
 
-#: g10/g10.c:258
+#: g10/g10.c:247
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|ALG|algorytm obliczania skr�t�w wiadomo�ci ALG"
 
-#: g10/g10.c:260
+#: g10/g10.c:249
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|ALG|algorytmu szyfruj�cy ALG dla has�a"
 
-#: g10/g10.c:262
+#: g10/g10.c:250
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAZWA|algorytm szyfruj�cy NAZWA"
 
-#: g10/g10.c:263
+#: g10/g10.c:251
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAZWA|algorytm obliczania skr�t�w wiadomo�ci NAZWA"
 
-#: g10/g10.c:264
+#: g10/g10.c:252
 msgid "|N|use compress algorithm N"
 msgstr "|N|algorytm kompresji N"
 
-#: g10/g10.c:265
+#: g10/g10.c:253
 msgid "throw keyid field of encrypted packets"
 msgstr "usuni�cie identyfikator�w kluczy pakiet�w"
 
-#: g10/g10.c:273
+#: g10/g10.c:255
 msgid ""
 "@\n"
 "Examples:\n"
@@ -573,27 +583,15 @@ msgstr ""
 " --list-keys [nazwy]        pokazuje klucze\n"
 " --fingerprint [nazwy]      pokazuje odciski kluczy\n"
 
-#: g10/g10.c:353
+#: g10/g10.c:323
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "B��dy prosimy zg�asza� na adres <[email protected]>.\n"
 
-#: g10/g10.c:358
-msgid "Usage: gpgm [options] [files] (-h for help)"
-msgstr "Spos�b u�ycia: gpgm [opcje] [pliki] (-h podaje pomoc)"
-
-#: g10/g10.c:360
+#: g10/g10.c:327
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Spos�b u�ycia: gpg [opcje] [pliki] (-h podaje pomoc)"
 
-#: g10/g10.c:365
-msgid ""
-"Syntax: gpgm [options] [files]\n"
-"GnuPG maintenance utility\n"
-msgstr ""
-"Sk�adnia: gpgm [opcje] [pliki]\n"
-"GnuPG program obs�uguj�cy\n"
-
-#: g10/g10.c:368
+#: g10/g10.c:330
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -603,7 +601,7 @@ msgstr ""
 "podpisywanie, sprawdzanie podpis�w, szyfrowanie, deszyfrowanie\n"
 "domy�lnie wykonywana operacja zale�y od danych wej�ciowych\n"
 
-#: g10/g10.c:374
+#: g10/g10.c:335
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -611,222 +609,218 @@ msgstr ""
 "\n"
 "Obs�ugiwane algorytmy:\n"
 
-#: g10/g10.c:449
-msgid "usage: gpgm [options] "
-msgstr "spos�b u�ycia: gpgm [opcje]"
-
-#: g10/g10.c:451
+#: g10/g10.c:409
 msgid "usage: gpg [options] "
 msgstr "spos�b u�ycia: gpg [opcje]"
 
-#: g10/g10.c:492
+#: g10/g10.c:449
 msgid "conflicting commands\n"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/g10.c:631
+#: g10/g10.c:576
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "UWAGA: brak domy�lnego pliku opcji '%s'\n"
 
-#: g10/g10.c:635
+#: g10/g10.c:580
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "plik opcji '%s': %s\n"
 
-#: g10/g10.c:642
+#: g10/g10.c:587
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "odczyt opcji z '%s'\n"
 
-#: g10/g10.c:797
+#: g10/g10.c:731
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
 
-#: g10/g10.c:838 g10/g10.c:850
+#: g10/g10.c:774 g10/g10.c:786
 msgid "selected cipher algorithm is invalid\n"
 msgstr "wybrany algorytm szyfruj�cy jest niepoprawny\n"
 
-#: g10/g10.c:844 g10/g10.c:856
+#: g10/g10.c:780 g10/g10.c:792
 msgid "selected digest algorithm is invalid\n"
 msgstr "wybrany algorytm geenracji skr�t�w wiadomo�ci jest niepoprawny\n"
 
-#: g10/g10.c:859
+#: g10/g10.c:795
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "ustawienie algortytmu kompresji musi pochodzi� z zakresu %d..%d\n"
 
-#: g10/g10.c:861
+#: g10/g10.c:797
 msgid "completes-needed must be greater than 0\n"
 msgstr "warto�� completes-needed musi by� wi�ksza od 0\n"
 
-#: g10/g10.c:863
+#: g10/g10.c:799
 msgid "marginals-needed must be greater than 1\n"
 msgstr "warto�� marginals-needed musi by� wi�ksza od 1\n"
 
-#: g10/g10.c:865
+#: g10/g10.c:801
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "warto�� max-cert-depth musi mie�ci� si� w zakresie od 1 do 255\n"
 
-#: g10/g10.c:868
+#: g10/g10.c:804
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "UWAGA: prosty tryb S2K (0) jest stanowczo odradzany\n"
 
-#: g10/g10.c:872
+#: g10/g10.c:808
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "Niepoprawny tryb S2K; musi mie� warto�� 0, 1 lub 3\n"
 
-#: g10/g10.c:949
+#: g10/g10.c:885
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
 
-#: g10/g10.c:955
+#: g10/g10.c:891
 msgid "--store [filename]"
 msgstr "--store [plik]"
 
-#: g10/g10.c:963
+#: g10/g10.c:898
 msgid "--symmetric [filename]"
 msgstr "--symmetric [plik]"
 
-#: g10/g10.c:971
+#: g10/g10.c:906
 msgid "--encrypt [filename]"
 msgstr "--encrypt [plik]"
 
-#: g10/g10.c:984
+#: g10/g10.c:919
 msgid "--sign [filename]"
 msgstr "--sign [plik]"
 
-#: g10/g10.c:997
+#: g10/g10.c:932
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/g10.c:1011
+#: g10/g10.c:946
 msgid "--clearsign [filename]"
 msgstr "--clearsign [plik]\""
 
-#: g10/g10.c:1023
+#: g10/g10.c:958
 msgid "--decrypt [filename]"
 msgstr "--decrypt [plik]"
 
-#: g10/g10.c:1032
+#: g10/g10.c:967
 msgid "--edit-key username [commands]"
 msgstr "--edit-key nazwa u�ytkownika [polecenia]"
 
-#: g10/g10.c:1048
+#: g10/g10.c:981
 msgid "--delete-secret-key username"
 msgstr "--delete-secret-key nazwa u�ytkownika"
 
-#: g10/g10.c:1051
+#: g10/g10.c:984
 msgid "--delete-key username"
 msgstr "--delete-key nazwa u�ytkownika"
 
-#: g10/encode.c:229 g10/g10.c:1074 g10/sign.c:311
+#: g10/encode.c:234 g10/g10.c:1007 g10/sign.c:311
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "nie mog� otworzy� %s: %s\n"
 
-#: g10/g10.c:1085
+#: g10/g10.c:1018
 msgid "-k[v][v][v][c] [userid] [keyring]"
 msgstr "-k[v][v][v][c] [identyfikator] [zbi�r kluczy]"
 
-#: g10/g10.c:1149
+#: g10/g10.c:1077
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "Usuni�cie opakowania ASCII nie powiod�o si�: %s\n"
 
-#: g10/g10.c:1157
+#: g10/g10.c:1085
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "Opakowywanie ASCII nie powiod�o si�: %s\n"
 
-#: g10/g10.c:1223
+#: g10/g10.c:1151
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "niew�a�ciwy algorytm skr�tu '%s'\n"
 
-#: g10/g10.c:1302
+#: g10/g10.c:1226
 msgid "[filename]"
 msgstr "[nazwa pliku]"
 
-#: g10/g10.c:1306
+#: g10/g10.c:1230
 msgid "Go ahead and type your message ...\n"
 msgstr "Wpisz tutaj swoj� wiadomo�� ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1309 g10/verify.c:66
+#: g10/decrypt.c:59 g10/g10.c:1233 g10/verify.c:66
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nie mog� otworzy� '%s'\n"
 
-#: g10/armor.c:297
+#: g10/armor.c:296
 #, c-format
 msgid "armor: %s\n"
 msgstr "opakowanie: %s\n"
 
-#: g10/armor.c:320
+#: g10/armor.c:319
 msgid "invalid armor header: "
 msgstr "Niepoprawny nag��wek opakowania: "
 
-#: g10/armor.c:327
+#: g10/armor.c:326
 msgid "armor header: "
 msgstr "nag��wek opakowania: "
 
-#: g10/armor.c:338
+#: g10/armor.c:337
 msgid "invalid clearsig header\n"
 msgstr "niew�a�ciwy nag��wek czytelnego podpisanego dokumentu\n"
 
-#: g10/armor.c:390
+#: g10/armor.c:389
 msgid "nested clear text signatures\n"
 msgstr "zagnie�d�one podpisy na czytelnym dokumencie\n"
 
-#: g10/armor.c:499
+#: g10/armor.c:498
 msgid "invalid dash escaped line: "
 msgstr "niepoprawne oznaczenie linii minusami:"
 
-#: g10/armor.c:511
+#: g10/armor.c:510
 msgid "unexpected armor:"
 msgstr "nieoczekiwane opakowanie:"
 
-#: g10/armor.c:628
+#: g10/armor.c:627
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "niew�a�ciwy znak formatu radix64 %02x zosta� pomini�ty\n"
 
-#: g10/armor.c:671
+#: g10/armor.c:670
 msgid "premature eof (no CRC)\n"
 msgstr "przewczesny koniec pliku (brak CRC)\n"
 
-#: g10/armor.c:705
+#: g10/armor.c:704
 msgid "premature eof (in CRC)\n"
 msgstr "przedwczesny koniec pliku (w CRC)\n"
 
-#: g10/armor.c:709
+#: g10/armor.c:708
 msgid "malformed CRC\n"
 msgstr "b��d formatu CRC\n"
 
-#: g10/armor.c:713
+#: g10/armor.c:712
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "B��d sumy CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:730
+#: g10/armor.c:729
 msgid "premature eof (in Trailer)\n"
 msgstr "przedwczesny koniec pliku (w linii ko�cz�cej)\n"
 
-#: g10/armor.c:734
+#: g10/armor.c:733
 msgid "error in trailer line\n"
 msgstr "b��d w linii ko�cz�cej\n"
 
-#: g10/armor.c:998
+#: g10/armor.c:997
 msgid "no valid OpenPGP data found.\n"
 msgstr "nie odnaleziono poprawnych danych w formacie OpenPGP.\n"
 
-#: g10/armor.c:1002
+#: g10/armor.c:1001
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "b��d opakowania: linia d�u�sza ni� %d znak�w\n"
 
-#: g10/armor.c:1006
+#: g10/armor.c:1005
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -925,26 +919,31 @@ msgstr ""
 msgid "key %08lX: key has been revoked!\n"
 msgstr "klucz %08lX: klucz zosta� uniewa�niony!\n"
 
-#: g10/pkclist.c:287 g10/pkclist.c:391
+#: g10/pkclist.c:287 g10/pkclist.c:297 g10/pkclist.c:403
 msgid "Use this key anyway? "
 msgstr "U�y� tego klucza pomimo to? "
 
-#: g10/pkclist.c:311
+#: g10/pkclist.c:291
+#, fuzzy, c-format
+msgid "key %08lX: subkey has been revoked!\n"
+msgstr "klucz %08lX: klucz zosta� uniewa�niony!\n"
+
+#: g10/pkclist.c:321
 #, c-format
 msgid "%08lX: key has expired\n"
 msgstr "%08lX: data wa�no�ci klucza up�yn�a\n"
 
-#: g10/pkclist.c:317
+#: g10/pkclist.c:327
 #, c-format
 msgid "%08lX: no info to calculate a trust probability\n"
 msgstr "%08lX: brak informacji aby obliczy� prawdopodobie�stwo zaufania\n"
 
-#: g10/pkclist.c:331
+#: g10/pkclist.c:341
 #, c-format
 msgid "%08lX: We do NOT trust this key\n"
 msgstr "%08lX: OSTRZE�ENIE: Nie ufamy temu kluczowi!\n"
 
-#: g10/pkclist.c:337
+#: g10/pkclist.c:347
 #, c-format
 msgid ""
 "%08lX: It is not sure that this key really belongs to the owner\n"
@@ -953,16 +952,16 @@ msgstr ""
 "%08lX: Nie ma pewno��i �e ten klucz faktycznie nale�y do odoby podaj�cej\n"
 "si� za jego w�a�ciciela, ale jest akceptowalny.\n"
 
-#: g10/pkclist.c:343
+#: g10/pkclist.c:353
 msgid "This key probably belongs to the owner\n"
 msgstr ""
 "Ten klucz prawdopodobnie nale�y do osoby podaj�cej si� za jego w�a�ciciela.\n"
 
-#: g10/pkclist.c:348
+#: g10/pkclist.c:358
 msgid "This key belongs to us\n"
 msgstr "Ten klucz nale�y do nas\n"
 
-#: g10/pkclist.c:386
+#: g10/pkclist.c:398
 msgid ""
 "It is NOT certain that the key belongs to its owner.\n"
 "If you *really* know what you are doing, you may answer\n"
@@ -973,58 +972,63 @@ msgstr ""
 "w�a�ciciela. Je�li nie masz co do tego �adnych w�tpliwo�ci i *naprawd�*\n"
 "wiesz co robisz mo�esz odpowiedzie� \"tak\" na nast�pne pytanie.\n"
 
-#: g10/pkclist.c:399
+#: g10/pkclist.c:411
 msgid "WARNING: Using untrusted key!\n"
 msgstr "OSTRZE�ENIE: u�ywany jest klucz nie obdarzony zaufaniem!\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:447
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "OSTRZE�ENIE: Ten klucz zosta� uniewa�niony przez w�a�ciciela!\n"
 
-#: g10/pkclist.c:436
+#: g10/pkclist.c:448
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "         To mo�e oznacza� �e podpis jest fa�szerstwem.\n"
 
-#: g10/pkclist.c:457
+#: g10/pkclist.c:452
+#, fuzzy
+msgid "WARNING: This subkey has been revoked by its owner!\n"
+msgstr "OSTRZE�ENIE: Ten klucz zosta� uniewa�niony przez w�a�ciciela!\n"
+
+#: g10/pkclist.c:473
 msgid "Note: This key has expired!\n"
 msgstr "Uwaga: Data wa�no�ci tego klucza up�yn�a!\n"
 
-#: g10/pkclist.c:464
+#: g10/pkclist.c:480
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "OSTRZE�ENIE: Ten klucz nie jest po�wiadczony zaufanym podpisem!\n"
 
-#: g10/pkclist.c:466
+#: g10/pkclist.c:482
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "          Nic nie wskazuje na to �e ten podpis z�o�y� w�a�ciciel klucza.\n"
 
-#: g10/pkclist.c:482
+#: g10/pkclist.c:498
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "OSTRZE�ENIE: Nie ufamy temu kluczowi!\n"
 
-#: g10/pkclist.c:483
+#: g10/pkclist.c:499
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Ten podpis prawdopodobnie jest FA�SZERSTWEM.\n"
 
-#: g10/pkclist.c:490
+#: g10/pkclist.c:506
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "OSTRZE�ENIE: Ten klucz nie jest po�wiadczony wystarczaj�co zaufanymi "
 "podpisami!\n"
 
-#: g10/pkclist.c:493
+#: g10/pkclist.c:509
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr ""
 "         Nie ma pewno�ci �e ten podpis zosta� z�o�nony przez w�a�ciciela.\n"
 
-#: g10/pkclist.c:546 g10/pkclist.c:559 g10/pkclist.c:622 g10/pkclist.c:650
+#: g10/pkclist.c:562 g10/pkclist.c:575 g10/pkclist.c:638 g10/pkclist.c:666
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: pomini�ty: %s\n"
 
-#: g10/pkclist.c:568
+#: g10/pkclist.c:584
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1032,20 +1036,20 @@ msgstr ""
 "Nie poda�e� identyfikatora u�ytkownika (user ID). \n"
 "Mo�na to zrobi� za pomoc� opcji \"-r\".\n"
 
-#: g10/pkclist.c:573
+#: g10/pkclist.c:589
 msgid "Enter the user ID: "
 msgstr "Wprowad� identyfikator u�ytkownika (user ID): "
 
-#: g10/pkclist.c:584
+#: g10/pkclist.c:600
 msgid "No such user ID.\n"
 msgstr "Brak takiego identyfikatora u�ytkownika.\n"
 
-#: g10/pkclist.c:630
+#: g10/pkclist.c:646
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: b��d podczas sprawdzania klucza: %s\n"
 
-#: g10/pkclist.c:656
+#: g10/pkclist.c:672
 msgid "no valid addressees\n"
 msgstr "brak poprawnych adres�w\n"
 
@@ -1124,7 +1128,20 @@ msgstr "Klucz dla DSA musi mie� d�ugo�� pomi�dzy 512 i 1024 bitow.\n"
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "D�ugo�� klucza zbyt ma�a; minimalna dopuszczona wynosi 768 bit�w.\n"
 
-#: g10/keygen.c:459
+#. It is ridiculous and an annoyance to use larger key sizes!
+#. * GnuPG can handle much larger sizes; but it takes an eternity
+#. * to create such a key (but less than the time the Sirius
+#. * Computer Corporation needs to process one of the usual
+#. * complaints) and {de,en}cryption although needs some time.
+#. * So, before you complain about this limitation, I suggest that
+#. * you start a discussion with Marvin about this theme and then
+#. * do whatever you want.
+#: g10/keygen.c:466
+#, fuzzy, c-format
+msgid "keysize too large; %d is largest value allowed.\n"
+msgstr "D�ugo�� klucza zbyt ma�a; minimalna dopuszczona wynosi 768 bit�w.\n"
+
+#: g10/keygen.c:471
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1132,11 +1149,11 @@ msgstr ""
 "Klucze d�u�sze ni� 2048 bit�w s� odradzane poniewa� obliczenia\n"
 "trwaj� wtedy BARDZO d�ugo!\n"
 
-#: g10/keygen.c:462
+#: g10/keygen.c:474
 msgid "Are you sure that you want this keysize? "
 msgstr "Na pewno wygenerowa� klucz takiej d�ugo�ci? "
 
-#: g10/keygen.c:463
+#: g10/keygen.c:475
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1144,21 +1161,21 @@ msgstr ""
 "Nale�y tak�e pami�ta� o tym, �e informacje mog� by� te� wykradzione z\n"
 "komputera przez pods�uch emisji elektromagnetycznej klawiatury i monitora!\n"
 
-#: g10/keygen.c:471
+#: g10/keygen.c:483
 msgid "Do you really need such a large keysize? "
 msgstr "Czy naprawd� potrzebujesz takiego d�ugiego klucza? "
 
-#: g10/keygen.c:477
+#: g10/keygen.c:489
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "��dana d�ugo�� klucza to %u bity.\n"
 
-#: g10/keygen.c:480 g10/keygen.c:484
+#: g10/keygen.c:492 g10/keygen.c:496
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "zaokr�glono do %u bit�w\n"
 
-#: g10/keygen.c:497
+#: g10/keygen.c:509
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1174,29 +1191,29 @@ msgstr ""
 "      <n>m = termin wa�no�ci klucza up�ywa za n miesi�cy\n"
 "      <n>y = termin wa�no�ci klucza up�ywa za n lat\n"
 
-#: g10/keygen.c:512
+#: g10/keygen.c:524
 msgid "Key is valid for? (0) "
 msgstr "Okres wa�no�ci klucza ? (0) "
 
-#: g10/keygen.c:523
+#: g10/keygen.c:535
 msgid "invalid value\n"
 msgstr "niepoprawna warto��\n"
 
-#: g10/keygen.c:528
+#: g10/keygen.c:540
 msgid "Key does not expire at all\n"
 msgstr "Klucz nie ma daty wa�no�ci (nie traci wa�no�ci z up�ywem czasu).\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:534
+#: g10/keygen.c:546
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Data wa�no�ci klucza: %s\n"
 
-#: g10/keygen.c:540
+#: g10/keygen.c:552
 msgid "Is this correct (y/n)? "
 msgstr "Dane poprawne (t/n)? "
 
-#: g10/keygen.c:583
+#: g10/keygen.c:595
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1212,44 +1229,44 @@ msgstr ""
 "    \"Tadeusz �ele�ski (Boy) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:594
+#: g10/keygen.c:606
 msgid "Real name: "
 msgstr "Imi� i nazwisko: "
 
-#: g10/keygen.c:598
+#: g10/keygen.c:610
 msgid "Invalid character in name\n"
 msgstr "Niew�a�ciwy znak w imieniu lub nazwisku\n"
 
-#: g10/keygen.c:600
+#: g10/keygen.c:612
 msgid "Name may not start with a digit\n"
 msgstr "Imi� lub nazwisko nie mo�e zaczyna� si� od cyfry\n"
 
-#: g10/keygen.c:602
+#: g10/keygen.c:614
 msgid "Name must be at least 5 characters long\n"
 msgstr "Imi� i nazwisko musz� mie� conajmniej 5 znak�w d�ugo�ci.\n"
 
-#: g10/keygen.c:610
+#: g10/keygen.c:622
 msgid "Email address: "
 msgstr "Adres poczty elektronicznej: "
 
-#: g10/keygen.c:621
+#: g10/keygen.c:633
 msgid "Not a valid email address\n"
 msgstr "To nie jest poprawny adres poczty elektronicznej\n"
 
-#: g10/keygen.c:629
+#: g10/keygen.c:641
 msgid "Comment: "
 msgstr "Komentarz: "
 
-#: g10/keygen.c:635
+#: g10/keygen.c:647
 msgid "Invalid character in comment\n"
 msgstr "Niew�a�ciwy znak w komentarzu\n"
 
-#: g10/keygen.c:657
+#: g10/keygen.c:669
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr ""
 
-#: g10/keygen.c:663
+#: g10/keygen.c:675
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1260,31 +1277,31 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:666
+#: g10/keygen.c:678
 msgid "NnCcEeOoQq"
 msgstr "IiKkEeDdWw"
 
-#: g10/keygen.c:676
+#: g10/keygen.c:688
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 "Zmieni� (I)mi�/nazwisko, (K)omentarz, adres (E)mail, \n"
 "przej�� (D)alej czy (W)yj�� z programu ? "
 
-#: g10/keygen.c:728
+#: g10/keygen.c:740
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
 msgstr ""
 "Musisz poda� wyra�enie przej�ciowe (has�o) aby ochroni� sw�j klucz tajny.\n"
 
-#: g10/keyedit.c:421 g10/keygen.c:736
+#: g10/keyedit.c:433 g10/keygen.c:748
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr ""
 "Powt�rzone wyra�enie przej�ciowe nie zgadza si� z podanym w pierwszej "
 "pr�bie;\n"
 "spr�buj jeszcze raz.\n"
 
-#: g10/keygen.c:742
+#: g10/keygen.c:754
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1296,13 +1313,13 @@ msgstr ""
 "i opcji \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:763
+#: g10/keygen.c:775
 #, fuzzy
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
-"the disks) during the prime generation; this gives the random\n"
-"number generator a better chance to gain enough entropy.\n"
+"disks) during the prime generation; this gives the random number\n"
+"generator a better chance to gain enough entropy.\n"
 msgstr ""
 "Program musi wygenerowa� du�o losowych bajt�w. Dobrze by by�o, zmusi� "
 "komputer\n"
@@ -1312,33 +1329,33 @@ msgstr ""
 "entropii\n"
 "do zasilenia generatora liczb losowych.\n"
 
-#: g10/keygen.c:833
+#: g10/keygen.c:845
 msgid "Key generation can only be used in interactive mode\n"
 msgstr "Generacj� klucza mo�na wykonywa� tylko w trybie interaktywnym\n"
 
-#: g10/keygen.c:841
+#: g10/keygen.c:853
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "Para kluczy dla DSA b�dzie mia�a 1024 bity d�ugo�ci.\n"
 
-#: g10/keygen.c:847
+#: g10/keygen.c:859
 msgid "Key generation cancelled.\n"
 msgstr "Procedura generacji klucza zosta�a anulowana.\n"
 
-#: g10/keygen.c:857
+#: g10/keygen.c:869
 #, c-format
 msgid "writing public certificate to `%s'\n"
 msgstr "zapisuj� certyfikat publiczny w '%s'\n"
 
-#: g10/keygen.c:858
+#: g10/keygen.c:870
 #, c-format
 msgid "writing secret certificate to `%s'\n"
 msgstr "zapisuj� certyfikat prywatny w '%s'\n"
 
-#: g10/keygen.c:935
+#: g10/keygen.c:947
 msgid "public and secret key created and signed.\n"
 msgstr "Prywatny i publiczny klucz zosta� stworzony i podpisany.\n"
 
-#: g10/keygen.c:937
+#: g10/keygen.c:949
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a secondary key for this purpose.\n"
@@ -1346,12 +1363,12 @@ msgstr ""
 "Ten klucz nie mo�e by� wykorzystany do szyfrowania. Komend� \"--edit-key\" \n"
 "mo�na doda� do niego podklucz u�ywany do szyfrowania.\n"
 
-#: g10/keygen.c:951 g10/keygen.c:1050
+#: g10/keygen.c:963 g10/keygen.c:1062
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generacja klucza nie powiod�a si�: %s\n"
 
-#: g10/keygen.c:995 g10/sig-check.c:212 g10/sign.c:52
+#: g10/keygen.c:1007 g10/sig-check.c:299 g10/sign.c:52
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1359,7 +1376,7 @@ msgstr ""
 "klucz zosta� stworzony %lu sekund� w przysz�o�ci (zaburzenia\n"
 "czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
 
-#: g10/keygen.c:997 g10/sig-check.c:214 g10/sign.c:54
+#: g10/keygen.c:1009 g10/sig-check.c:301 g10/sign.c:54
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1367,32 +1384,37 @@ msgstr ""
 "klucz zosta� stworzony %lu sekund w przysz�o�ci (zaburzenia\n"
 "czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
 
-#: g10/keygen.c:1028
+#: g10/keygen.c:1040
 msgid "Really create? "
 msgstr "Na pewno generowa�? "
 
-#: g10/encode.c:90 g10/openfile.c:86 g10/openfile.c:174 g10/tdbio.c:467
-#: g10/tdbio.c:527
+#: g10/encode.c:91 g10/openfile.c:86 g10/openfile.c:174 g10/tdbio.c:467
+#: g10/tdbio.c:528
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: nie mog� otworzy�: %s\n"
 
-#: g10/encode.c:112
+#: g10/encode.c:113
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "b��d podczs tworzenia wyra�enia przej�ciowego (has�a): %s\n"
 
-#: g10/encode.c:166 g10/encode.c:285
+#: g10/encode.c:167 g10/encode.c:290
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: OSTRZE�ENIE: plik jest pusty\n"
 
-#: g10/encode.c:235
+#: g10/encode.c:240
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "odczyt z '%s'\n"
 
-#: g10/encode.c:413
+#: g10/encode.c:435 g10/sign.c:346
+#, c-format
+msgid "WARNING: `%s' is an empty file\n"
+msgstr "OSTRZE�ENIE: plik '%s' jest pusty\n"
+
+#: g10/encode.c:605
 #, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s/%s zaszyfrowany dla: %s\n"
@@ -1424,7 +1446,7 @@ msgstr "zbyt wiele wpis�w w buforze kluczy publicznych - wy��czony\n"
 msgid "too many entries in unk cache - disabled\n"
 msgstr "zbyt wiele wpis�w w buforze nieznanych kluczy - wy��czony\n"
 
-#: g10/getkey.c:1531 g10/getkey.c:1587
+#: g10/getkey.c:1535 g10/getkey.c:1591
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "u�ywany jest podklucz %08lX zamiast klucza g��wnego %08lX\n"
@@ -1449,331 +1471,340 @@ msgstr "%lu kluczy przetworzonych do tej chwili\n"
 msgid "read error: %s\n"
 msgstr "b��d odczytu: %s\n"
 
-#: g10/import.c:174
+#: g10/import.c:175
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Og�em przetworzonych kluczy: %lu\n"
 
-#: g10/import.c:176
+#: g10/import.c:177
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          bez identyfikatora: %lu\n"
 
-#: g10/import.c:178
+#: g10/import.c:179
 #, c-format
 msgid "              imported: %lu"
 msgstr "         do��czono do zbioru: %lu"
 
-#: g10/import.c:184
+#: g10/import.c:185
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                   bez zmian: %lu\n"
 
-#: g10/import.c:186
+#: g10/import.c:187
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "      nowych identyfikator�w: %lu\n"
 
-#: g10/import.c:188
+#: g10/import.c:189
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "            nowych podkluczy: %lu\n"
 
-#: g10/import.c:190
+#: g10/import.c:191
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "             nowych podpis�w: %lu\n"
 
-#: g10/import.c:192
+#: g10/import.c:193
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   nowych uniewa�nie� kluczy: %lu\n"
 
-#: g10/import.c:194
+#: g10/import.c:195
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "   tajnych kluczy wczytanych: %lu\n"
 
-#: g10/import.c:196
+#: g10/import.c:197
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "     tajnych kluczy dodanych: %lu\n"
 
-#: g10/import.c:198
+#: g10/import.c:199
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "    tajnych kluczy bez zmian: %lu\n"
 
-#: g10/import.c:340 g10/import.c:532
+#: g10/import.c:342 g10/import.c:534
 #, c-format
 msgid "key %08lX: no user id\n"
 msgstr "klucz %08lX: brak identyfikatora u�ytkownika\n"
 
-#: g10/import.c:351
+#: g10/import.c:353
 #, c-format
 msgid "key %08lX: no valid user ids\n"
 msgstr "klucz %08lX: brak poprawnych identyfikator�w u�ytkownika\n"
 
-#: g10/import.c:353
+#: g10/import.c:355
 msgid "this may be caused by a missing self-signature\n"
 msgstr "to mo�e by� spowodowane brakiem podpisu w�a�ciciela klucza\n"
 
-#: g10/import.c:364 g10/import.c:600
+#: g10/import.c:366 g10/import.c:604
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "klucz %08lX: brak klucza publicznego: %s\n"
 
-#: g10/import.c:370
+#: g10/import.c:372
 msgid "no default public keyring\n"
 msgstr "brak domy�lnego zbioru kluczy publicznych\n"
 
-#: g10/import.c:374 g10/openfile.c:115 g10/sign.c:215 g10/sign.c:498
+#: g10/import.c:376 g10/openfile.c:115 g10/sign.c:215 g10/sign.c:501
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "zapis do '%s'\n"
 
-#: g10/import.c:378 g10/import.c:438 g10/import.c:654
+#: g10/import.c:380 g10/import.c:440 g10/import.c:658
 #, c-format
 msgid "can't lock public keyring: %s\n"
 msgstr "nie mog� zablokowa� zbioru kluczy publicznych: %s\n"
 
-#: g10/import.c:381
+#: g10/import.c:383
 #, c-format
 msgid "can't write to keyring: %s\n"
 msgstr "niemo�liwy jest zapis do zbioru kluczy: %s\n"
 
-#: g10/import.c:385
+#: g10/import.c:387
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "klucz %08lX: klucz publiczny wczytany do zbioru\n"
 
-#: g10/import.c:398
+#: g10/import.c:400
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "klucz %08lX: nie zgadza si� z lokalnie posiadan� kopi�\n"
 
-#: g10/import.c:411 g10/import.c:609
+#: g10/import.c:413 g10/import.c:613
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "klucz %08lX: brak oryginalnego bloku klucza; %s\n"
 
-#: g10/import.c:418 g10/import.c:616
+#: g10/import.c:420 g10/import.c:620
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "klucz %08lX: nie mo�na odczyta� oryginalnego bloku klucza; %s\n"
 
-#: g10/import.c:435 g10/import.c:547 g10/import.c:651
+#: g10/import.c:437 g10/import.c:549 g10/import.c:655
 msgid "writing keyblock\n"
 msgstr "zapisuj� blok klucza\n"
 
-#: g10/import.c:441 g10/import.c:657
+#: g10/import.c:443 g10/import.c:661
 #, c-format
 msgid "can't write keyblock: %s\n"
 msgstr "nie mog� zapisa� bloku klucza: %s\n"
 
-#: g10/import.c:446
+#: g10/import.c:448
 #, c-format
 msgid "key %08lX: 1 new user-id\n"
 msgstr "klucz %08lX: 1 nowy identyfikator u�ytkownika\n"
 
-#: g10/import.c:449
+#: g10/import.c:451
 #, c-format
 msgid "key %08lX: %d new user-ids\n"
 msgstr "klucz %08lX: %d nowych identyfikator�w u�ytkownika\n"
 
-#: g10/import.c:452
+#: g10/import.c:454
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "klucz %08lX: 1 nowy podpis\n"
 
-#: g10/import.c:455
+#: g10/import.c:457
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "klucz %08lX: %d nowych podpis�w\n"
 
-#: g10/import.c:458
+#: g10/import.c:460
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "klucz %08lX: 1 nowy podklucz\n"
 
-#: g10/import.c:461
+#: g10/import.c:463
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "klucz %08lX: %d nowych podkluczy\n"
 
-#: g10/import.c:471
+#: g10/import.c:473
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "klucz %08lX: bez zmian\n"
 
-#: g10/import.c:550
+#: g10/import.c:552
 #, c-format
 msgid "can't lock secret keyring: %s\n"
 msgstr "nie mog� zablokowa� zbioru kluczy tajnych: %s\n"
 
-#: g10/import.c:553
+#: g10/import.c:555
 #, c-format
 msgid "can't write keyring: %s\n"
 msgstr "niemo�liwy jest zapis zbioru kluczy: %s\n"
 
-#. we are ready
-#: g10/import.c:556
+#: g10/import.c:559
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "Klucz %08lX: klucz tajny wczytany do zbioru\n"
 
 #. we can't merge secret keys
-#: g10/import.c:560
+#: g10/import.c:564
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "Klucz %08lX: ten klucz ju� znajduje si� w zbiorze\n"
 
-#: g10/import.c:565
+#: g10/import.c:569
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "klucz %08lX: brak klucza tajnego: %s\n"
 
-#: g10/import.c:594
+#: g10/import.c:598
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "klucz %08lX: brak klucza publicznego - wczytany certyfikat \n"
 "uniwa�nienia nie mo�e by� zastosowany\n"
 
-#: g10/import.c:627
+#: g10/import.c:631
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr ""
 "klucz %08lX: niepoprawny certyfikat uniewa�nienia:\n"
 "%s - odrzucony\n"
 
-#: g10/import.c:661
+#: g10/import.c:665
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "klucz %08lX: wczytany certyfikat uniewa�nienia\n"
 
-#: g10/import.c:695
+#: g10/import.c:699
 #, c-format
 msgid "key %08lX: no user-id for signature\n"
 msgstr "klucz %08lX: brak identyfikatora u�ytkownika do podpisu\n"
 
-#: g10/import.c:702 g10/import.c:727
+#: g10/import.c:706 g10/import.c:731
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr ""
 "klucz %08lX: nie obs�ugiwany algorytm szyfrowania z kluczem publicznym\n"
 
-#: g10/import.c:703
+#: g10/import.c:707
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "klucz %08lX: niepoprawny podpis w�a�ciciela klucza\n"
 
-#: g10/import.c:719
+#: g10/import.c:723
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "klucz %08lX: brak podklucza do dowi�zania\n"
 
-#: g10/import.c:728
+#: g10/import.c:732
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "klucz %08lX: niepoprawne dowi�zanie podklucza\n"
 
-#: g10/import.c:760
+#: g10/import.c:764
 #, c-format
 msgid "key %08lX: skipped userid '"
 msgstr "klucz %08lX: zosta� pomini�ty identyfikator u�ytkownika '"
 
-#: g10/import.c:780
+#: g10/import.c:787
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "klucz %08lX: podklucz pomini�ty\n"
 
-#: g10/import.c:800
+#. here we violate the rfc a bit by still allowing
+#. * to import non-exportable signature when we have the
+#. * the secret key used to create this signature - it
+#. * seems that this makes sense
+#: g10/import.c:812
 #, fuzzy, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr ""
 "klucz %08lX: certyfikat uniewa�nienia umieszczony w niew�a�ciwym \n"
 "miejscu - zosta� pomini�ty\n"
 
-#: g10/import.c:809
+#: g10/import.c:821
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "klucz %08lX: certyfikat uniewa�nienia umieszczony w niew�a�ciwym \n"
 "miejscu - zosta� pomini�ty\n"
 
-#: g10/import.c:817
+#: g10/import.c:829
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "klucz %08lX: niepoprawny certyfikat uniewa�nienia: %s - pomini�ty\n"
 
-#: g10/import.c:878
+#: g10/import.c:890
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "klucz %08lX: dodany certyfikat uniewa�nienia\n"
 
-#: g10/import.c:992 g10/import.c:1047
+#: g10/import.c:1008 g10/import.c:1063
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "klucz %08lX: dost�pna kopia nie jest podpisana ni� sam�\n"
 
-#: g10/keyedit.c:88
+#: g10/keyedit.c:91
 #, c-format
 msgid "%s: user not found\n"
 msgstr "%s: nie znaleziono u�ytkownika\n"
 
-#: g10/keyedit.c:171
+#: g10/keyedit.c:177
+msgid "[revocation]"
+msgstr ""
+
+#: g10/keyedit.c:178
 msgid "[self-signature]"
 msgstr "[podpis klucza nim samym]"
 
-#: g10/keyedit.c:189
+#: g10/keyedit.c:196
 msgid "1 bad signature\n"
 msgstr "1 niepoprawny podpis\n"
 
-#: g10/keyedit.c:191
+#: g10/keyedit.c:198
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d niepoprawnych podpis�w\n"
 
-#: g10/keyedit.c:193
+#: g10/keyedit.c:200
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 podpis nie zosta� sprawdzony z powodu braku klucza\n"
 
-#: g10/keyedit.c:195
+#: g10/keyedit.c:202
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d podpis�w nie zosta�o sprawdzonych z powodu braku kluczy\n"
 
-#: g10/keyedit.c:197
+#: g10/keyedit.c:204
 msgid "1 signature not checked due to an error\n"
 msgstr "1 podpis nie zosta� sprawdzony z powodu b��du\n"
 
-#: g10/keyedit.c:199
+#: g10/keyedit.c:206
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d podpis�w nie sprawdzonych z powodu b��d�w\n"
 
-#: g10/keyedit.c:201
+#: g10/keyedit.c:208
 msgid "1 user id without valid self-signature detected\n"
 msgstr "wykryto 1 identyfikator u�ytkownika bez podpisu w�a�ciciela klucza\n"
 
-#: g10/keyedit.c:203
+#: g10/keyedit.c:210
 #, c-format
 msgid "%d user ids without valid self-signatures detected\n"
 msgstr ""
 "wykryto %d identyfikator�w u�ytkownika bez podpis�w w�a�ciciela klucza\n"
 
-#: g10/keyedit.c:281
+#. Fixme: see whether there is a revocation in which
+#. * case we should allow to sign it again.
+#: g10/keyedit.c:290
 #, c-format
 msgid "Already signed by key %08lX\n"
 msgstr "Ju� podpisano kluczem %08lX.\n"
 
-#: g10/keyedit.c:289
+#: g10/keyedit.c:298
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Nie ma nic do podpisania kluczem %08lX.\n"
 
-#: g10/keyedit.c:298
+#: g10/keyedit.c:307
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -1781,35 +1812,35 @@ msgstr ""
 "Czy jeste� naprawd� pewien �e chcesz podpisa� ten klucz \n"
 "swoim kluczem: \""
 
-#: g10/keyedit.c:307
+#: g10/keyedit.c:316
 msgid ""
 "The signature will be marked as non-exportable.\n"
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:309
+#: g10/keyedit.c:321
 msgid "Really sign? "
 msgstr "Na pewno podpisa�? "
 
-#: g10/keyedit.c:335 g10/sign.c:75
+#: g10/keyedit.c:347 g10/keyedit.c:1684 g10/keyedit.c:1733 g10/sign.c:75
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "podpisywanie nie powiod�o si�: %s\n"
 
-#: g10/keyedit.c:388
+#: g10/keyedit.c:400
 msgid "This key is not protected.\n"
 msgstr "Ten klucz nie jest chroniony.\n"
 
-#: g10/keyedit.c:391
+#: g10/keyedit.c:403
 msgid "Key is protected.\n"
 msgstr "Klucz jest chroniony.\n"
 
-#: g10/keyedit.c:408
+#: g10/keyedit.c:420
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Tego klucza nie mo�na edytowa�: %s.\n"
 
-#: g10/keyedit.c:413
+#: g10/keyedit.c:425
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -1817,7 +1848,7 @@ msgstr ""
 "Wprowad� nowe wyra�enie przej�ciowe (has�o) dla tego klucza tajnego.\n"
 "\n"
 
-#: g10/keyedit.c:425
+#: g10/keyedit.c:437
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -1825,383 +1856,454 @@ msgstr ""
 "Nie chcesz poda� wyra�enia przej�ciowego (has�a) - to z�y pomys�!\n"
 "\n"
 
-#: g10/keyedit.c:428
+#: g10/keyedit.c:440
 msgid "Do you really want to do this? "
 msgstr "Czy na pewno chcesz to zrobi�? "
 
-#: g10/keyedit.c:487
+#: g10/keyedit.c:499
 msgid "moving a key signature to the correct place\n"
 msgstr "przenosz� podpis klucza na w�a�ciwe miejsce\n"
 
-#: g10/keyedit.c:523
+#: g10/keyedit.c:535
 msgid "quit"
 msgstr "wyj�cie"
 
-#: g10/keyedit.c:523
+#: g10/keyedit.c:535
 msgid "quit this menu"
 msgstr "wyj�cie z tego menu"
 
-#: g10/keyedit.c:524
+#: g10/keyedit.c:536
 msgid "q"
 msgstr "w"
 
-#: g10/keyedit.c:525
+#: g10/keyedit.c:537
 msgid "save"
 msgstr "zapis"
 
-#: g10/keyedit.c:525
+#: g10/keyedit.c:537
 msgid "save and quit"
 msgstr "zapis zmian i wyj�cie"
 
-#: g10/keyedit.c:526
+#: g10/keyedit.c:538
 msgid "help"
 msgstr "pomoc"
 
-#: g10/keyedit.c:526
+#: g10/keyedit.c:538
 msgid "show this help"
 msgstr "ten tekst pomocy"
 
-#: g10/keyedit.c:528
+#: g10/keyedit.c:540
 msgid "fpr"
 msgstr "odc"
 
-#: g10/keyedit.c:528
+#: g10/keyedit.c:540
 msgid "show fingerprint"
 msgstr "okazanie odcisku klucza"
 
-#: g10/keyedit.c:529
+#: g10/keyedit.c:541
 msgid "list"
 msgstr "lista"
 
-#: g10/keyedit.c:529
+#: g10/keyedit.c:541
 msgid "list key and user ids"
 msgstr "lista kluczy i identyfikator�w u�ytkownik�w"
 
-#: g10/keyedit.c:530
+#: g10/keyedit.c:542
 msgid "l"
 msgstr "l"
 
-#: g10/keyedit.c:531
+#: g10/keyedit.c:543
 msgid "uid"
 msgstr "id"
 
-#: g10/keyedit.c:531
+#: g10/keyedit.c:543
 msgid "select user id N"
 msgstr "wyb�r identyfikatora u�ytkownika N"
 
-#: g10/keyedit.c:532
+#: g10/keyedit.c:544
 msgid "key"
 msgstr "klucz"
 
-#: g10/keyedit.c:532
+#: g10/keyedit.c:544
 msgid "select secondary key N"
 msgstr "wyb�r podklucza N"
 
-#: g10/keyedit.c:533
+#: g10/keyedit.c:545
 msgid "check"
 msgstr "lista"
 
-#: g10/keyedit.c:533
+#: g10/keyedit.c:545
 msgid "list signatures"
 msgstr "lista podpis�w"
 
-#: g10/keyedit.c:534
+#: g10/keyedit.c:546
 msgid "c"
 msgstr "l"
 
-#: g10/keyedit.c:535
+#: g10/keyedit.c:547
 msgid "sign"
 msgstr "podpis"
 
-#: g10/keyedit.c:535
+#: g10/keyedit.c:547
 msgid "sign the key"
 msgstr "z�o�enie podpisu na kluczu"
 
-#: g10/keyedit.c:536
+#: g10/keyedit.c:548
 msgid "s"
 msgstr "p"
 
-#: g10/keyedit.c:537
+#: g10/keyedit.c:549
 #, fuzzy
 msgid "lsign"
 msgstr "podpis"
 
-#: g10/keyedit.c:537
+#: g10/keyedit.c:549
 #, fuzzy
 msgid "sign the key locally"
 msgstr "z�o�enie podpisu na kluczu"
 
-#: g10/keyedit.c:538
+#: g10/keyedit.c:550
 msgid "debug"
 msgstr "�ledzenia"
 
-#: g10/keyedit.c:539
+#: g10/keyedit.c:551
 msgid "adduid"
 msgstr "dodid"
 
-#: g10/keyedit.c:539
+#: g10/keyedit.c:551
 msgid "add a user id"
 msgstr "dodanie nowego identyfikatora u�ytkownika do klucza"
 
-#: g10/keyedit.c:540
+#: g10/keyedit.c:552
 msgid "deluid"
 msgstr "usid"
 
-#: g10/keyedit.c:540
+#: g10/keyedit.c:552
 msgid "delete user id"
 msgstr "usuni�cie identyfikatora u�ytkownika z klucza"
 
-#: g10/keyedit.c:541
+#: g10/keyedit.c:553
 msgid "addkey"
 msgstr "dodkl"
 
-#: g10/keyedit.c:541
+#: g10/keyedit.c:553
 msgid "add a secondary key"
 msgstr "dodanie podklucza"
 
-#: g10/keyedit.c:542
+#: g10/keyedit.c:554
 msgid "delkey"
 msgstr "uskl"
 
-#: g10/keyedit.c:542
+#: g10/keyedit.c:554
 msgid "delete a secondary key"
 msgstr "usuni�cie podklucza"
 
-#: g10/keyedit.c:543
+#: g10/keyedit.c:555
 msgid "expire"
 msgstr "data"
 
-#: g10/keyedit.c:543
+#: g10/keyedit.c:555
 msgid "change the expire date"
 msgstr "zmiana daty wa�no�ci klucza"
 
-#: g10/keyedit.c:544
+#: g10/keyedit.c:556
 msgid "toggle"
 msgstr "prze�"
 
-#: g10/keyedit.c:544
+#: g10/keyedit.c:556
 msgid "toggle between secret and public key listing"
 msgstr "prze��czenie pomi�dzy list� kluczy publicznych i tajnych"
 
-#: g10/keyedit.c:546
+#: g10/keyedit.c:558
 msgid "t"
 msgstr "p"
 
-#: g10/keyedit.c:547
+#: g10/keyedit.c:559
 msgid "pref"
 msgstr "opcje"
 
-#: g10/keyedit.c:547
+#: g10/keyedit.c:559
 msgid "list preferences"
 msgstr "lista opcji"
 
-#: g10/keyedit.c:548
+#: g10/keyedit.c:560
 msgid "passwd"
 msgstr "has�o"
 
-#: g10/keyedit.c:548
+#: g10/keyedit.c:560
 msgid "change the passphrase"
 msgstr "zmiana wyra�enia przej�ciowego (has�a)"
 
-#: g10/keyedit.c:549
+#: g10/keyedit.c:561
 msgid "trust"
 msgstr "zaufanie"
 
-#: g10/keyedit.c:549
+#: g10/keyedit.c:561
 msgid "change the ownertrust"
 msgstr "zmiana zaufania w�a�ciciela"
 
-#: g10/keyedit.c:568
+#: g10/keyedit.c:562
+#, fuzzy
+msgid "revsig"
+msgstr "podpis"
+
+#: g10/keyedit.c:562
+#, fuzzy
+msgid "revoke signatures"
+msgstr "wymuszenie trzeciej wersji formatu podpis�w"
+
+#: g10/keyedit.c:563
+#, fuzzy
+msgid "revkey"
+msgstr "klucz"
+
+#: g10/keyedit.c:563
+#, fuzzy
+msgid "revoke a secondary key"
+msgstr "usuni�cie podklucza"
+
+#: g10/keyedit.c:582
 msgid "can't do that in batchmode\n"
 msgstr "operacja niemo�liwa do wykonania w trybie wsadowym\n"
 
 #. check that they match
 #. FIXME: check that they both match
-#: g10/keyedit.c:595
+#: g10/keyedit.c:609
 msgid "Secret key is available.\n"
 msgstr "Dost�pny jest klucz tajny.\n"
 
-#: g10/keyedit.c:624
+#: g10/keyedit.c:638
 msgid "Command> "
 msgstr "Polecenie> "
 
-#: g10/keyedit.c:651
+#: g10/keyedit.c:665
 msgid "Need the secret key to do this.\n"
 msgstr "Do wykonania tej operacji potrzebny jest klucz tajny.\n"
 
-#: g10/keyedit.c:673
+#: g10/keyedit.c:687
 msgid "Save changes? "
 msgstr "Zapisa� zmiany? "
 
-#: g10/keyedit.c:676
+#: g10/keyedit.c:690
 msgid "Quit without saving? "
 msgstr "Wyj�� bez zapisania zmian? "
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:700
 #, c-format
 msgid "update failed: %s\n"
 msgstr "naniesienie poprawek nie powiod�o si�: %s\n"
 
-#: g10/keyedit.c:693
+#: g10/keyedit.c:707
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "naniesienie poprawek na kluczu tajnym nie powiod�o si�: %s\n"
 
-#: g10/keyedit.c:700
+#: g10/keyedit.c:714
 msgid "Key not changed so no update needed.\n"
 msgstr ""
 "Klucz nie zosta� zmieniony wi�c nanoszenie poprawek nie jest konieczne.\n"
 
-#: g10/keyedit.c:703 g10/keyedit.c:762
+#: g10/keyedit.c:717 g10/keyedit.c:776
 #, c-format
 msgid "update of trustdb failed: %s\n"
 msgstr "naniesienie poprawek bazy zaufania nie powiod�o si�: %s\n"
 
-#: g10/keyedit.c:736
+#: g10/keyedit.c:750
 msgid "Really sign all user ids? "
 msgstr "Podpisa� wszystkie identyfikatory u�ytkownika na tym kluczu? "
 
-#: g10/keyedit.c:737
+#: g10/keyedit.c:751
 msgid "Hint: Select the user ids to sign\n"
 msgstr "Podpowied�: wybierz identyfikatory u�ytkownika do podpisania.\n"
 
-#: g10/keyedit.c:773
+#: g10/keyedit.c:787
 msgid "You must select at least one user id.\n"
 msgstr "Musisz wybra� co najmniej jeden identyfikator u�ytkownika.\n"
 
-#: g10/keyedit.c:775
+#: g10/keyedit.c:789
 msgid "You can't delete the last user id!\n"
 msgstr "Nie mo�esz usun�� ostatniego identyfikatora u�ytkownika!\n"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:792
 msgid "Really remove all selected user ids? "
 msgstr "Czy na pewno usun�� wszystkie wybrane identyfikatory u�ytkownika? "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:793
 msgid "Really remove this user id? "
 msgstr "Czy na pewno usun�� ten identyfikator u�ytkownika? "
 
-#: g10/keyedit.c:802
+#: g10/keyedit.c:816 g10/keyedit.c:838
 msgid "You must select at least one key.\n"
 msgstr "Musisz wybra� co najmniej jeden klucz.\n"
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:820
 msgid "Do you really want to delete the selected keys? "
 msgstr "Czy na pewno chcesz usun�� wybrane klucze? "
 
-#: g10/keyedit.c:807
+#: g10/keyedit.c:821
 msgid "Do you really want to delete this key? "
 msgstr "Czy na pewno chcesz usun�� ten klucz? "
 
-#: g10/keyedit.c:854
+#: g10/keyedit.c:842
+#, fuzzy
+msgid "Do you really want to revoke the selected keys? "
+msgstr "Czy na pewno chcesz usun�� wybrane klucze? "
+
+#: g10/keyedit.c:843
+#, fuzzy
+msgid "Do you really want to revoke this key? "
+msgstr "Czy na pewno chcesz usun�� ten klucz? "
+
+#: g10/keyedit.c:897
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Niepoprawna komenda  (spr�buj \"help\")\n"
 
-#: g10/keyedit.c:1232
+#: g10/keyedit.c:1289
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Prosz� usun�� znacznik wyboru z kluczy tajnych.\n"
 
-#: g10/keyedit.c:1238
+#: g10/keyedit.c:1295
 msgid "Please select at most one secondary key.\n"
 msgstr "Prosz� wybra� najwy�ej jeden podklucz.\n"
 
-#: g10/keyedit.c:1242
+#: g10/keyedit.c:1299
 msgid "Changing exiration time for a secondary key.\n"
 msgstr "Zmiana daty wa�no�ci podklucza.\n"
 
-#: g10/keyedit.c:1244
+#: g10/keyedit.c:1301
 msgid "Changing exiration time for the primary key.\n"
 msgstr "Zmiana daty wa�no�ci g��wnego klucza.\n"
 
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1342
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Nie mo�na zmieni� daty wa�no�ci klucza w wersji 3.\n"
 
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1358
 msgid "No corresponding signature in secret ring\n"
 msgstr "Brak odpowiadaj�cego podpisu w zbiorze kluczy tajnych\n"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1418
 #, c-format
 msgid "No user id with index %d\n"
 msgstr "Brak identyfikatora u�ytkownika o numerze %d.\n"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1464
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Brak podklucza o indeksie %d\n"
 
-#: g10/mainproc.c:184
+#: g10/keyedit.c:1562
+#, fuzzy
+msgid "user ID: \""
+msgstr "Wprowad� identyfikator u�ytkownika (user ID): "
+
+#: g10/keyedit.c:1565
+#, fuzzy, c-format
+msgid ""
+"\"\n"
+"signed with your key %08lX at %s\n"
+msgstr "Nie ma nic do podpisania kluczem %08lX.\n"
+
+#: g10/keyedit.c:1569
+#, fuzzy
+msgid "Create a revocation certificate for this signature? (y/N)"
+msgstr "generacja certyfikatu uniewa�nienia klucza"
+
+#: g10/keyedit.c:1649
+#, fuzzy
+msgid "Really create the revocation certificates? (y/N)"
+msgstr "generacja certyfikatu uniewa�nienia klucza"
+
+#: g10/keyedit.c:1672
+#, fuzzy
+msgid "no secret key\n"
+msgstr "niepoprawny klucz prywatny"
+
+#: g10/mainproc.c:185
 #, fuzzy, c-format
 msgid "public key is %08lX\n"
 msgstr "klucz publiczny nie odnaleziony"
 
-#: g10/mainproc.c:212
+#: g10/mainproc.c:213
 msgid "public key encrypted data: good DEK\n"
 msgstr "dane zaszyfrowane kluczem publicznym: poprawny klucz sesyjny\n"
 
 #. fixme: defer this message until we have parsed all packets of
 #. * this type - do this by building a list of keys with their stati
-#. * and store it with the conetxt.  do_proc_packets can then use
+#. * and store it with the context.  do_proc_packets can then use
 #. * this list to display some information
-#: g10/mainproc.c:219
+#: g10/mainproc.c:220
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "b��d odszyfrowywania kluczem publicznym: %s\n"
 
-#: g10/mainproc.c:246
+#: g10/mainproc.c:249
 msgid "decryption okay\n"
 msgstr "odszyfrowane poprawnie\n"
 
-#: g10/mainproc.c:249
+#: g10/mainproc.c:253
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "b��d odszyfrowywania: %s\n"
 
-#: g10/mainproc.c:266
+#: g10/mainproc.c:270
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "UWAGA: nadawca zaznaczy� �e wiadomo�� nie powinna by� zapisywana\n"
 
-#: g10/mainproc.c:268
+#: g10/mainproc.c:272
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "pierwotna nazwa pliku='%.*s'\n"
 
-#: g10/mainproc.c:849
+#: g10/mainproc.c:876
 msgid "signature verification suppressed\n"
 msgstr "wymuszono pomini�cie sprawdzenia podpisu\n"
 
-#: g10/mainproc.c:855
+#: g10/mainproc.c:883
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr ""
 "Podpis z�o�ony %.*s za pomoc� %s,\n"
 "z u�yciem klucza o identyfikatorze %08lX\n"
 
+#: g10/mainproc.c:895
+#, fuzzy
+msgid "encrypted message is valid\n"
+msgstr "wybrany algorytm geenracji skr�t�w wiadomo�ci jest niepoprawny\n"
+
+#: g10/mainproc.c:899
+msgid "WARNING: encrypted message has been manipulated!\n"
+msgstr ""
+
+#: g10/mainproc.c:904
+#, fuzzy, c-format
+msgid "Can't check MDC: %s\n"
+msgstr "Nie mog� sprawdzi� podpisu: %s\n"
+
 #. just in case that we have no userid
-#: g10/mainproc.c:881 g10/mainproc.c:892
+#: g10/mainproc.c:925 g10/mainproc.c:936
 msgid "BAD signature from \""
 msgstr "NIEPOPRAWNY podpis z�o�ony przez \""
 
-#: g10/mainproc.c:882 g10/mainproc.c:893
+#: g10/mainproc.c:926 g10/mainproc.c:937
 msgid "Good signature from \""
 msgstr "Poprawny podpis z�o�ony przez \""
 
-#: g10/mainproc.c:884
+#: g10/mainproc.c:928
 #, fuzzy
 msgid "                aka \""
 msgstr "         do��czono do zbioru: %lu"
 
-#: g10/mainproc.c:930
+#: g10/mainproc.c:974
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nie mog� sprawdzi� podpisu: %s\n"
 
-#: g10/mainproc.c:1003
+#: g10/mainproc.c:1047
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis starego typu (PGP 2.x)\n"
 
-#: g10/mainproc.c:1008
+#: g10/mainproc.c:1052
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "wykryto niepoprawny pakiet pierwotny w proc_tree()\n"
 
@@ -2226,7 +2328,7 @@ msgstr ""
 "Klucze RSA s� odradzane; prosz� rozwa�y� przej�cie na inne algorytmy po\n"
 "wygenerowaniu odpowiednich kluczy.\n"
 
-#: g10/misc.c:235
+#: g10/misc.c:236
 msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr ""
 "ten algorytm szyfruj�cy jest odradzanym prosz� u�ywa� bardziej "
@@ -2242,7 +2344,7 @@ msgstr "algorytm klucza publicznego niemo�liwy do obs�u�enia: %d\n"
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpakiet typu %d ma ustawiony krytyczny bit\n"
 
-#: g10/passphrase.c:151
+#: g10/passphrase.c:157
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2252,21 +2354,21 @@ msgstr ""
 "Musisz poda� wyra�enie przej�ciowe (has�o) aby uaktywni� klucz tajny\n"
 "dla u�ytkownika: \""
 
-#: g10/passphrase.c:160
+#: g10/passphrase.c:166
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "d�ugo�� %u bit�w, typ %s, klucz %08lX, stworzony %s"
 
-#: g10/passphrase.c:165
+#: g10/passphrase.c:171
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (g��wny ID klucza %08lX)"
 
-#: g10/passphrase.c:184
+#: g10/passphrase.c:190
 msgid "Enter passphrase: "
 msgstr "Wyra�enie przej�ciowe: "
 
-#: g10/passphrase.c:188
+#: g10/passphrase.c:194
 msgid "Repeat passphrase: "
 msgstr "Powt�rzone wyra�enie przej�ciowe: "
 
@@ -2306,45 +2408,51 @@ msgstr "stary, nie obs�ugiwany algorytm szyfrowania klucza sesyjnego\n"
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr "UWAGA: brak algorytmu szyfruj�cego %d w ustawieniach\n"
 
-#: g10/seckey-cert.c:57
+#: g10/seckey-cert.c:55
 #, c-format
 msgid "protection algorithm %d is not supported\n"
 msgstr "%d - algorytm ochrony nie obs�ugiwany\n"
 
-#: g10/seckey-cert.c:177
+#: g10/seckey-cert.c:171
 msgid "Invalid passphrase; please try again ...\n"
 msgstr ""
 "Niepoprawne wyra�enie przej�ciowe (has�o); prosz� spr�bowa� ponownie ...\n"
 
-#: g10/seckey-cert.c:232
+#: g10/seckey-cert.c:227
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "Ostrze�enie: Wykryto klucz s�aby algorytmu - nale�y ponownie zmieni� \n"
 "wyra�enie przej�ciowe (has�o).\n"
 
-#: g10/sig-check.c:195
+#: g10/sig-check.c:186
+#, fuzzy
+msgid "assuming bad MDC due to an unknown critical bit\n"
+msgstr ""
+"przyj�to niewa�no�� podpisu z powonu ustawienia nieznanego bitu krytycznego\n"
+
+#: g10/sig-check.c:282
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "Klucz algorytmu ElGamala wygenerowany przez PGP - podpisy nim sk�adane\n"
 "nie zapewniaj� bezpiecze�stwa!\n"
 
-#: g10/sig-check.c:203
+#: g10/sig-check.c:290
 #, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "klucz publiczny jest o %lu sekund m�odszy od podpisu\n"
 
-#: g10/sig-check.c:204
+#: g10/sig-check.c:291
 #, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "klucz publiczny jest o %lu sekund m�odszy od podpisu\n"
 
-#: g10/sig-check.c:220
+#: g10/sig-check.c:307
 #, c-format
 msgid "NOTE: signature key expired %s\n"
 msgstr "UWAGA: klucz podpisuj�cy przekroczy� dat� wa�no�ci %s\n"
 
-#: g10/sig-check.c:277
+#: g10/sig-check.c:364
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 "przyj�to niewa�no�� podpisu z powonu ustawienia nieznanego bitu krytycznego\n"
@@ -2354,7 +2462,7 @@ msgstr ""
 msgid "%s signature from: %s\n"
 msgstr "%s podpis z�o�ony przez: %s\n"
 
-#: g10/sign.c:210 g10/sign.c:493
+#: g10/sign.c:210 g10/sign.c:496
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "nie mog� stworzy� %s: %s\n"
@@ -2363,11 +2471,6 @@ msgstr "nie mog� stworzy� %s: %s\n"
 msgid "signing:"
 msgstr "podpis:"
 
-#: g10/sign.c:346
-#, c-format
-msgid "WARNING: `%s' is an empty file\n"
-msgstr "OSTRZE�ENIE: plik '%s' jest pusty\n"
-
 #: g10/textfilter.c:122
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
@@ -2378,12 +2481,12 @@ msgstr "nie mog� obs�u�y� linii tekstu d�u�szej ni� %d znak�w\n"
 msgid "input line longer than %d characters\n"
 msgstr "b��d opakowania: linia d�u�sza ni� %d znak�w\n"
 
-#: g10/tdbio.c:116 g10/tdbio.c:1504
+#: g10/tdbio.c:116 g10/tdbio.c:1505
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "baza zaufania, wpis %lu: lseek() nie powiod�a si�: %s\n"
 
-#: g10/tdbio.c:122 g10/tdbio.c:1511
+#: g10/tdbio.c:122 g10/tdbio.c:1512
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "baza zaufania, wpis %lu: zapis nie powi�d� si� (n=%d): %s\n"
@@ -2412,12 +2515,12 @@ msgstr "%s: katalog utworzony\n"
 msgid "%s: directory does not exist!\n"
 msgstr "%s: katalog nie istnieje!\n"
 
-#: g10/openfile.c:111 g10/openfile.c:181 g10/ringedit.c:1325 g10/tdbio.c:457
+#: g10/openfile.c:111 g10/openfile.c:181 g10/ringedit.c:1344 g10/tdbio.c:457
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: nie mog� utworzy�: %s\n"
 
-#: g10/tdbio.c:472 g10/tdbio.c:520
+#: g10/tdbio.c:472 g10/tdbio.c:521
 #, fuzzy, c-format
 msgid "%s: can't create lock\n"
 msgstr "%s: nie mog� utworzy�: %s\n"
@@ -2432,83 +2535,83 @@ msgstr "%s: stworzenie zapisu o wersji nie powiod�o si�: %s"
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: stworzony niepoprawny plik bazy zaufania\n"
 
-#: g10/tdbio.c:492
+#: g10/tdbio.c:493
 #, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: baza zaufania utworzona\n"
 
-#: g10/tdbio.c:529
+#: g10/tdbio.c:530
 #, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: niepoprawny plik bazy zaufania\n"
 
-#: g10/tdbio.c:562
+#: g10/tdbio.c:563
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: tworzenie tablicy skr�t�w nie powiod�o si�: %s\n"
 
-#: g10/tdbio.c:570
+#: g10/tdbio.c:571
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: b��d przy uaktualnianiu numeru wersji: %s\n"
 
-#: g10/tdbio.c:586 g10/tdbio.c:625 g10/tdbio.c:647 g10/tdbio.c:677
-#: g10/tdbio.c:702 g10/tdbio.c:1437 g10/tdbio.c:1464
+#: g10/tdbio.c:587 g10/tdbio.c:626 g10/tdbio.c:648 g10/tdbio.c:678
+#: g10/tdbio.c:703 g10/tdbio.c:1438 g10/tdbio.c:1465
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: b��d odczytu numeru wersji: %s\n"
 
-#: g10/tdbio.c:599 g10/tdbio.c:658
+#: g10/tdbio.c:600 g10/tdbio.c:659
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: b��d zapisu numeru wersji: %s\n"
 
-#: g10/tdbio.c:1131
+#: g10/tdbio.c:1132
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "baza zaufania: procedura lseek() zawiod�a: %s\n"
 
-#: g10/tdbio.c:1139
+#: g10/tdbio.c:1140
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "baza zaufania: procedura read() (n=%d) zawiod�a: %s\n"
 
-#: g10/tdbio.c:1160
+#: g10/tdbio.c:1161
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: to nie jest plik bazy zaufania\n"
 
-#: g10/tdbio.c:1176
+#: g10/tdbio.c:1177
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: wpis wersji z numerem %lu\n"
 
-#: g10/tdbio.c:1181
+#: g10/tdbio.c:1182
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: niew�a�ciwa wersja pliku %d\n"
 
-#: g10/tdbio.c:1470
+#: g10/tdbio.c:1471
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: b��d odczytu pustego wpisu: %s\n"
 
-#: g10/tdbio.c:1478
+#: g10/tdbio.c:1479
 #, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: b��d zapisu wpisu katalogowego: %s\n"
 
-#: g10/tdbio.c:1488
+#: g10/tdbio.c:1489
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: zerowanie rekordu nie powiod�o si�: %s\n"
 
-#: g10/tdbio.c:1518
+#: g10/tdbio.c:1519
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: dopisanie rekordu nie powiod�o si�: %s\n"
 
-#: g10/tdbio.c:1629
+#: g10/tdbio.c:1630
 msgid "The trustdb is corrupted; please run \"gpgm --fix-trustdb\".\n"
 msgstr ""
 "Baza zaufania jest uszkodzona; prosz� uruchomi� \"gpgm --fix-trust-db\".\n"
@@ -2728,7 +2831,7 @@ msgstr "Zbyt wiele ustawie�."
 msgid "Too many preference items"
 msgstr "Zbyt wiele pozycji w ustawieniach"
 
-#: g10/trustdb.c:1549 g10/trustdb.c:3045 g10/trustdb.c:3075
+#: g10/trustdb.c:1549 g10/trustdb.c:3075 g10/trustdb.c:3105
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "OSTRZE�ENIE: d�ugie wpisy ustawie� jeszcze nie s� obs�ugiwane.\n"
 
@@ -2898,22 +3001,22 @@ msgstr "klucz %08lX.%lu: okres wa�no�ci up�yn�� %s\n"
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "klucz %08lX.%lu: b��d przy sprawdzaniu zaufania: %s\n"
 
-#: g10/trustdb.c:2851
+#: g10/trustdb.c:2881
 #, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "u�ytkownik '%s' nie odnaleziony: %s\n"
 
-#: g10/trustdb.c:2853
+#: g10/trustdb.c:2883
 #, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "problem podczas szukania '%s' w bazie zaufania: %s\n"
 
-#: g10/trustdb.c:2856
+#: g10/trustdb.c:2886
 #, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr "brak u�ytkownika '%s' w bazie zaufania - dodano\n"
 
-#: g10/trustdb.c:2859
+#: g10/trustdb.c:2889
 #, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "umieszczenie '%s' w Bazie Zaufania nie powiod�o si�: %s\n"
@@ -2923,26 +3026,26 @@ msgstr "umieszczenie '%s' w Bazie Zaufania nie powiod�o si�: %s\n"
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s: stworzenie zbioru kluczy jest niemo�liwe: %s\n"
 
-#: g10/ringedit.c:322 g10/ringedit.c:1330
+#: g10/ringedit.c:333 g10/ringedit.c:1349
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: zbi�r kluczy utworzony\n"
 
-#: g10/ringedit.c:1507
+#: g10/ringedit.c:1526
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "OSTRZE�ENIE: Istniej� dwa pliki z poufnymi informacjami.\n"
 
-#: g10/ringedit.c:1508
+#: g10/ringedit.c:1527
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s pozosta� bez zmian\n"
 
-#: g10/ringedit.c:1509
+#: g10/ringedit.c:1528
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s zosta� utworzony\n"
 
-#: g10/ringedit.c:1510
+#: g10/ringedit.c:1529
 msgid "Please fix this possible security flaw\n"
 msgstr "Prosz� usun�� to naruszenie zasad bezpiecze�stwa\n"
 
@@ -2990,17 +3093,17 @@ msgstr "przyj�to obecno�� podpisanych danych w '%s'\n"
 msgid "%s: new options file created\n"
 msgstr "%s: stworzono nowy plik ustawie�\n"
 
-#: g10/encr-data.c:59
+#: g10/encr-data.c:60
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s zaszyfrowane dane\n"
 
-#: g10/encr-data.c:61
+#: g10/encr-data.c:62
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "zaszyfrowane nieznanym algorytmem %d\n"
 
-#: g10/encr-data.c:74
+#: g10/encr-data.c:77
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr ""
@@ -3188,6 +3291,19 @@ msgstr "Pomoc niedost�pna"
 msgid "No help available for `%s'"
 msgstr "Brak pomocy o '%s'"
 
+#~ msgid "Usage: gpgm [options] [files] (-h for help)"
+#~ msgstr "Spos�b u�ycia: gpgm [opcje] [pliki] (-h podaje pomoc)"
+
+#~ msgid ""
+#~ "Syntax: gpgm [options] [files]\n"
+#~ "GnuPG maintenance utility\n"
+#~ msgstr ""
+#~ "Sk�adnia: gpgm [opcje] [pliki]\n"
+#~ "GnuPG program obs�uguj�cy\n"
+
+#~ msgid "usage: gpgm [options] "
+#~ msgstr "spos�b u�ycia: gpgm [opcje]"
+
 #~ msgid "|KEYID|ulimately trust this key"
 #~ msgstr "|KLUCZ|ca�kowite zaufanie dla tego klucza"
 
@@ -3271,9 +3387,6 @@ msgstr "Brak pomocy o '%s'"
 #~ msgid "did not use primary key for insert_trust_record()\n"
 #~ msgstr "g�owny klucz nie zosta� u�yty w procedurze insert_trust_record()\n"
 
-#~ msgid "use this user-id for encryption"
-#~ msgstr "u�y� tego identyfikatora do szyfrowania"
-
 #~ msgid "second"
 #~ msgstr "sekunda"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index dd0b1561c..89d99595b 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -4,7 +4,7 @@
 #
 msgid ""
 msgstr ""
-"POT-Creation-Date: 1999-03-20 13:40+0100\n"
+"POT-Creation-Date: 1999-05-06 13:37+0200\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Date: 1998-11-20 23:46:36-0200\n"
 "From: Thiago Jung Bauermann <[email protected]>\n"
@@ -28,11 +28,11 @@ msgstr ""
 msgid "(you may have used the wrong program for this task)\n"
 msgstr ""
 
-#: util/miscutil.c:143
+#: util/miscutil.c:156
 msgid "yes"
 msgstr "sim"
 
-#: util/miscutil.c:144
+#: util/miscutil.c:157
 msgid "yY"
 msgstr "sS"
 
@@ -271,6 +271,11 @@ msgstr "N�o suportado"
 msgid "network error"
 msgstr "Erro geral"
 
+#: util/errors.c:102
+#, fuzzy
+msgid "not encrypted"
+msgstr "dados codificados com\n"
+
 #: util/logger.c:178
 #, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
@@ -281,11 +286,11 @@ msgstr "... isto � um bug (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "voc� encontrou um bug ... (%s:%d)\n"
 
-#: cipher/random.c:403
+#: cipher/random.c:408
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "AVISO: usando gerador de n�meros aleat�rios inseguro!\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:409
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -311,7 +316,7 @@ msgstr ""
 "para que o sistema possa coletar mais entropia!\n"
 "(S�o necess�rios mais %d bytes)\n"
 
-#: g10/g10.c:166
+#: g10/g10.c:163
 msgid ""
 "@Commands:\n"
 " "
@@ -319,131 +324,131 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/g10.c:169
+#: g10/g10.c:165
 msgid "|[file]|make a signature"
 msgstr "|[arquivo]|faz uma assinatura"
 
-#: g10/g10.c:170
+#: g10/g10.c:166
 msgid "|[file]|make a clear text signature"
 msgstr "|[arquivo]|faz uma assinatura em texto puro"
 
-#: g10/g10.c:171
+#: g10/g10.c:167
 msgid "make a detached signature"
 msgstr "faz uma assinatura separada"
 
-#: g10/g10.c:172
+#: g10/g10.c:168
 msgid "encrypt data"
 msgstr "codifica dados"
 
-#: g10/g10.c:173
+#: g10/g10.c:169
 msgid "encryption only with symmetric cipher"
 msgstr "codifica apenas com criptografia sim�trica"
 
-#: g10/g10.c:174
+#: g10/g10.c:170
 msgid "store only"
 msgstr "apenas armazena"
 
-#: g10/g10.c:175
+#: g10/g10.c:171
 msgid "decrypt data (default)"
 msgstr "decodifica dados (padr�o)"
 
-#: g10/g10.c:176
+#: g10/g10.c:172
 msgid "verify a signature"
 msgstr "verifica uma assinatura"
 
-#: g10/g10.c:178
+#: g10/g10.c:173
 msgid "list keys"
 msgstr "lista as chaves"
 
-#: g10/g10.c:179
+#: g10/g10.c:175
 msgid "list keys and signatures"
 msgstr "lista as chaves e as assinaturas"
 
-#: g10/g10.c:180
+#: g10/g10.c:176
 msgid "check key signatures"
 msgstr "confere as assinaturas das chaves"
 
-#: g10/g10.c:181
+#: g10/g10.c:177
 msgid "list keys and fingerprints"
 msgstr "lista as chaves e as impress�es digitais"
 
-#: g10/g10.c:182
+#: g10/g10.c:178
 msgid "list secret keys"
 msgstr "lista as chaves secretas"
 
-#: g10/g10.c:184
+#: g10/g10.c:179
 msgid "generate a new key pair"
 msgstr "gera um novo par de chaves"
 
-#: g10/g10.c:186
+#: g10/g10.c:180
 msgid "remove key from the public keyring"
 msgstr "remove a chave do anel de chaves p�blico"
 
-#: g10/g10.c:188
+#: g10/g10.c:181
 msgid "sign or edit a key"
 msgstr "assina ou edita uma chave"
 
-#: g10/g10.c:189
+#: g10/g10.c:182
 msgid "generate a revocation certificate"
 msgstr "gera um certificado de revoga��o"
 
-#: g10/g10.c:191
+#: g10/g10.c:183
 msgid "export keys"
 msgstr "exporta as chaves"
 
-#: g10/g10.c:192
+#: g10/g10.c:184
 msgid "export keys to a key server"
 msgstr ""
 
-#: g10/g10.c:193
+#: g10/g10.c:185
 msgid "import keys from a key server"
 msgstr ""
 
-#: g10/g10.c:196
+#: g10/g10.c:188
 msgid "import/merge keys"
 msgstr "importa/funde as chaves"
 
-#: g10/g10.c:198
+#: g10/g10.c:190
 msgid "list only the sequence of packets"
 msgstr "lista apenas as seq��ncias de pacotes"
 
-#: g10/g10.c:201
+#: g10/g10.c:192
 msgid "export the ownertrust values"
 msgstr "exporta os valores de confian�a"
 
-#: g10/g10.c:203
+#: g10/g10.c:194
 msgid "import ownertrust values"
 msgstr "importa os valores de confian�a"
 
-#: g10/g10.c:205
+#: g10/g10.c:196
 msgid "|[NAMES]|update the trust database"
 msgstr "|[NOMES]|atualiza o banco de dados de confian�a"
 
-#: g10/g10.c:207
+#: g10/g10.c:198
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMES]|confere o banco de dados de confian�a"
 
-#: g10/g10.c:208
+#: g10/g10.c:199
 msgid "fix a corrupted trust database"
 msgstr "conserta um banco de dados de confian�a danificado"
 
-#: g10/g10.c:209
+#: g10/g10.c:200
 msgid "De-Armor a file or stdin"
 msgstr "Retira a armadura de um arquivo ou \"stdin\""
 
-#: g10/g10.c:210
+#: g10/g10.c:201
 msgid "En-Armor a file or stdin"
 msgstr "Cria armadura para um arquivo ou \"stdin\""
 
-#: g10/g10.c:211
+#: g10/g10.c:202
 msgid "|algo [files]|print message digests"
 msgstr "|algo [arquivos]|imprime \"digests\" de mensagens"
 
-#: g10/g10.c:212
+#: g10/g10.c:203
 msgid "print all message digests"
 msgstr "imprime todos os \"digests\" de mensagens"
 
-#: g10/g10.c:219
+#: g10/g10.c:209
 msgid ""
 "@\n"
 "Options:\n"
@@ -453,149 +458,154 @@ msgstr ""
 "Op��es:\n"
 " "
 
-#: g10/g10.c:221
+#: g10/g10.c:211
 msgid "create ascii armored output"
 msgstr "cria uma sa�da ascii com armadura"
 
-#: g10/g10.c:222
+#: g10/g10.c:212
 #, fuzzy
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME| estabelece mapa de caracteres do terminal para NOME"
 
-#: g10/g10.c:227
+#: g10/g10.c:216
 msgid "use this user-id to sign or decrypt"
 msgstr "usa este identificador de usu�rio para assinar ou decodificar"
 
-#: g10/g10.c:228
+#: g10/g10.c:217
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|estabelece n�vel de compress�o N (0 desabilita)"
 
-#: g10/g10.c:230
+#: g10/g10.c:219
 msgid "use canonical text mode"
 msgstr "usa modo de texto can�nico"
 
-#: g10/g10.c:232
+#: g10/g10.c:220
 msgid "use as output file"
 msgstr "usa como arquivo de sa�da"
 
-#: g10/g10.c:233
+#: g10/g10.c:221
 msgid "verbose"
 msgstr "prolixo"
 
-#: g10/g10.c:234
+#: g10/g10.c:222
 msgid "be somewhat more quiet"
 msgstr "ser mais silencioso"
 
-#: g10/g10.c:235
+#: g10/g10.c:223
 msgid "force v3 signatures"
 msgstr "for�a assinaturas v3"
 
-#: g10/g10.c:236
+#: g10/g10.c:224
+#, fuzzy
+msgid "always use a MDC for encryption"
+msgstr "usa este identificador de usu�rio para codificar"
+
+#: g10/g10.c:225
 msgid "do not make any changes"
 msgstr ""
 
-#: g10/g10.c:237
+#: g10/g10.c:226
 msgid "batch mode: never ask"
 msgstr "processo de lote: nunca perguntar"
 
-#: g10/g10.c:238
+#: g10/g10.c:227
 msgid "assume yes on most questions"
 msgstr "assumir sim para a maioria das perguntas"
 
-#: g10/g10.c:239
+#: g10/g10.c:228
 msgid "assume no on most questions"
 msgstr "assumir n�o para a maioria das perguntas"
 
-#: g10/g10.c:240
+#: g10/g10.c:229
 msgid "add this keyring to the list of keyrings"
 msgstr "adiciona este anel de chaves � lista de an�is de chaves"
 
-#: g10/g10.c:241
+#: g10/g10.c:230
 msgid "add this secret keyring to the list"
 msgstr "adiciona este anel de chaves secreto � lista"
 
-#: g10/g10.c:242
+#: g10/g10.c:231
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usa NOME como chave secreta padr�o"
 
-#: g10/g10.c:243
+#: g10/g10.c:232
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr ""
 
-#: g10/g10.c:244
+#: g10/g10.c:233
 #, fuzzy
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOME| estabelece mapa de caracteres do terminal para NOME"
 
-#: g10/g10.c:245
+#: g10/g10.c:234
 msgid "read options from file"
 msgstr "l� op��es do arquivo"
 
-#: g10/g10.c:247
+#: g10/g10.c:236
 msgid "set debugging flags"
 msgstr "estabelece par�metros de depura��o"
 
-#: g10/g10.c:248
+#: g10/g10.c:237
 msgid "enable full debugging"
 msgstr "habilita depura��o completa"
 
-#: g10/g10.c:249
+#: g10/g10.c:238
 msgid "|FD|write status info to this FD"
 msgstr "|DA|escreve informa��es de status para este DA"
 
-#: g10/g10.c:250
+#: g10/g10.c:239
 msgid "do not write comment packets"
 msgstr "n�o escreve pacotes de coment�rio"
 
-#: g10/g10.c:251
+#: g10/g10.c:240
 msgid "(default is 1)"
 msgstr "(o padr�o � 1)"
 
-#: g10/g10.c:252
+#: g10/g10.c:241
 msgid "(default is 3)"
 msgstr "(o padr�o � 3)"
 
-#: g10/g10.c:254
+#: g10/g10.c:243
 msgid "|FILE|load extension module FILE"
 msgstr "|ARQUIVO|carrega m�dulo de extens�o ARQUIVO"
 
-#: g10/g10.c:255
+#: g10/g10.c:244
 msgid "emulate the mode described in RFC1991"
 msgstr "emula o modo descrito no RFC1991"
 
-#: g10/g10.c:256
+#: g10/g10.c:245
 msgid "|N|use passphrase mode N"
 msgstr "|N|usa frase secreta modo N"
 
-#: g10/g10.c:258
+#: g10/g10.c:247
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr ""
 "|NOME|usa algoritmo de \"digest\" de mensagens NOME para\n"
 "frases secretas"
 
-#: g10/g10.c:260
+#: g10/g10.c:249
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr ""
 "|NOME|usa algoritmo de criptografia NOME para\n"
 "frases secretas"
 
-#: g10/g10.c:262
+#: g10/g10.c:250
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usa algoritmo de criptografia NOME"
 
-#: g10/g10.c:263
+#: g10/g10.c:251
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usa algoritmo de \"digest\" de mensagens NOME"
 
-#: g10/g10.c:264
+#: g10/g10.c:252
 msgid "|N|use compress algorithm N"
 msgstr "|N|usa algoritmo de compress�o N"
 
-#: g10/g10.c:265
+#: g10/g10.c:253
 msgid "throw keyid field of encrypted packets"
 msgstr "elimina o campo keyid dos pacotes codificados"
 
-#: g10/g10.c:273
+#: g10/g10.c:255
 msgid ""
 "@\n"
 "Examples:\n"
@@ -615,27 +625,15 @@ msgstr ""
 " --list-keys [nomes]        mostra chaves\n"
 " --fingerprint [nomes]      mostra impress�es digitais\n"
 
-#: g10/g10.c:353
+#: g10/g10.c:323
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Por favor comunique bugs para <[email protected]>.\n"
 
-#: g10/g10.c:358
-msgid "Usage: gpgm [options] [files] (-h for help)"
-msgstr "Uso: gpgm [op��es] [arquivos] (-h para ajuda)"
-
-#: g10/g10.c:360
+#: g10/g10.c:327
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
 
-#: g10/g10.c:365
-msgid ""
-"Syntax: gpgm [options] [files]\n"
-"GnuPG maintenance utility\n"
-msgstr ""
-"Sintaxe: gpgm [op��es] [arquivos]\n"
-"Utilit�rio de manuten��o do GnuPG\n"
-
-#: g10/g10.c:368
+#: g10/g10.c:330
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -645,7 +643,7 @@ msgstr ""
 "assina, verifica, codifica ou decodifica\n"
 "a opera��o padr�o depende dos dados de entrada\n"
 
-#: g10/g10.c:374
+#: g10/g10.c:335
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -653,225 +651,221 @@ msgstr ""
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/g10.c:449
-msgid "usage: gpgm [options] "
-msgstr "Uso: gpgm [op��es] "
-
-#: g10/g10.c:451
+#: g10/g10.c:409
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [op��es] "
 
-#: g10/g10.c:492
+#: g10/g10.c:449
 msgid "conflicting commands\n"
 msgstr "comandos conflitantes\n"
 
-#: g10/g10.c:631
+#: g10/g10.c:576
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: arquivo de op��es padr�o `%s' inexistente\n"
 
-#: g10/g10.c:635
+#: g10/g10.c:580
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "arquivo de op��es `%s': %s\n"
 
-#: g10/g10.c:642
+#: g10/g10.c:587
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo op��es de `%s'\n"
 
-#: g10/g10.c:797
+#: g10/g10.c:731
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s n�o � um mapa de caracteres v�lido\n"
 
-#: g10/g10.c:838 g10/g10.c:850
+#: g10/g10.c:774 g10/g10.c:786
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/g10.c:844 g10/g10.c:856
+#: g10/g10.c:780 g10/g10.c:792
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/g10.c:859
+#: g10/g10.c:795
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "algoritmo de compress�o deve estar na faixa %d..%d\n"
 
-#: g10/g10.c:861
+#: g10/g10.c:797
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/g10.c:863
+#: g10/g10.c:799
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/g10.c:865
+#: g10/g10.c:801
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth deve estar na faixa 1 a 255\n"
 
-#: g10/g10.c:868
+#: g10/g10.c:804
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: o modo S2K simples (0) n�o � recomend�vel\n"
 
-#: g10/g10.c:872
+#: g10/g10.c:808
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
 
-#: g10/g10.c:949
+#: g10/g10.c:885
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "falha ao inicializar o banco de dados de confian�a: %s\n"
 
-#: g10/g10.c:955
+#: g10/g10.c:891
 msgid "--store [filename]"
 msgstr "--store [nome_do_arquivo]"
 
-#: g10/g10.c:963
+#: g10/g10.c:898
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/g10.c:971
+#: g10/g10.c:906
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_arquivo]"
 
-#: g10/g10.c:984
+#: g10/g10.c:919
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_arquivo]"
 
-#: g10/g10.c:997
+#: g10/g10.c:932
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/g10.c:1011
+#: g10/g10.c:946
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_arquivo]"
 
-#: g10/g10.c:1023
+#: g10/g10.c:958
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_arquivo]"
 
-#: g10/g10.c:1032
+#: g10/g10.c:967
 msgid "--edit-key username [commands]"
 msgstr "--edit-key nome_do_usu�rio [comandos]"
 
-#: g10/g10.c:1048
+#: g10/g10.c:981
 msgid "--delete-secret-key username"
 msgstr "--delete-secret-key nome_do_usu�rio"
 
-#: g10/g10.c:1051
+#: g10/g10.c:984
 msgid "--delete-key username"
 msgstr "--delete-key nome_do_usu�rio"
 
-#: g10/encode.c:229 g10/g10.c:1074 g10/sign.c:311
+#: g10/encode.c:234 g10/g10.c:1007 g10/sign.c:311
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "imposs�vel abrir %s: %s\n"
 
-#: g10/g10.c:1085
+#: g10/g10.c:1018
 msgid "-k[v][v][v][c] [userid] [keyring]"
 msgstr "-k[v][v][v][c] [id_do_usu�rio] [anel_de_chaves]"
 
-#: g10/g10.c:1149
+#: g10/g10.c:1077
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/g10.c:1157
+#: g10/g10.c:1085
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "cria��o de armadura falhou: %s\n"
 
-#: g10/g10.c:1223
+#: g10/g10.c:1151
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de distribui��o inv�lido `%s'\n"
 
-#: g10/g10.c:1302
+#: g10/g10.c:1226
 msgid "[filename]"
 msgstr "[nome_do_arquivo]"
 
-#: g10/g10.c:1306
+#: g10/g10.c:1230
 msgid "Go ahead and type your message ...\n"
 msgstr "V� em frente e digite sua mensagem ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1309 g10/verify.c:66
+#: g10/decrypt.c:59 g10/g10.c:1233 g10/verify.c:66
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "imposs�vel abrir `%s'\n"
 
-#: g10/armor.c:297
+#: g10/armor.c:296
 #, c-format
 msgid "armor: %s\n"
 msgstr "armadura: %s\n"
 
-#: g10/armor.c:320
+#: g10/armor.c:319
 msgid "invalid armor header: "
 msgstr "cabe�alho de armadura inv�lido: "
 
-#: g10/armor.c:327
+#: g10/armor.c:326
 msgid "armor header: "
 msgstr "cabe�alho de armadura: "
 
-#: g10/armor.c:338
+#: g10/armor.c:337
 msgid "invalid clearsig header\n"
 msgstr "cabe�alho de assinatura em texto puro inv�lido\n"
 
-#: g10/armor.c:390
+#: g10/armor.c:389
 #, fuzzy
 msgid "nested clear text signatures\n"
 msgstr "|[arquivo]|faz uma assinatura em texto puro"
 
-#: g10/armor.c:499
+#: g10/armor.c:498
 msgid "invalid dash escaped line: "
 msgstr "linha com h�fen inv�lida: "
 
-#: g10/armor.c:511
+#: g10/armor.c:510
 #, fuzzy
 msgid "unexpected armor:"
 msgstr "Dados inesperados"
 
-#: g10/armor.c:628
+#: g10/armor.c:627
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "caractere radix64 inv�lido %02x ignorado\n"
 
-#: g10/armor.c:671
+#: g10/armor.c:670
 msgid "premature eof (no CRC)\n"
 msgstr "fim de arquivo prematuro (sem CRC)\n"
 
-#: g10/armor.c:705
+#: g10/armor.c:704
 msgid "premature eof (in CRC)\n"
 msgstr "fim de arquivo prematuro (no CRC)\n"
 
-#: g10/armor.c:709
+#: g10/armor.c:708
 msgid "malformed CRC\n"
 msgstr "CRC malformado\n"
 
-#: g10/armor.c:713
+#: g10/armor.c:712
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "erro de CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:730
+#: g10/armor.c:729
 msgid "premature eof (in Trailer)\n"
 msgstr "fim de arquivo prematuro (no \"Trailer\")\n"
 
-#: g10/armor.c:734
+#: g10/armor.c:733
 msgid "error in trailer line\n"
 msgstr "erro na linha \"trailer\"\n"
 
-#: g10/armor.c:998
+#: g10/armor.c:997
 #, fuzzy
 msgid "no valid OpenPGP data found.\n"
 msgstr "nenum dado RFC1991 ou OpenPGP v�lido encontrado.\n"
 
-#: g10/armor.c:1002
+#: g10/armor.c:1001
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr ""
 
-#: g10/armor.c:1006
+#: g10/armor.c:1005
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -967,26 +961,31 @@ msgstr ""
 msgid "key %08lX: key has been revoked!\n"
 msgstr "chave %08lX: a chave foi revogada!\n"
 
-#: g10/pkclist.c:287 g10/pkclist.c:391
+#: g10/pkclist.c:287 g10/pkclist.c:297 g10/pkclist.c:403
 msgid "Use this key anyway? "
 msgstr "Usa esta chave de qualquer modo?"
 
-#: g10/pkclist.c:311
+#: g10/pkclist.c:291
+#, fuzzy, c-format
+msgid "key %08lX: subkey has been revoked!\n"
+msgstr "chave %08lX: a chave foi revogada!\n"
+
+#: g10/pkclist.c:321
 #, c-format
 msgid "%08lX: key has expired\n"
 msgstr "%08lX: a chave expirou\n"
 
-#: g10/pkclist.c:317
+#: g10/pkclist.c:327
 #, c-format
 msgid "%08lX: no info to calculate a trust probability\n"
 msgstr "%08lX: sem informa��o para calcular probabilidade de confian�a\n"
 
-#: g10/pkclist.c:331
+#: g10/pkclist.c:341
 #, c-format
 msgid "%08lX: We do NOT trust this key\n"
 msgstr "%08lX: N�s N�O confiamos nesta chave\n"
 
-#: g10/pkclist.c:337
+#: g10/pkclist.c:347
 #, fuzzy, c-format
 msgid ""
 "%08lX: It is not sure that this key really belongs to the owner\n"
@@ -995,15 +994,15 @@ msgstr ""
 "%08lX: N�o se tem certeza de que esta chave realmente pertence ao dono\n"
 "mas � aceitada de qualquer modo\n"
 
-#: g10/pkclist.c:343
+#: g10/pkclist.c:353
 msgid "This key probably belongs to the owner\n"
 msgstr "Esta chave provavelmente pertence ao dono\n"
 
-#: g10/pkclist.c:348
+#: g10/pkclist.c:358
 msgid "This key belongs to us\n"
 msgstr "Esta chave pertence a n�s (n�s temos a chave secreta)\n"
 
-#: g10/pkclist.c:386
+#: g10/pkclist.c:398
 msgid ""
 "It is NOT certain that the key belongs to its owner.\n"
 "If you *really* know what you are doing, you may answer\n"
@@ -1015,54 +1014,59 @@ msgstr ""
 "afirmativamente � pr�xima pergunta\n"
 "\n"
 
-#: g10/pkclist.c:399
+#: g10/pkclist.c:411
 msgid "WARNING: Using untrusted key!\n"
 msgstr "AVISO: Usando chave n�o confi�vel!\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:447
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/pkclist.c:436
+#: g10/pkclist.c:448
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "         Isto pode significar que a assinatura � falsificada.\n"
 
-#: g10/pkclist.c:457
+#: g10/pkclist.c:452
+#, fuzzy
+msgid "WARNING: This subkey has been revoked by its owner!\n"
+msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
+
+#: g10/pkclist.c:473
 msgid "Note: This key has expired!\n"
 msgstr "Nota: Esta chave expirou!\n"
 
-#: g10/pkclist.c:464
+#: g10/pkclist.c:480
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "AVISO: Esta chave n�o est� certificada com uma assinatura confi�vel!\n"
 
-#: g10/pkclist.c:466
+#: g10/pkclist.c:482
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "         N�o h� indica��o de que a assinatura pertence ao dono.\n"
 
-#: g10/pkclist.c:482
+#: g10/pkclist.c:498
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "AVISO: N�s N�O confiamos nesta chave!\n"
 
-#: g10/pkclist.c:483
+#: g10/pkclist.c:499
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         A assinatura � provavelmente uma FALSIFICA��O.\n"
 
-#: g10/pkclist.c:490
+#: g10/pkclist.c:506
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr "AVISO: Esta chave n�o est� certificada com assinaturas confi�veis!\n"
 
-#: g10/pkclist.c:493
+#: g10/pkclist.c:509
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         N�o se tem certeza de que a assinatura pertence ao dono.\n"
 
-#: g10/pkclist.c:546 g10/pkclist.c:559 g10/pkclist.c:622 g10/pkclist.c:650
+#: g10/pkclist.c:562 g10/pkclist.c:575 g10/pkclist.c:638 g10/pkclist.c:666
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignorado: %s\n"
 
-#: g10/pkclist.c:568
+#: g10/pkclist.c:584
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1070,20 +1074,20 @@ msgstr ""
 "Voc� n�o especificou um ID de usu�rio. (pode-se usar \"-r\")\n"
 "\n"
 
-#: g10/pkclist.c:573
+#: g10/pkclist.c:589
 msgid "Enter the user ID: "
 msgstr "Digite o identificador de usu�rio:"
 
-#: g10/pkclist.c:584
+#: g10/pkclist.c:600
 msgid "No such user ID.\n"
 msgstr "Identificador de usu�rio inexistente.\n"
 
-#: g10/pkclist.c:630
+#: g10/pkclist.c:646
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: erro verificando chave: %s\n"
 
-#: g10/pkclist.c:656
+#: g10/pkclist.c:672
 msgid "no valid addressees\n"
 msgstr "nenhum endere�o v�lido\n"
 
@@ -1162,7 +1166,20 @@ msgstr "DSA permite apenas tamanhos de 512 a 1024\n"
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "tamanho muito pequeno; 768 � o valor m�nimo permitido.\n"
 
-#: g10/keygen.c:459
+#. It is ridiculous and an annoyance to use larger key sizes!
+#. * GnuPG can handle much larger sizes; but it takes an eternity
+#. * to create such a key (but less than the time the Sirius
+#. * Computer Corporation needs to process one of the usual
+#. * complaints) and {de,en}cryption although needs some time.
+#. * So, before you complain about this limitation, I suggest that
+#. * you start a discussion with Marvin about this theme and then
+#. * do whatever you want.
+#: g10/keygen.c:466
+#, fuzzy, c-format
+msgid "keysize too large; %d is largest value allowed.\n"
+msgstr "tamanho muito pequeno; 768 � o valor m�nimo permitido.\n"
+
+#: g10/keygen.c:471
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
 "computations take REALLY long!\n"
@@ -1170,11 +1187,11 @@ msgstr ""
 "Tamanhos de chave maiores que 2048 n�o s�o recomendados\n"
 "porque o tempo de computa��o � REALMENTE longo!\n"
 
-#: g10/keygen.c:462
+#: g10/keygen.c:474
 msgid "Are you sure that you want this keysize? "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/keygen.c:463
+#: g10/keygen.c:475
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1182,21 +1199,21 @@ msgstr ""
 "Tudo bem, mas tenha em mente que a radia��o de seu monitor e teclado tamb�m "
 "� vulner�vel a ataques!\n"
 
-#: g10/keygen.c:471
+#: g10/keygen.c:483
 msgid "Do you really need such a large keysize? "
 msgstr "Voc� realmente precisa de uma chave t�o grande? "
 
-#: g10/keygen.c:477
+#: g10/keygen.c:489
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "O tamanho de chave pedido � %u bits\n"
 
-#: g10/keygen.c:480 g10/keygen.c:484
+#: g10/keygen.c:492 g10/keygen.c:496
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/keygen.c:497
+#: g10/keygen.c:509
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1212,29 +1229,29 @@ msgstr ""
 "      <n>m = chave expira em n meses\n"
 "      <n>y = chave expira em n anos\n"
 
-#: g10/keygen.c:512
+#: g10/keygen.c:524
 msgid "Key is valid for? (0) "
 msgstr "A chave � valida por? (0) "
 
-#: g10/keygen.c:523
+#: g10/keygen.c:535
 msgid "invalid value\n"
 msgstr "valor inv�lido\n"
 
-#: g10/keygen.c:528
+#: g10/keygen.c:540
 msgid "Key does not expire at all\n"
 msgstr "A chave n�o expira nunca\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:534
+#: g10/keygen.c:546
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "A chave expira em %s\n"
 
-#: g10/keygen.c:540
+#: g10/keygen.c:552
 msgid "Is this correct (y/n)? "
 msgstr "Est� correto (s/n)? "
 
-#: g10/keygen.c:583
+#: g10/keygen.c:595
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1250,44 +1267,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:594
+#: g10/keygen.c:606
 msgid "Real name: "
 msgstr "Nome completo: "
 
-#: g10/keygen.c:598
+#: g10/keygen.c:610
 msgid "Invalid character in name\n"
 msgstr "Caractere inv�lido no nome\n"
 
-#: g10/keygen.c:600
+#: g10/keygen.c:612
 msgid "Name may not start with a digit\n"
 msgstr "O nome n�o deve come�ar com um d�gito\n"
 
-#: g10/keygen.c:602
+#: g10/keygen.c:614
 msgid "Name must be at least 5 characters long\n"
 msgstr "O nome deve ter pelo menos 5 caracteres\n"
 
-#: g10/keygen.c:610
+#: g10/keygen.c:622
 msgid "Email address: "
 msgstr "Endere�o de correio eletr�nico: "
 
-#: g10/keygen.c:621
+#: g10/keygen.c:633
 msgid "Not a valid email address\n"
 msgstr "Endere�o eletr�nico inv�lido\n"
 
-#: g10/keygen.c:629
+#: g10/keygen.c:641
 msgid "Comment: "
 msgstr "Coment�rio: "
 
-#: g10/keygen.c:635
+#: g10/keygen.c:647
 msgid "Invalid character in comment\n"
 msgstr "Caractere inv�lido no coment�rio\n"
 
-#: g10/keygen.c:657
+#: g10/keygen.c:669
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr ""
 
-#: g10/keygen.c:663
+#: g10/keygen.c:675
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1298,15 +1315,15 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:666
+#: g10/keygen.c:678
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeVvSs"
 
-#: g10/keygen.c:676
+#: g10/keygen.c:688
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "Muda (N)ome, (C)oment�rio, (E)ndere�o ou (V)�lido/(S)air? "
 
-#: g10/keygen.c:728
+#: g10/keygen.c:740
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1314,11 +1331,11 @@ msgstr ""
 "Voc� precisa de uma frase secreta para proteger sua chave.\n"
 "\n"
 
-#: g10/keyedit.c:421 g10/keygen.c:736
+#: g10/keyedit.c:433 g10/keygen.c:748
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "A frase secreta n�o foi repetida corretamente; tente outra vez.\n"
 
-#: g10/keygen.c:742
+#: g10/keygen.c:754
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1330,13 +1347,13 @@ msgstr ""
 "qualquer hora, usando este programa com a op��o \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:763
+#: g10/keygen.c:775
 #, fuzzy
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
-"the disks) during the prime generation; this gives the random\n"
-"number generator a better chance to gain enough entropy.\n"
+"disks) during the prime generation; this gives the random number\n"
+"generator a better chance to gain enough entropy.\n"
 msgstr ""
 "Precisamos gerar muitos bytes aleat�rios. � uma boa id�ia realizar outra\n"
 "atividade (trabalhar em outra janela, mover o mouse, usar a rede e os "
@@ -1345,33 +1362,33 @@ msgstr ""
 "aleat�rios\n"
 "uma chance melhor de conseguir entropia suficiente.\n"
 
-#: g10/keygen.c:833
+#: g10/keygen.c:845
 msgid "Key generation can only be used in interactive mode\n"
 msgstr "A gera��o de chaves s� pode ser feita em modo interativo\n"
 
-#: g10/keygen.c:841
+#: g10/keygen.c:853
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "O par de chaves DSA ter� 1024 bits.\n"
 
-#: g10/keygen.c:847
+#: g10/keygen.c:859
 msgid "Key generation cancelled.\n"
 msgstr "Gera��o de chaves cancelada.\n"
 
-#: g10/keygen.c:857
+#: g10/keygen.c:869
 #, c-format
 msgid "writing public certificate to `%s'\n"
 msgstr "escrevendo certificado p�blico para `%s'\n"
 
-#: g10/keygen.c:858
+#: g10/keygen.c:870
 #, c-format
 msgid "writing secret certificate to `%s'\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/keygen.c:935
+#: g10/keygen.c:947
 msgid "public and secret key created and signed.\n"
 msgstr "chaves p�blica e privada criadas e assinadas.\n"
 
-#: g10/keygen.c:937
+#: g10/keygen.c:949
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -1381,51 +1398,56 @@ msgstr ""
 "o comando \"--add-key\" para gerar uma chave secund�ria para esse "
 "prop�sito.\n"
 
-#: g10/keygen.c:951 g10/keygen.c:1050
+#: g10/keygen.c:963 g10/keygen.c:1062
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/keygen.c:995 g10/sig-check.c:212 g10/sign.c:52
+#: g10/keygen.c:1007 g10/sig-check.c:299 g10/sign.c:52
 #, fuzzy, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 "chave p�blica criada no futuro (viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:997 g10/sig-check.c:214 g10/sign.c:54
+#: g10/keygen.c:1009 g10/sig-check.c:301 g10/sign.c:54
 #, fuzzy, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 "chave p�blica criada no futuro (viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:1028
+#: g10/keygen.c:1040
 msgid "Really create? "
 msgstr "Realmente criar? "
 
-#: g10/encode.c:90 g10/openfile.c:86 g10/openfile.c:174 g10/tdbio.c:467
-#: g10/tdbio.c:527
+#: g10/encode.c:91 g10/openfile.c:86 g10/openfile.c:174 g10/tdbio.c:467
+#: g10/tdbio.c:528
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: imposs�vel abrir: %s\n"
 
-#: g10/encode.c:112
+#: g10/encode.c:113
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "erro criando frase secreta: %s\n"
 
-#: g10/encode.c:166 g10/encode.c:285
+#: g10/encode.c:167 g10/encode.c:290
 #, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: AVISO: arquivo vazio\n"
 
-#: g10/encode.c:235
+#: g10/encode.c:240
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "lendo de `%s'\n"
 
-#: g10/encode.c:413
+#: g10/encode.c:435 g10/sign.c:346
+#, c-format
+msgid "WARNING: `%s' is an empty file\n"
+msgstr "AVISO: `%s' � um arquivo vazio\n"
+
+#: g10/encode.c:605
 #, fuzzy, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s codificado para: %s\n"
@@ -1457,7 +1479,7 @@ msgstr "entradas demais no cache pk - desabilitado\n"
 msgid "too many entries in unk cache - disabled\n"
 msgstr "entradas demais no cache unk - desabilitado\n"
 
-#: g10/getkey.c:1531 g10/getkey.c:1587
+#: g10/getkey.c:1535 g10/getkey.c:1591
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "usando chave secund�ria %08lX ao inv�s de chave prim�ria %08lX\n"
@@ -1482,323 +1504,332 @@ msgstr "%lu chaves processadas at� agora\n"
 msgid "read error: %s\n"
 msgstr "erro de leitura: %s\n"
 
-#: g10/import.c:174
+#: g10/import.c:175
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "N�mero total processado: %lu\n"
 
-#: g10/import.c:176
+#: g10/import.c:177
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          sem IDs de usu�rios: %lu\n"
 
-#: g10/import.c:178
+#: g10/import.c:179
 #, c-format
 msgid "              imported: %lu"
 msgstr "              importados: %lu"
 
-#: g10/import.c:184
+#: g10/import.c:185
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             n�o modificados: %lu\n"
 
-#: g10/import.c:186
+#: g10/import.c:187
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          novos IDs de usu�rios: %lu\n"
 
-#: g10/import.c:188
+#: g10/import.c:189
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           novas subchaves: %lu\n"
 
-#: g10/import.c:190
+#: g10/import.c:191
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        novas assinaturas: %lu\n"
 
-#: g10/import.c:192
+#: g10/import.c:193
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   novas revoga��es de chaves: %lu\n"
 
-#: g10/import.c:194
+#: g10/import.c:195
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      chaves secretas lidas: %lu\n"
 
-#: g10/import.c:196
+#: g10/import.c:197
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  chaves secretas importadas: %lu\n"
 
-#: g10/import.c:198
+#: g10/import.c:199
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " chaves secretas n�o modificadas: %lu\n"
 
-#: g10/import.c:340 g10/import.c:532
+#: g10/import.c:342 g10/import.c:534
 #, c-format
 msgid "key %08lX: no user id\n"
 msgstr "chave %08lX: sem id de usu�rio\n"
 
-#: g10/import.c:351
+#: g10/import.c:353
 #, c-format
 msgid "key %08lX: no valid user ids\n"
 msgstr "chave %08lX: sem ids de usu�rios v�lidos\n"
 
-#: g10/import.c:353
+#: g10/import.c:355
 msgid "this may be caused by a missing self-signature\n"
 msgstr "isto pode ser causado por falta de auto-assinatura\n"
 
-#: g10/import.c:364 g10/import.c:600
+#: g10/import.c:366 g10/import.c:604
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "chave %08lX: chave p�blica n�o encontrada: %s\n"
 
-#: g10/import.c:370
+#: g10/import.c:372
 msgid "no default public keyring\n"
 msgstr "sem anel de chaves p�blico padr�o\n"
 
-#: g10/import.c:374 g10/openfile.c:115 g10/sign.c:215 g10/sign.c:498
+#: g10/import.c:376 g10/openfile.c:115 g10/sign.c:215 g10/sign.c:501
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escrevendo para `%s'\n"
 
-#: g10/import.c:378 g10/import.c:438 g10/import.c:654
+#: g10/import.c:380 g10/import.c:440 g10/import.c:658
 #, c-format
 msgid "can't lock public keyring: %s\n"
 msgstr "imposs�vel bloquear anel de chaves p�blico: %s\n"
 
-#: g10/import.c:381
+#: g10/import.c:383
 #, c-format
 msgid "can't write to keyring: %s\n"
 msgstr "imposs�vel escrever para o anel de chaves: %s\n"
 
-#: g10/import.c:385
+#: g10/import.c:387
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "chave %08lX: chave p�blica importada\n"
 
-#: g10/import.c:398
+#: g10/import.c:400
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "chave %08lX: n�o corresponde � nossa c�pia\n"
 
-#: g10/import.c:411 g10/import.c:609
+#: g10/import.c:413 g10/import.c:613
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "chave %08lX: imposs�vel localizar bloco de chaves original: %s\n"
 
-#: g10/import.c:418 g10/import.c:616
+#: g10/import.c:420 g10/import.c:620
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "chave %08lX: imposs�vel ler bloco de chaves original: %s\n"
 
-#: g10/import.c:435 g10/import.c:547 g10/import.c:651
+#: g10/import.c:437 g10/import.c:549 g10/import.c:655
 msgid "writing keyblock\n"
 msgstr "escrevendo bloco de chaves\n"
 
-#: g10/import.c:441 g10/import.c:657
+#: g10/import.c:443 g10/import.c:661
 #, c-format
 msgid "can't write keyblock: %s\n"
 msgstr "imposs�vel escrever bloco de chaves: %s\n"
 
-#: g10/import.c:446
+#: g10/import.c:448
 #, c-format
 msgid "key %08lX: 1 new user-id\n"
 msgstr "chave %8lX: 1 novo id de usu�rio\n"
 
-#: g10/import.c:449
+#: g10/import.c:451
 #, c-format
 msgid "key %08lX: %d new user-ids\n"
 msgstr "chave %08lX: %d novos ids de usu�rios\n"
 
-#: g10/import.c:452
+#: g10/import.c:454
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "chave %08lX: 1 nova assinatura\n"
 
-#: g10/import.c:455
+#: g10/import.c:457
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "chave %08lX: %d novas assinaturas\n"
 
-#: g10/import.c:458
+#: g10/import.c:460
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "chave %08lX: 1 nova subchave\n"
 
-#: g10/import.c:461
+#: g10/import.c:463
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "chave %08lX: %d novas subchaves\n"
 
-#: g10/import.c:471
+#: g10/import.c:473
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "chave %08lX: n�o modificada\n"
 
-#: g10/import.c:550
+#: g10/import.c:552
 #, c-format
 msgid "can't lock secret keyring: %s\n"
 msgstr "imposs�vel bloquear anel de chaves secreto: %s\n"
 
-#: g10/import.c:553
+#: g10/import.c:555
 #, c-format
 msgid "can't write keyring: %s\n"
 msgstr "imposs�vel escrever anel de chaves: %s\n"
 
-#. we are ready
-#: g10/import.c:556
+#: g10/import.c:559
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "chave %08lX: chave secreta importada\n"
 
 #. we can't merge secret keys
-#: g10/import.c:560
+#: g10/import.c:564
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "chave %08lX: j� no anel de chaves secreto\n"
 
-#: g10/import.c:565
+#: g10/import.c:569
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "chave %08lX: chave secreta n�o encontrada: %s\n"
 
-#: g10/import.c:594
+#: g10/import.c:598
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "chave %08lX: sem chave p�blica - imposs�vel aplicar certificado\n"
 "de revoga��o\n"
 
-#: g10/import.c:627
+#: g10/import.c:631
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "chave %08lX: certificado de revoga��o inv�lido: %s - rejeitado\n"
 
-#: g10/import.c:661
+#: g10/import.c:665
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "chave %08lX: certificado de revoga��o importado\n"
 
-#: g10/import.c:695
+#: g10/import.c:699
 #, c-format
 msgid "key %08lX: no user-id for signature\n"
 msgstr "chave %08lX: sem id de usu�rio para assinatura\n"
 
-#: g10/import.c:702 g10/import.c:727
+#: g10/import.c:706 g10/import.c:731
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "chave %08lX: algoritmo de chave p�blica n�o suportado\n"
 
-#: g10/import.c:703
+#: g10/import.c:707
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "chave %08lX: auto-assinatura inv�lida\n"
 
-#: g10/import.c:719
+#: g10/import.c:723
 #, fuzzy, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "chave %08lX.%lu: Liga��o de subchave v�lida\n"
 
-#: g10/import.c:728
+#: g10/import.c:732
 #, fuzzy, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "chave %08lX.%lu: Liga��o de subchave inv�lida: %s\n"
 
-#: g10/import.c:760
+#: g10/import.c:764
 #, c-format
 msgid "key %08lX: skipped userid '"
 msgstr "chave %08lX: id de usu�rio ignorado '"
 
-#: g10/import.c:780
+#: g10/import.c:787
 #, fuzzy, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "chave %08lX: 1 nova subchave\n"
 
-#: g10/import.c:800
+#. here we violate the rfc a bit by still allowing
+#. * to import non-exportable signature when we have the
+#. * the secret key used to create this signature - it
+#. * seems that this makes sense
+#: g10/import.c:812
 #, fuzzy, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "chave %08lX: certificado de revoga��o no local errado - ignorado\n"
 
-#: g10/import.c:809
+#: g10/import.c:821
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "chave %08lX: certificado de revoga��o no local errado - ignorado\n"
 
-#: g10/import.c:817
+#: g10/import.c:829
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "chave %08lX: certificado de revoga��o inv�lido: %s - ignorado\n"
 
-#: g10/import.c:878
+#: g10/import.c:890
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "chave %08lX: certificado de revoga��o adicionado\n"
 
-#: g10/import.c:992 g10/import.c:1047
+#: g10/import.c:1008 g10/import.c:1063
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "chave %08lX: nossa c�pia n�o tem auto-assinatura\n"
 
-#: g10/keyedit.c:88
+#: g10/keyedit.c:91
 #, c-format
 msgid "%s: user not found\n"
 msgstr "%s: usu�rio n�o encontrado\n"
 
-#: g10/keyedit.c:171
+#: g10/keyedit.c:177
+msgid "[revocation]"
+msgstr ""
+
+#: g10/keyedit.c:178
 msgid "[self-signature]"
 msgstr "[auto-assinatura]"
 
-#: g10/keyedit.c:189
+#: g10/keyedit.c:196
 msgid "1 bad signature\n"
 msgstr "1 assinatura incorreta\n"
 
-#: g10/keyedit.c:191
+#: g10/keyedit.c:198
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d assinaturas incorretas\n"
 
-#: g10/keyedit.c:193
+#: g10/keyedit.c:200
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 assinatura n�o verificada por falta de chave\n"
 
-#: g10/keyedit.c:195
+#: g10/keyedit.c:202
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%d assinaturas n�o verificadas por falta de chaves\n"
 
-#: g10/keyedit.c:197
+#: g10/keyedit.c:204
 msgid "1 signature not checked due to an error\n"
 msgstr "1 assinatura n�o checada por causa de um erro\n"
 
-#: g10/keyedit.c:199
+#: g10/keyedit.c:206
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%d assinaturas n�o verificadas por causa de erros\n"
 
-#: g10/keyedit.c:201
+#: g10/keyedit.c:208
 msgid "1 user id without valid self-signature detected\n"
 msgstr "1 id de usu�rio sem auto-assinatura v�lida detectado\n"
 
-#: g10/keyedit.c:203
+#: g10/keyedit.c:210
 #, c-format
 msgid "%d user ids without valid self-signatures detected\n"
 msgstr "%d ids de usu�rios sem auto-assinaturas v�lidas detectados\n"
 
-#: g10/keyedit.c:281
+#. Fixme: see whether there is a revocation in which
+#. * case we should allow to sign it again.
+#: g10/keyedit.c:290
 #, c-format
 msgid "Already signed by key %08lX\n"
 msgstr "J� assinado pela chave %08lX\n"
 
-#: g10/keyedit.c:289
+#: g10/keyedit.c:298
 #, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "Nada para assinar com a chave %08lX\n"
 
-#: g10/keyedit.c:298
+#: g10/keyedit.c:307
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
@@ -1806,35 +1837,35 @@ msgstr ""
 "Voc� tem certeza de que quer assinar esta chave com\n"
 "sua chave: \""
 
-#: g10/keyedit.c:307
+#: g10/keyedit.c:316
 msgid ""
 "The signature will be marked as non-exportable.\n"
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:309
+#: g10/keyedit.c:321
 msgid "Really sign? "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:335 g10/sign.c:75
+#: g10/keyedit.c:347 g10/keyedit.c:1684 g10/keyedit.c:1733 g10/sign.c:75
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "assinatura falhou: %s\n"
 
-#: g10/keyedit.c:388
+#: g10/keyedit.c:400
 msgid "This key is not protected.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:391
+#: g10/keyedit.c:403
 msgid "Key is protected.\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:408
+#: g10/keyedit.c:420
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "Imposs�vel editar esta chave: %s\n"
 
-#: g10/keyedit.c:413
+#: g10/keyedit.c:425
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -1842,7 +1873,7 @@ msgstr ""
 "Digite a nova frase para esta chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:425
+#: g10/keyedit.c:437
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -1850,382 +1881,453 @@ msgstr ""
 "Voc� n�o quer uma frase secreta - provavelmente isto � uma *m�* id�ia!\n"
 "\n"
 
-#: g10/keyedit.c:428
+#: g10/keyedit.c:440
 msgid "Do you really want to do this? "
 msgstr "Voc� realmente quer fazer isso? "
 
-#: g10/keyedit.c:487
+#: g10/keyedit.c:499
 msgid "moving a key signature to the correct place\n"
 msgstr "movendo a assinatura da chave para o local correto\n"
 
-#: g10/keyedit.c:523
+#: g10/keyedit.c:535
 msgid "quit"
 msgstr "sair"
 
-#: g10/keyedit.c:523
+#: g10/keyedit.c:535
 msgid "quit this menu"
 msgstr "sair deste menu"
 
-#: g10/keyedit.c:524
+#: g10/keyedit.c:536
 msgid "q"
 msgstr "s"
 
-#: g10/keyedit.c:525
+#: g10/keyedit.c:537
 msgid "save"
 msgstr "gravar"
 
-#: g10/keyedit.c:525
+#: g10/keyedit.c:537
 msgid "save and quit"
 msgstr "gravar e sair"
 
-#: g10/keyedit.c:526
+#: g10/keyedit.c:538
 msgid "help"
 msgstr "ajuda"
 
-#: g10/keyedit.c:526
+#: g10/keyedit.c:538
 msgid "show this help"
 msgstr "mostra esta ajuda"
 
-#: g10/keyedit.c:528
+#: g10/keyedit.c:540
 msgid "fpr"
 msgstr ""
 
-#: g10/keyedit.c:528
+#: g10/keyedit.c:540
 msgid "show fingerprint"
 msgstr "mostra impress�o digital"
 
-#: g10/keyedit.c:529
+#: g10/keyedit.c:541
 msgid "list"
 msgstr "lista"
 
-#: g10/keyedit.c:529
+#: g10/keyedit.c:541
 msgid "list key and user ids"
 msgstr "lista chave e identificadores de usu�rios"
 
-#: g10/keyedit.c:530
+#: g10/keyedit.c:542
 msgid "l"
 msgstr ""
 
-#: g10/keyedit.c:531
+#: g10/keyedit.c:543
 msgid "uid"
 msgstr ""
 
-#: g10/keyedit.c:531
+#: g10/keyedit.c:543
 msgid "select user id N"
 msgstr "seleciona id de usu�rio N"
 
-#: g10/keyedit.c:532
+#: g10/keyedit.c:544
 msgid "key"
 msgstr "chave"
 
-#: g10/keyedit.c:532
+#: g10/keyedit.c:544
 msgid "select secondary key N"
 msgstr "seleciona chave secund�ria N"
 
-#: g10/keyedit.c:533
+#: g10/keyedit.c:545
 msgid "check"
 msgstr "verifica"
 
-#: g10/keyedit.c:533
+#: g10/keyedit.c:545
 msgid "list signatures"
 msgstr "lista assinaturas"
 
-#: g10/keyedit.c:534
+#: g10/keyedit.c:546
 msgid "c"
 msgstr "v"
 
-#: g10/keyedit.c:535
+#: g10/keyedit.c:547
 msgid "sign"
 msgstr "assina"
 
-#: g10/keyedit.c:535
+#: g10/keyedit.c:547
 msgid "sign the key"
 msgstr "assina a chave"
 
-#: g10/keyedit.c:536
+#: g10/keyedit.c:548
 msgid "s"
 msgstr "a"
 
-#: g10/keyedit.c:537
+#: g10/keyedit.c:549
 #, fuzzy
 msgid "lsign"
 msgstr "assina"
 
-#: g10/keyedit.c:537
+#: g10/keyedit.c:549
 #, fuzzy
 msgid "sign the key locally"
 msgstr "assina a chave"
 
-#: g10/keyedit.c:538
+#: g10/keyedit.c:550
 msgid "debug"
 msgstr "depura"
 
-#: g10/keyedit.c:539
+#: g10/keyedit.c:551
 msgid "adduid"
 msgstr ""
 
-#: g10/keyedit.c:539
+#: g10/keyedit.c:551
 msgid "add a user id"
 msgstr "adiciona um novo id de usu�rio"
 
-#: g10/keyedit.c:540
+#: g10/keyedit.c:552
 msgid "deluid"
 msgstr ""
 
-#: g10/keyedit.c:540
+#: g10/keyedit.c:552
 msgid "delete user id"
 msgstr "deleta id de usu�rio"
 
-#: g10/keyedit.c:541
+#: g10/keyedit.c:553
 msgid "addkey"
 msgstr ""
 
-#: g10/keyedit.c:541
+#: g10/keyedit.c:553
 msgid "add a secondary key"
 msgstr "adiciona nova chave secund�ria"
 
-#: g10/keyedit.c:542
+#: g10/keyedit.c:554
 msgid "delkey"
 msgstr ""
 
-#: g10/keyedit.c:542
+#: g10/keyedit.c:554
 msgid "delete a secondary key"
 msgstr "deleta uma chave secund�ria"
 
-#: g10/keyedit.c:543
+#: g10/keyedit.c:555
 msgid "expire"
 msgstr "expira"
 
-#: g10/keyedit.c:543
+#: g10/keyedit.c:555
 msgid "change the expire date"
 msgstr "muda a data em que a chave expira"
 
-#: g10/keyedit.c:544
+#: g10/keyedit.c:556
 msgid "toggle"
 msgstr "comuta"
 
-#: g10/keyedit.c:544
+#: g10/keyedit.c:556
 msgid "toggle between secret and public key listing"
 msgstr "comuta entre listagem de chave secreta e p�blica"
 
-#: g10/keyedit.c:546
+#: g10/keyedit.c:558
 msgid "t"
 msgstr "c"
 
-#: g10/keyedit.c:547
+#: g10/keyedit.c:559
 msgid "pref"
 msgstr ""
 
-#: g10/keyedit.c:547
+#: g10/keyedit.c:559
 msgid "list preferences"
 msgstr "lista prefer�ncias"
 
-#: g10/keyedit.c:548
+#: g10/keyedit.c:560
 msgid "passwd"
 msgstr "senha"
 
-#: g10/keyedit.c:548
+#: g10/keyedit.c:560
 msgid "change the passphrase"
 msgstr "muda a frase secreta"
 
-#: g10/keyedit.c:549
+#: g10/keyedit.c:561
 msgid "trust"
 msgstr "confianca"
 
-#: g10/keyedit.c:549
+#: g10/keyedit.c:561
 msgid "change the ownertrust"
 msgstr "muda os valores de confian�a"
 
-#: g10/keyedit.c:568
+#: g10/keyedit.c:562
+#, fuzzy
+msgid "revsig"
+msgstr "assina"
+
+#: g10/keyedit.c:562
+#, fuzzy
+msgid "revoke signatures"
+msgstr "for�a assinaturas v3"
+
+#: g10/keyedit.c:563
+#, fuzzy
+msgid "revkey"
+msgstr "chave"
+
+#: g10/keyedit.c:563
+#, fuzzy
+msgid "revoke a secondary key"
+msgstr "deleta uma chave secund�ria"
+
+#: g10/keyedit.c:582
 msgid "can't do that in batchmode\n"
 msgstr "imposs�vel fazer isso em modo de processo por lotes\n"
 
 #. check that they match
 #. FIXME: check that they both match
-#: g10/keyedit.c:595
+#: g10/keyedit.c:609
 msgid "Secret key is available.\n"
 msgstr "Chave secreta dispon�vel\n"
 
-#: g10/keyedit.c:624
+#: g10/keyedit.c:638
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/keyedit.c:651
+#: g10/keyedit.c:665
 #, fuzzy
 msgid "Need the secret key to do this.\n"
 msgstr "A chave secreta � necess�ria para fazer isto.\n"
 
-#: g10/keyedit.c:673
+#: g10/keyedit.c:687
 msgid "Save changes? "
 msgstr "Salvar altera��es? "
 
-#: g10/keyedit.c:676
+#: g10/keyedit.c:690
 msgid "Quit without saving? "
 msgstr "Sair sem salvar? "
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:700
 #, c-format
 msgid "update failed: %s\n"
 msgstr "atualiza��o falhou: %s\n"
 
-#: g10/keyedit.c:693
+#: g10/keyedit.c:707
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "atualiza��o da chave secreta falhou: %s\n"
 
-#: g10/keyedit.c:700
+#: g10/keyedit.c:714
 msgid "Key not changed so no update needed.\n"
 msgstr "Chave sem mudan�as, nenhuma atualiza��o � necess�ria.\n"
 
-#: g10/keyedit.c:703 g10/keyedit.c:762
+#: g10/keyedit.c:717 g10/keyedit.c:776
 #, fuzzy, c-format
 msgid "update of trustdb failed: %s\n"
 msgstr "atualiza��o da confian�a falhou: %s\n"
 
-#: g10/keyedit.c:736
+#: g10/keyedit.c:750
 msgid "Really sign all user ids? "
 msgstr "Realmente assinar todos os ids de usu�rio? "
 
-#: g10/keyedit.c:737
+#: g10/keyedit.c:751
 msgid "Hint: Select the user ids to sign\n"
 msgstr "Sugest�o: Selecione os ids de usu�rio para assinar\n"
 
-#: g10/keyedit.c:773
+#: g10/keyedit.c:787
 msgid "You must select at least one user id.\n"
 msgstr "Voc� precisa selecionar pelo menos um id de usu�rio.\n"
 
-#: g10/keyedit.c:775
+#: g10/keyedit.c:789
 msgid "You can't delete the last user id!\n"
 msgstr "Voc� n�o pode deletar o �ltimo id de usu�rio!\n"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:792
 msgid "Really remove all selected user ids? "
 msgstr "Realmente remover todos os ids de usu�rio selecionados? "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:793
 msgid "Really remove this user id? "
 msgstr "Realmente remover este id de usu�rio? "
 
-#: g10/keyedit.c:802
+#: g10/keyedit.c:816 g10/keyedit.c:838
 msgid "You must select at least one key.\n"
 msgstr "Voc� deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:820
 msgid "Do you really want to delete the selected keys? "
 msgstr "Voc� realmente quer deletar as chaves selecionadas? "
 
-#: g10/keyedit.c:807
+#: g10/keyedit.c:821
 msgid "Do you really want to delete this key? "
 msgstr "Voc� realmente quer deletar esta chave? "
 
-#: g10/keyedit.c:854
+#: g10/keyedit.c:842
+#, fuzzy
+msgid "Do you really want to revoke the selected keys? "
+msgstr "Voc� realmente quer deletar as chaves selecionadas? "
+
+#: g10/keyedit.c:843
+#, fuzzy
+msgid "Do you really want to revoke this key? "
+msgstr "Voc� realmente quer deletar esta chave? "
+
+#: g10/keyedit.c:897
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando inv�lido (tente \"ajuda\")\n"
 
-#: g10/keyedit.c:1232
+#: g10/keyedit.c:1289
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor remova as sele��es das chaves secretas.\n"
 
-#: g10/keyedit.c:1238
+#: g10/keyedit.c:1295
 msgid "Please select at most one secondary key.\n"
 msgstr "Por favor selecione no m�ximo uma chave secund�ria.\n"
 
-#: g10/keyedit.c:1242
+#: g10/keyedit.c:1299
 msgid "Changing exiration time for a secondary key.\n"
 msgstr "Modificando data de expira��o para a chave secund�ria.\n"
 
-#: g10/keyedit.c:1244
+#: g10/keyedit.c:1301
 msgid "Changing exiration time for the primary key.\n"
 msgstr "Modificando data de expira��o para a chave prim�ria.\n"
 
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1342
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Voc� n�o pode modificar a data de expira��o de uma chave v3\n"
 
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1358
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nenhuma assinatura correspondente no anel de chaves secreto\n"
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1418
 #, c-format
 msgid "No user id with index %d\n"
 msgstr "Nenhum id de usu�rio com �ndice %d\n"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1464
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "Nenhuma chave secund�ria com �ndice %d\n"
 
-#: g10/mainproc.c:184
+#: g10/keyedit.c:1562
+#, fuzzy
+msgid "user ID: \""
+msgstr "Digite o identificador de usu�rio:"
+
+#: g10/keyedit.c:1565
+#, fuzzy, c-format
+msgid ""
+"\"\n"
+"signed with your key %08lX at %s\n"
+msgstr "Nada para assinar com a chave %08lX\n"
+
+#: g10/keyedit.c:1569
+#, fuzzy
+msgid "Create a revocation certificate for this signature? (y/N)"
+msgstr "gera um certificado de revoga��o"
+
+#: g10/keyedit.c:1649
+#, fuzzy
+msgid "Really create the revocation certificates? (y/N)"
+msgstr "gera um certificado de revoga��o"
+
+#: g10/keyedit.c:1672
+#, fuzzy
+msgid "no secret key\n"
+msgstr "Chave secreta incorreta"
+
+#: g10/mainproc.c:185
 #, fuzzy, c-format
 msgid "public key is %08lX\n"
 msgstr "Chave p�blica n�o encontrada"
 
-#: g10/mainproc.c:212
+#: g10/mainproc.c:213
 #, fuzzy
 msgid "public key encrypted data: good DEK\n"
 msgstr "dados codificados com chave p�blica: DEK bom\n"
 
 #. fixme: defer this message until we have parsed all packets of
 #. * this type - do this by building a list of keys with their stati
-#. * and store it with the conetxt.  do_proc_packets can then use
+#. * and store it with the context.  do_proc_packets can then use
 #. * this list to display some information
-#: g10/mainproc.c:219
+#: g10/mainproc.c:220
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "decodifica��o de chave p�blica falhou: %s\n"
 
-#: g10/mainproc.c:246
+#: g10/mainproc.c:249
 msgid "decryption okay\n"
 msgstr "decodifica��o correta\n"
 
-#: g10/mainproc.c:249
+#: g10/mainproc.c:253
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decodifia��o falhou: %s\n"
 
-#: g10/mainproc.c:266
+#: g10/mainproc.c:270
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: o remetente solicitou \"apenas-para-seus-olhos\"\n"
 
-#: g10/mainproc.c:268
+#: g10/mainproc.c:272
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome de arquivo original='%.*s'\n"
 
-#: g10/mainproc.c:849
+#: g10/mainproc.c:876
 msgid "signature verification suppressed\n"
 msgstr "verifia��o de assinatura suprimida\n"
 
-#: g10/mainproc.c:855
+#: g10/mainproc.c:883
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Assinatura feita %.*s usando %s ID da chave %08lX\n"
 
+#: g10/mainproc.c:895
+#, fuzzy
+msgid "encrypted message is valid\n"
+msgstr "algoritmo de \"digest\" selecionado n�o � v�lido\n"
+
+#: g10/mainproc.c:899
+msgid "WARNING: encrypted message has been manipulated!\n"
+msgstr ""
+
+#: g10/mainproc.c:904
+#, fuzzy, c-format
+msgid "Can't check MDC: %s\n"
+msgstr "Imposs�vel verificar assinatura: %s\n"
+
 #. just in case that we have no userid
-#: g10/mainproc.c:881 g10/mainproc.c:892
+#: g10/mainproc.c:925 g10/mainproc.c:936
 msgid "BAD signature from \""
 msgstr "Assinatura INCORRETA de \""
 
-#: g10/mainproc.c:882 g10/mainproc.c:893
+#: g10/mainproc.c:926 g10/mainproc.c:937
 msgid "Good signature from \""
 msgstr "Assinatura correta de\""
 
-#: g10/mainproc.c:884
+#: g10/mainproc.c:928
 #, fuzzy
 msgid "                aka \""
 msgstr "              importados: %lu"
 
-#: g10/mainproc.c:930
+#: g10/mainproc.c:974
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposs�vel verificar assinatura: %s\n"
 
-#: g10/mainproc.c:1003
+#: g10/mainproc.c:1047
 msgid "old style (PGP 2.x) signature\n"
 msgstr "assinatura antiga (PGP2.x)\n"
 
-#: g10/mainproc.c:1008
+#: g10/mainproc.c:1052
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pacote raiz inv�lido detectado em proc_tree()\n"
 
@@ -2251,7 +2353,7 @@ msgstr ""
 "Chaves RSA n�o s�o recomend�veis; por favor considere criar uma nova chave e "
 "us�-la no futuro\n"
 
-#: g10/misc.c:235
+#: g10/misc.c:236
 msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr ""
 
@@ -2265,7 +2367,7 @@ msgstr "imposs�vel manipular algoritmo de chave p�blica %d\n"
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
 
-#: g10/passphrase.c:151
+#: g10/passphrase.c:157
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2275,21 +2377,21 @@ msgstr ""
 "Voc� precisa de uma frase para desbloquear a chave secreta do\n"
 "usu�rio: \""
 
-#: g10/passphrase.c:160
+#: g10/passphrase.c:166
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "(chave %u-bit/%s, ID %08lX, criada em %s)\n"
 
-#: g10/passphrase.c:165
+#: g10/passphrase.c:171
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr ""
 
-#: g10/passphrase.c:184
+#: g10/passphrase.c:190
 msgid "Enter passphrase: "
 msgstr "Digite a frase secreta: "
 
-#: g10/passphrase.c:188
+#: g10/passphrase.c:194
 msgid "Repeat passphrase: "
 msgstr "Repita a frase secreta: "
 
@@ -2329,42 +2431,46 @@ msgstr "codifica��o antiga do DEK n�o suportada\n"
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr "NOTA: algoritmo de criptografia %d n�o encontrado nas prefer�ncias\n"
 
-#: g10/seckey-cert.c:57
+#: g10/seckey-cert.c:55
 #, c-format
 msgid "protection algorithm %d is not supported\n"
 msgstr "algoritmo de prote��o %d n�o � suportado\n"
 
-#: g10/seckey-cert.c:177
+#: g10/seckey-cert.c:171
 msgid "Invalid passphrase; please try again ...\n"
 msgstr "Frase secreta inv�lida; por favor tente novamente ...\n"
 
-#: g10/seckey-cert.c:232
+#: g10/seckey-cert.c:227
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr ""
 "AVISO: Chave fraca detectada - por favor mude a frase secreta novamente\n"
 
-#: g10/sig-check.c:195
+#: g10/sig-check.c:186
+msgid "assuming bad MDC due to an unknown critical bit\n"
+msgstr ""
+
+#: g10/sig-check.c:282
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr ""
 "esta � uma chave ElGamal gerada pelo PGP que N�O � segura para assinaturas!\n"
 
-#: g10/sig-check.c:203
+#: g10/sig-check.c:290
 #, fuzzy, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "lid %lu: id de usu�rio sem assinatura\n"
 
-#: g10/sig-check.c:204
+#: g10/sig-check.c:291
 #, fuzzy, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "lid %lu: id de usu�rio sem assinatura\n"
 
-#: g10/sig-check.c:220
+#: g10/sig-check.c:307
 #, c-format
 msgid "NOTE: signature key expired %s\n"
 msgstr "NOTA: chave de assinatura expirou %s\n"
 
-#: g10/sig-check.c:277
+#: g10/sig-check.c:364
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 
@@ -2373,7 +2479,7 @@ msgstr ""
 msgid "%s signature from: %s\n"
 msgstr "%s assinatura de: %s\n"
 
-#: g10/sign.c:210 g10/sign.c:493
+#: g10/sign.c:210 g10/sign.c:496
 #, c-format
 msgid "can't create %s: %s\n"
 msgstr "imposs�vel criar %s: %s\n"
@@ -2382,11 +2488,6 @@ msgstr "imposs�vel criar %s: %s\n"
 msgid "signing:"
 msgstr "assinando:"
 
-#: g10/sign.c:346
-#, c-format
-msgid "WARNING: `%s' is an empty file\n"
-msgstr "AVISO: `%s' � um arquivo vazio\n"
-
 #: g10/textfilter.c:122
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
@@ -2397,12 +2498,12 @@ msgstr ""
 msgid "input line longer than %d characters\n"
 msgstr ""
 
-#: g10/tdbio.c:116 g10/tdbio.c:1504
+#: g10/tdbio.c:116 g10/tdbio.c:1505
 #, fuzzy, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "banco de dados de confian�a rec %lu: lseek falhou: %s\n"
 
-#: g10/tdbio.c:122 g10/tdbio.c:1511
+#: g10/tdbio.c:122 g10/tdbio.c:1512
 #, fuzzy, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "banco de dados de confian�a rec %lu: escrita falhou (n=%d): %s\n"
@@ -2432,12 +2533,12 @@ msgstr "%s: diret�rio criado\n"
 msgid "%s: directory does not exist!\n"
 msgstr "%s: diret�rio inexistente!\n"
 
-#: g10/openfile.c:111 g10/openfile.c:181 g10/ringedit.c:1325 g10/tdbio.c:457
+#: g10/openfile.c:111 g10/openfile.c:181 g10/ringedit.c:1344 g10/tdbio.c:457
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: imposs�vel criar: %s\n"
 
-#: g10/tdbio.c:472 g10/tdbio.c:520
+#: g10/tdbio.c:472 g10/tdbio.c:521
 #, fuzzy, c-format
 msgid "%s: can't create lock\n"
 msgstr "%s: imposs�vel criar: %s\n"
@@ -2452,83 +2553,83 @@ msgstr "%s: falha ao criar registro de vers�o: %s"
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: banco de dados de confian�a inv�lido criado\n"
 
-#: g10/tdbio.c:492
+#: g10/tdbio.c:493
 #, fuzzy, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: banco de dados de confian�a criado\n"
 
-#: g10/tdbio.c:529
+#: g10/tdbio.c:530
 #, fuzzy, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "%s: banco de dados de confian�a inv�lido\n"
 
-#: g10/tdbio.c:562
+#: g10/tdbio.c:563
 #, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: falha ao criar tabela \"hash\": %s\n"
 
-#: g10/tdbio.c:570
+#: g10/tdbio.c:571
 #, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: erro atualizando registro de vers�o: %s\n"
 
-#: g10/tdbio.c:586 g10/tdbio.c:625 g10/tdbio.c:647 g10/tdbio.c:677
-#: g10/tdbio.c:702 g10/tdbio.c:1437 g10/tdbio.c:1464
+#: g10/tdbio.c:587 g10/tdbio.c:626 g10/tdbio.c:648 g10/tdbio.c:678
+#: g10/tdbio.c:703 g10/tdbio.c:1438 g10/tdbio.c:1465
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: erro lendo registro de vers�o: %s\n"
 
-#: g10/tdbio.c:599 g10/tdbio.c:658
+#: g10/tdbio.c:600 g10/tdbio.c:659
 #, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "%s: erro escrevendo registro de vers�o: %s\n"
 
-#: g10/tdbio.c:1131
+#: g10/tdbio.c:1132
 #, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "banco de dados de confian�a: lseek falhou: %s\n"
 
-#: g10/tdbio.c:1139
+#: g10/tdbio.c:1140
 #, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "banco de dados de confian�a: leitura falhou (n=%d): %s\n"
 
-#: g10/tdbio.c:1160
+#: g10/tdbio.c:1161
 #, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "%s: n�o � um banco de dados de confian�a\n"
 
-#: g10/tdbio.c:1176
+#: g10/tdbio.c:1177
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr "%s: registro de vers�o com recnum %lu\n"
 
-#: g10/tdbio.c:1181
+#: g10/tdbio.c:1182
 #, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "%s: vers�o de arquivo inv�lida %d\n"
 
-#: g10/tdbio.c:1470
+#: g10/tdbio.c:1471
 #, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "%s: erro lendo registro livre: %s\n"
 
-#: g10/tdbio.c:1478
+#: g10/tdbio.c:1479
 #, fuzzy, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "%s: erro escrevendo registro de diret�rio: %s\n"
 
-#: g10/tdbio.c:1488
+#: g10/tdbio.c:1489
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr "%s: falha ao zerar um registro: %s\n"
 
-#: g10/tdbio.c:1518
+#: g10/tdbio.c:1519
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr "%s: falha ao anexar um registro: %s\n"
 
-#: g10/tdbio.c:1629
+#: g10/tdbio.c:1630
 #, fuzzy
 msgid "The trustdb is corrupted; please run \"gpgm --fix-trustdb\".\n"
 msgstr ""
@@ -2748,7 +2849,7 @@ msgstr "Muitas prefer�ncias"
 msgid "Too many preference items"
 msgstr "Muitos itens de prefer�ncia"
 
-#: g10/trustdb.c:1549 g10/trustdb.c:3045 g10/trustdb.c:3075
+#: g10/trustdb.c:1549 g10/trustdb.c:3075 g10/trustdb.c:3105
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr "AVISO: ainda � imposs�vel manipular registros de prefer�ncias longos\n"
 
@@ -2917,23 +3018,23 @@ msgstr "chave %08lX.%lu: expirada em %s\n"
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "chave %08lX.%lu: verifica��o de confian�a falhou: %s\n"
 
-#: g10/trustdb.c:2851
+#: g10/trustdb.c:2881
 #, fuzzy, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "usu�rio `%s' n�o encontrado: %s\n"
 
-#: g10/trustdb.c:2853
+#: g10/trustdb.c:2883
 #, fuzzy, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "problemas encontrando `%s' no banco de dados de confian�a: %s\n"
 
-#: g10/trustdb.c:2856
+#: g10/trustdb.c:2886
 #, fuzzy, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr ""
 "usu�rio `%s' n�o encontrado no banco de dados de confian�a - inserindo\n"
 
-#: g10/trustdb.c:2859
+#: g10/trustdb.c:2889
 #, fuzzy, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "falha ao colocar `%s' no banco de dados de confian�a: %s\n"
@@ -2943,26 +3044,26 @@ msgstr "falha ao colocar `%s' no banco de dados de confian�a: %s\n"
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s: imposs�vel criar anel de chaves: %s\n"
 
-#: g10/ringedit.c:322 g10/ringedit.c:1330
+#: g10/ringedit.c:333 g10/ringedit.c:1349
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: anel de chaves criado\n"
 
-#: g10/ringedit.c:1507
+#: g10/ringedit.c:1526
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "AVISO: 2 arquivos com informa��es confidenciais existem.\n"
 
-#: g10/ringedit.c:1508
+#: g10/ringedit.c:1527
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s � o n�o modificado\n"
 
-#: g10/ringedit.c:1509
+#: g10/ringedit.c:1528
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s � o novo\n"
 
-#: g10/ringedit.c:1510
+#: g10/ringedit.c:1529
 msgid "Please fix this possible security flaw\n"
 msgstr "Por favor conserte este poss�vel furo de seguran�a\n"
 
@@ -3008,17 +3109,17 @@ msgstr "assumindo dados assinados em `%s'\n"
 msgid "%s: new options file created\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/encr-data.c:59
+#: g10/encr-data.c:60
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "dados codificados com\n"
 
-#: g10/encr-data.c:61
+#: g10/encr-data.c:62
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "codificado com algoritmo desconhecido %d\n"
 
-#: g10/encr-data.c:74
+#: g10/encr-data.c:77
 #, fuzzy
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -3159,6 +3260,19 @@ msgstr "Nenhuma ajuda dispon�vel"
 msgid "No help available for `%s'"
 msgstr "Nenhuma ajuda dispon�vel para `%s'"
 
+#~ msgid "Usage: gpgm [options] [files] (-h for help)"
+#~ msgstr "Uso: gpgm [op��es] [arquivos] (-h para ajuda)"
+
+#~ msgid ""
+#~ "Syntax: gpgm [options] [files]\n"
+#~ "GnuPG maintenance utility\n"
+#~ msgstr ""
+#~ "Sintaxe: gpgm [op��es] [arquivos]\n"
+#~ "Utilit�rio de manuten��o do GnuPG\n"
+
+#~ msgid "usage: gpgm [options] "
+#~ msgstr "Uso: gpgm [op��es] "
+
 #, fuzzy
 #~ msgid "chained sigrec %lu has a wrong owner\n"
 #~ msgstr "sigrec em cadeia %lu possui dono errado\n"
@@ -3248,9 +3362,6 @@ msgstr "Nenhuma ajuda dispon�vel para `%s'"
 #~ msgid "did not use primary key for insert_trust_record()\n"
 #~ msgstr "voc� usou a chave prim�ria para insert_trust_record()\n"
 
-#~ msgid "use this user-id for encryption"
-#~ msgstr "usa este identificador de usu�rio para codificar"
-
 #~ msgid "invalid clear text header: "
 #~ msgstr "cabe�alho de texto puro inv�lido: "
 
diff --git a/po/ru.po b/po/ru.po
index 7d8f98446..4bc7a90e0 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -9,7 +9,7 @@
 # QingLong <qinglong@Bolizm> (couldn't send an email to let you know)
 msgid ""
 msgstr ""
-"POT-Creation-Date: 1999-03-20 13:40+0100\n"
+"POT-Creation-Date: 1999-05-06 13:37+0200\n"
 "Content-Type: text/plain; charset=\n"
 "Date: 1998-01-26 22:08:36+0100\n"
 "From: Gregory Steuck <[email protected]>\n"
@@ -36,11 +36,11 @@ msgstr ""
 msgid "(you may have used the wrong program for this task)\n"
 msgstr ""
 
-#: util/miscutil.c:143
+#: util/miscutil.c:156
 msgid "yes"
 msgstr "��(y)"
 
-#: util/miscutil.c:144
+#: util/miscutil.c:157
 msgid "yY"
 msgstr "yY"
 
@@ -277,6 +277,11 @@ msgstr "�� ��������������"
 msgid "network error"
 msgstr "����� ������"
 
+#: util/errors.c:102
+#, fuzzy
+msgid "not encrypted"
+msgstr "����������� ������"
+
 #: util/logger.c:178
 #, fuzzy, c-format
 msgid "... this is a bug (%s:%d:%s)\n"
@@ -287,12 +292,12 @@ msgstr "��-�� ... ������ � ��������� (%s:%d:%s)\n"
 msgid "you found a bug ... (%s:%d)\n"
 msgstr "�� ����� ������ � ��������� ... (%s:%d)\n"
 
-#: cipher/random.c:403
+#: cipher/random.c:408
 #, fuzzy
 msgid "WARNING: using insecure random number generator!!\n"
 msgstr "��������: ������������ ���������� ��������� ��������� �����!\n"
 
-#: cipher/random.c:404
+#: cipher/random.c:409
 msgid ""
 "The random number generator is only a kludge to let\n"
 "it run - it is in no way a strong RNG!\n"
@@ -317,7 +322,7 @@ msgstr ""
 "������������ ��������� ������. ����������, ��������� ���-������, �����\n"
 "�� ����� ������� �������������� ��������� �����! (����� ��� %d ����)\n"
 
-#: g10/g10.c:166
+#: g10/g10.c:163
 msgid ""
 "@Commands:\n"
 " "
@@ -325,136 +330,136 @@ msgstr ""
 "@�������:\n"
 " "
 
-#: g10/g10.c:169
+#: g10/g10.c:165
 #, fuzzy
 msgid "|[file]|make a signature"
 msgstr "|[����]|������� �������"
 
-#: g10/g10.c:170
+#: g10/g10.c:166
 #, fuzzy
 msgid "|[file]|make a clear text signature"
 msgstr "|[����]|������� ��������� �������"
 
-#: g10/g10.c:171
+#: g10/g10.c:167
 msgid "make a detached signature"
 msgstr "������� ��������� �������"
 
-#: g10/g10.c:172
+#: g10/g10.c:168
 msgid "encrypt data"
 msgstr "����������� ������"
 
-#: g10/g10.c:173
+#: g10/g10.c:169
 msgid "encryption only with symmetric cipher"
 msgstr "����������� ������������ ����������"
 
-#: g10/g10.c:174
+#: g10/g10.c:170
 msgid "store only"
 msgstr "������ ���������"
 
-#: g10/g10.c:175
+#: g10/g10.c:171
 msgid "decrypt data (default)"
 msgstr "������������ ������ (�� ���������)"
 
-#: g10/g10.c:176
+#: g10/g10.c:172
 msgid "verify a signature"
 msgstr "��������� �������"
 
-#: g10/g10.c:178
+#: g10/g10.c:173
 msgid "list keys"
 msgstr "������ ������"
 
-#: g10/g10.c:179
+#: g10/g10.c:175
 msgid "list keys and signatures"
 msgstr "������ ������ � ��������"
 
-#: g10/g10.c:180
+#: g10/g10.c:176
 msgid "check key signatures"
 msgstr "��������� ������� �� �����"
 
-#: g10/g10.c:181
+#: g10/g10.c:177
 msgid "list keys and fingerprints"
 msgstr "������ ������ � �� \"����������� �������\""
 
-#: g10/g10.c:182
+#: g10/g10.c:178
 msgid "list secret keys"
 msgstr "������ ��������� ������"
 
-#: g10/g10.c:184
+#: g10/g10.c:179
 msgid "generate a new key pair"
 msgstr "������������� ����� ���� ������ (�������� � ���������)"
 
-#: g10/g10.c:186
+#: g10/g10.c:180
 msgid "remove key from the public keyring"
 msgstr "������� ���� �� ������"
 
-#: g10/g10.c:188
+#: g10/g10.c:181
 msgid "sign or edit a key"
 msgstr "��������� ��� ������������� ����"
 
-#: g10/g10.c:189
+#: g10/g10.c:182
 msgid "generate a revocation certificate"
 msgstr "������������� ���������� ����������"
 
-#: g10/g10.c:191
+#: g10/g10.c:183
 msgid "export keys"
 msgstr "�������������� �����"
 
-#: g10/g10.c:192
+#: g10/g10.c:184
 msgid "export keys to a key server"
 msgstr ""
 
-#: g10/g10.c:193
+#: g10/g10.c:185
 msgid "import keys from a key server"
 msgstr ""
 
-#: g10/g10.c:196
+#: g10/g10.c:188
 msgid "import/merge keys"
 msgstr "�������������/�������� �����"
 
-#: g10/g10.c:198
+#: g10/g10.c:190
 msgid "list only the sequence of packets"
 msgstr "���������� ������ ������������������ �������"
 
-#: g10/g10.c:201
+#: g10/g10.c:192
 #, fuzzy
 msgid "export the ownertrust values"
 msgstr "�������������� ��������� �������\n"
 
-#: g10/g10.c:203
+#: g10/g10.c:194
 #, fuzzy
 msgid "import ownertrust values"
 msgstr "������������� ��������� �������\n"
 
-#: g10/g10.c:205
+#: g10/g10.c:196
 #, fuzzy
 msgid "|[NAMES]|update the trust database"
 msgstr "|[�����]|��������� ���� ������ �������"
 
-#: g10/g10.c:207
+#: g10/g10.c:198
 msgid "|[NAMES]|check the trust database"
 msgstr "|[�����]|��������� ���� ������ �������"
 
-#: g10/g10.c:208
+#: g10/g10.c:199
 msgid "fix a corrupted trust database"
 msgstr "��������� ����������� ���� ������ �������"
 
-#: g10/g10.c:209
+#: g10/g10.c:200
 msgid "De-Armor a file or stdin"
 msgstr "������������ stdin ��� ���� �� ASCII-�������������"
 
-#: g10/g10.c:210
+#: g10/g10.c:201
 msgid "En-Armor a file or stdin"
 msgstr "������������ stdin ��� ���� � ASCII-�������������"
 
-#: g10/g10.c:211
+#: g10/g10.c:202
 msgid "|algo [files]|print message digests"
 msgstr "|algo [files]|���������� �������� ���������"
 
-#: g10/g10.c:212
+#: g10/g10.c:203
 msgid "print all message digests"
 msgstr "���������� ��� ��������� ���������"
 
-#: g10/g10.c:219
+#: g10/g10.c:209
 msgid ""
 "@\n"
 "Options:\n"
@@ -464,151 +469,156 @@ msgstr ""
 "���������:\n"
 " "
 
-#: g10/g10.c:221
+#: g10/g10.c:211
 msgid "create ascii armored output"
 msgstr "����� � ASCII-�������������"
 
-#: g10/g10.c:222
+#: g10/g10.c:212
 #, fuzzy
 msgid "|NAME|encrypt for NAME"
 msgstr "|���|������������ ������������ ���������� ���"
 
-#: g10/g10.c:227
+#: g10/g10.c:216
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "������������ ��������� ������������� ������������ ��� ������� ��� �����������"
 
-#: g10/g10.c:228
+#: g10/g10.c:217
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|���������� ������� ������ (0 - �� �������)"
 
-#: g10/g10.c:230
+#: g10/g10.c:219
 msgid "use canonical text mode"
 msgstr "������������ ������������ ��������� �����"
 
-#: g10/g10.c:232
+#: g10/g10.c:220
 msgid "use as output file"
 msgstr "������������ � �������� ��������� �����"
 
-#: g10/g10.c:233
+#: g10/g10.c:221
 msgid "verbose"
 msgstr "������������"
 
-#: g10/g10.c:234
+#: g10/g10.c:222
 msgid "be somewhat more quiet"
 msgstr ""
 
-#: g10/g10.c:235
+#: g10/g10.c:223
 #, fuzzy
 msgid "force v3 signatures"
 msgstr "��������� ������� �� �����"
 
-#: g10/g10.c:236
+#: g10/g10.c:224
+#, fuzzy
+msgid "always use a MDC for encryption"
+msgstr "������������ ��������� ������������� ������������ ��� ����������"
+
+#: g10/g10.c:225
 msgid "do not make any changes"
 msgstr "Keine wirklichen �nderungen durchf�hren"
 
-#: g10/g10.c:237
+#: g10/g10.c:226
 msgid "batch mode: never ask"
 msgstr "�������� �����: ������ �� ����������"
 
-#: g10/g10.c:238
+#: g10/g10.c:227
 msgid "assume yes on most questions"
 msgstr "�������� \"��\" �� ����������� ��������"
 
-#: g10/g10.c:239
+#: g10/g10.c:228
 msgid "assume no on most questions"
 msgstr "�������� \"���\" �� ����������� ��������"
 
-#: g10/g10.c:240
+#: g10/g10.c:229
 msgid "add this keyring to the list of keyrings"
 msgstr "�������� ��� ������ � ������ ������ ������"
 
-#: g10/g10.c:241
+#: g10/g10.c:230
 msgid "add this secret keyring to the list"
 msgstr "�������� ��� ��������� ������ � ������ ������ ������"
 
-#: g10/g10.c:242
+#: g10/g10.c:231
 msgid "|NAME|use NAME as default secret key"
 msgstr "|���|������������ ��� � �������� ���������� ����� �� ���������"
 
-#: g10/g10.c:243
+#: g10/g10.c:232
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr ""
 
-#: g10/g10.c:244
+#: g10/g10.c:233
 #, fuzzy
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|���|������������ ������������ ���������� ���"
 
-#: g10/g10.c:245
+#: g10/g10.c:234
 msgid "read options from file"
 msgstr "������ ��������� �� �����"
 
-#: g10/g10.c:247
+#: g10/g10.c:236
 msgid "set debugging flags"
 msgstr "���������� ���������� �����"
 
-#: g10/g10.c:248
+#: g10/g10.c:237
 msgid "enable full debugging"
 msgstr "��������� ��� �������"
 
-#: g10/g10.c:249
+#: g10/g10.c:238
 msgid "|FD|write status info to this FD"
 msgstr "|FD| ���������� ���������� � ��������� � ���������� (FD)"
 
-#: g10/g10.c:250
+#: g10/g10.c:239
 msgid "do not write comment packets"
 msgstr "�� ������ ������ � �������������"
 
-#: g10/g10.c:251
+#: g10/g10.c:240
 msgid "(default is 1)"
 msgstr "(�� ��������� 1)"
 
-#: g10/g10.c:252
+#: g10/g10.c:241
 msgid "(default is 3)"
 msgstr "(�� ��������� 3)"
 
-#: g10/g10.c:254
+#: g10/g10.c:243
 #, fuzzy
 msgid "|FILE|load extension module FILE"
 msgstr "|����|��������� ���� � ������������ ��������"
 
-#: g10/g10.c:255
+#: g10/g10.c:244
 msgid "emulate the mode described in RFC1991"
 msgstr "����������� ����� ��������� � RFC1991"
 
-#: g10/g10.c:256
+#: g10/g10.c:245
 #, fuzzy
 msgid "|N|use passphrase mode N"
 msgstr "|N|������������ �������� ����� ������ N\n"
 
-#: g10/g10.c:258
+#: g10/g10.c:247
 #, fuzzy
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|���|������������ ���-�������� ��� ��� �������� ����"
 
-#: g10/g10.c:260
+#: g10/g10.c:249
 #, fuzzy
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|���|������������ ������������ ���������� ��� ��� �������� ����"
 
-#: g10/g10.c:262
+#: g10/g10.c:250
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|���|������������ ������������ ���������� ���"
 
-#: g10/g10.c:263
+#: g10/g10.c:251
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|���|������������ ���-�������� ���"
 
-#: g10/g10.c:264
+#: g10/g10.c:252
 msgid "|N|use compress algorithm N"
 msgstr "|N|������������ �������� ������ N"
 
-#: g10/g10.c:265
+#: g10/g10.c:253
 msgid "throw keyid field of encrypted packets"
 msgstr "����������� ���� keyid � ������������� �������"
 
-#: g10/g10.c:273
+#: g10/g10.c:255
 #, fuzzy
 msgid ""
 "@\n"
@@ -629,30 +639,17 @@ msgstr ""
 " --list-keys [names]        �������� ������ ������\n"
 " --fingerprint [names]      �������� \"��������� �������\" ������\n"
 
-#: g10/g10.c:353
+#: g10/g10.c:323
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "����������, ����������� ��������� �� ������� �� ������ "
 "<[email protected]>.\n"
 
-#: g10/g10.c:358
-msgid "Usage: gpgm [options] [files] (-h for help)"
-msgstr "�������������: gpgm [���������] [�����] (-h ��� ������)"
-
-#: g10/g10.c:360
+#: g10/g10.c:327
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "�������������: gpg [���������] [�����] (-h ��� ������)"
 
-#: g10/g10.c:365
-#, fuzzy
-msgid ""
-"Syntax: gpgm [options] [files]\n"
-"GnuPG maintenance utility\n"
-msgstr ""
-"���������: gpgm [���������] [�����]\n"
-"��������� ������������� GNUPG\n"
-
-#: g10/g10.c:368
+#: g10/g10.c:330
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -662,7 +659,7 @@ msgstr ""
 "�����������, ��������� �������, ������� ��� ��������������\n"
 "����� ������ ������� �� ������� ������\n"
 
-#: g10/g10.c:374
+#: g10/g10.c:335
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -670,228 +667,224 @@ msgstr ""
 "\n"
 "�������������� ���������:\n"
 
-#: g10/g10.c:449
-msgid "usage: gpgm [options] "
-msgstr "�������������: gpgm [���������] "
-
-#: g10/g10.c:451
+#: g10/g10.c:409
 msgid "usage: gpg [options] "
 msgstr "�������������: gpg [���������] "
 
-#: g10/g10.c:492
+#: g10/g10.c:449
 msgid "conflicting commands\n"
 msgstr "Widerspr�chliche Kommandos\n"
 
-#: g10/g10.c:631
+#: g10/g10.c:576
 #, fuzzy, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "���������: ���� ���������� �� ��������� `%s' �����������\n"
 
-#: g10/g10.c:635
+#: g10/g10.c:580
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "���� ���������� `%s': %s\n"
 
-#: g10/g10.c:642
+#: g10/g10.c:587
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "�������� ��������� �� `%s'\n"
 
-#: g10/g10.c:797
+#: g10/g10.c:731
 #, fuzzy, c-format
 msgid "%s is not a valid character set\n"
 msgstr "������������ ������ � �����������.\n"
 
-#: g10/g10.c:838 g10/g10.c:850
+#: g10/g10.c:774 g10/g10.c:786
 msgid "selected cipher algorithm is invalid\n"
 msgstr "������ ������������ �������� ����������\n"
 
-#: g10/g10.c:844 g10/g10.c:856
+#: g10/g10.c:780 g10/g10.c:792
 msgid "selected digest algorithm is invalid\n"
 msgstr "������ ������������ ��������-��������\n"
 
-#: g10/g10.c:859
+#: g10/g10.c:795
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "�������� �������� ����� ����� �������� �� %d �� %d\n"
 
-#: g10/g10.c:861
+#: g10/g10.c:797
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ������ ���� ������ 0\n"
 
-#: g10/g10.c:863
+#: g10/g10.c:799
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ������ ���� ������ 1\n"
 
-#: g10/g10.c:865
+#: g10/g10.c:801
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr ""
 
-#: g10/g10.c:868
+#: g10/g10.c:804
 #, fuzzy
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "���������: ������� S2K ����� (0) ����� �� �������������\n"
 
-#: g10/g10.c:872
+#: g10/g10.c:808
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "������������ ����� S2K: ������ ���� 0, 1 ��� 3\n"
 
-#: g10/g10.c:949
+#: g10/g10.c:885
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "������ ������������� ���� ������ �������: %s\n"
 
-#: g10/g10.c:955
+#: g10/g10.c:891
 msgid "--store [filename]"
 msgstr "--store [��� �����]"
 
-#: g10/g10.c:963
+#: g10/g10.c:898
 msgid "--symmetric [filename]"
 msgstr "--symmetric [��� �����]"
 
-#: g10/g10.c:971
+#: g10/g10.c:906
 msgid "--encrypt [filename]"
 msgstr "--encrypt [��� �����]"
 
-#: g10/g10.c:984
+#: g10/g10.c:919
 msgid "--sign [filename]"
 msgstr "--sign [��� �����]"
 
-#: g10/g10.c:997
+#: g10/g10.c:932
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [��� �����]"
 
-#: g10/g10.c:1011
+#: g10/g10.c:946
 msgid "--clearsign [filename]"
 msgstr "--clearsign [��� �����]"
 
-#: g10/g10.c:1023
+#: g10/g10.c:958
 msgid "--decrypt [filename]"
 msgstr "--decrypt [��� �����]"
 
-#: g10/g10.c:1032
+#: g10/g10.c:967
 #, fuzzy
 msgid "--edit-key username [commands]"
 msgstr "--edit-key ���-������������"
 
-#: g10/g10.c:1048
+#: g10/g10.c:981
 msgid "--delete-secret-key username"
 msgstr "--delete-secret-key ���-������������"
 
-#: g10/g10.c:1051
+#: g10/g10.c:984
 msgid "--delete-key username"
 msgstr "--delete-key ���-������������"
 
-#: g10/encode.c:229 g10/g10.c:1074 g10/sign.c:311
+#: g10/encode.c:234 g10/g10.c:1007 g10/sign.c:311
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "���������� ������� ���� `%s': %s\n"
 
-#: g10/g10.c:1085
+#: g10/g10.c:1018
 msgid "-k[v][v][v][c] [userid] [keyring]"
 msgstr "-k[v][v][v][c] [������������� ������������] [������ ������]"
 
-#: g10/g10.c:1149
+#: g10/g10.c:1077
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "������ �������������: %s\n"
 
-#: g10/g10.c:1157
+#: g10/g10.c:1085
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "������ �����������: %s\n"
 
-#: g10/g10.c:1223
+#: g10/g10.c:1151
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "������������ ���-�������� `%s'\n"
 
-#: g10/g10.c:1302
+#: g10/g10.c:1226
 msgid "[filename]"
 msgstr "[��� �����]"
 
-#: g10/g10.c:1306
+#: g10/g10.c:1230
 msgid "Go ahead and type your message ...\n"
 msgstr ""
 
-#: g10/decrypt.c:59 g10/g10.c:1309 g10/verify.c:66
+#: g10/decrypt.c:59 g10/g10.c:1233 g10/verify.c:66
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "���������� ������� ���� `%s'\n"
 
-#: g10/armor.c:297
+#: g10/armor.c:296
 #, fuzzy, c-format
 msgid "armor: %s\n"
 msgstr "���������: %s\n"
 
-#: g10/armor.c:320
+#: g10/armor.c:319
 msgid "invalid armor header: "
 msgstr ""
 
-#: g10/armor.c:327
+#: g10/armor.c:326
 msgid "armor header: "
 msgstr ""
 
-#: g10/armor.c:338
+#: g10/armor.c:337
 #, fuzzy
 msgid "invalid clearsig header\n"
 msgstr "������������ ������ ��������� �������\n"
 
-#: g10/armor.c:390
+#: g10/armor.c:389
 #, fuzzy
 msgid "nested clear text signatures\n"
 msgstr "|[����]|������� ��������� �������"
 
-#: g10/armor.c:499
+#: g10/armor.c:498
 msgid "invalid dash escaped line: "
 msgstr "������������ ������ ������������ � �������: "
 
-#: g10/armor.c:511
+#: g10/armor.c:510
 #, fuzzy
 msgid "unexpected armor:"
 msgstr "����������� ������"
 
-#: g10/armor.c:628
+#: g10/armor.c:627
 #, fuzzy, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "������������ ��� ��������� radix64 ������ %02x ��������\n"
 
-#: g10/armor.c:671
+#: g10/armor.c:670
 msgid "premature eof (no CRC)\n"
 msgstr "����������� ����� ����� (��� CRC)\n"
 
-#: g10/armor.c:705
+#: g10/armor.c:704
 msgid "premature eof (in CRC)\n"
 msgstr "����������� ����� ����� (� CRC)\n"
 
-#: g10/armor.c:709
+#: g10/armor.c:708
 msgid "malformed CRC\n"
 msgstr "������������ ����� CRC\n"
 
-#: g10/armor.c:713
+#: g10/armor.c:712
 #, c-format
 msgid "CRC error; %06lx - %06lx\n"
 msgstr "������ CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:730
+#: g10/armor.c:729
 msgid "premature eof (in Trailer)\n"
 msgstr "����������� ����� ����� (� ������)\n"
 
-#: g10/armor.c:734
+#: g10/armor.c:733
 msgid "error in trailer line\n"
 msgstr "������ � ����������� ������\n"
 
-#: g10/armor.c:998
+#: g10/armor.c:997
 #, fuzzy
 msgid "no valid OpenPGP data found.\n"
 msgstr "�� ������� ���������� RFC1991 ��� OpenPGP ������.\n"
 
-#: g10/armor.c:1002
+#: g10/armor.c:1001
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr ""
 
-#: g10/armor.c:1006
+#: g10/armor.c:1005
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -988,41 +981,46 @@ msgstr "�������� ���������� ������� �� ��������.\n"
 msgid "key %08lX: key has been revoked!\n"
 msgstr "build_sigrecs: ���� ist widerrufen\n"
 
-#: g10/pkclist.c:287 g10/pkclist.c:391
+#: g10/pkclist.c:287 g10/pkclist.c:297 g10/pkclist.c:403
 msgid "Use this key anyway? "
 msgstr "��� ����� ������������ ���� ����?"
 
-#: g10/pkclist.c:311
+#: g10/pkclist.c:291
+#, fuzzy, c-format
+msgid "key %08lX: subkey has been revoked!\n"
+msgstr "build_sigrecs: ���� ist widerrufen\n"
+
+#: g10/pkclist.c:321
 #, fuzzy, c-format
 msgid "%08lX: key has expired\n"
 msgstr "���������: ���� �������� ����� ��� �����!\n"
 
-#: g10/pkclist.c:317
+#: g10/pkclist.c:327
 #, c-format
 msgid "%08lX: no info to calculate a trust probability\n"
 msgstr ""
 
-#: g10/pkclist.c:331
+#: g10/pkclist.c:341
 #, fuzzy, c-format
 msgid "%08lX: We do NOT trust this key\n"
 msgstr "��������: �� �� �������� ����� �����!\n"
 
-#: g10/pkclist.c:337
+#: g10/pkclist.c:347
 #, c-format
 msgid ""
 "%08lX: It is not sure that this key really belongs to the owner\n"
 "but it is accepted anyway\n"
 msgstr ""
 
-#: g10/pkclist.c:343
+#: g10/pkclist.c:353
 msgid "This key probably belongs to the owner\n"
 msgstr ""
 
-#: g10/pkclist.c:348
+#: g10/pkclist.c:358
 msgid "This key belongs to us\n"
 msgstr ""
 
-#: g10/pkclist.c:386
+#: g10/pkclist.c:398
 msgid ""
 "It is NOT certain that the key belongs to its owner.\n"
 "If you *really* know what you are doing, you may answer\n"
@@ -1033,55 +1031,60 @@ msgstr ""
 "��� ������ ��� ����������. ��������� \"��\" �� ��������� ������,\n"
 "������ ���� �� *�������������* ��������� ��� �������.\n"
 
-#: g10/pkclist.c:399
+#: g10/pkclist.c:411
 msgid "WARNING: Using untrusted key!\n"
 msgstr "��������: ������������ ���� � �������� ��� �������!\n"
 
-#: g10/pkclist.c:435
+#: g10/pkclist.c:447
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "��������: �������� ����� ��� ������� ���!\n"
 
-#: g10/pkclist.c:436
+#: g10/pkclist.c:448
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "          ��� ����� ��������, ��� ������� ����������.\n"
 
-#: g10/pkclist.c:457
+#: g10/pkclist.c:452
+#, fuzzy
+msgid "WARNING: This subkey has been revoked by its owner!\n"
+msgstr "��������: �������� ����� ��� ������� ���!\n"
+
+#: g10/pkclist.c:473
 msgid "Note: This key has expired!\n"
 msgstr "���������: ���� �������� ����� ��� �����!\n"
 
-#: g10/pkclist.c:464
+#: g10/pkclist.c:480
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "��������: ���� ���� �� ������� ���������� ��������!\n"
 
-#: g10/pkclist.c:466
+#: g10/pkclist.c:482
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         ��� ������� �������� �� ��, ��� ���� ����������� ��� ���������.\n"
 
-#: g10/pkclist.c:482
+#: g10/pkclist.c:498
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "��������: �� �� �������� ����� �����!\n"
 
-#: g10/pkclist.c:483
+#: g10/pkclist.c:499
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         ������� �������� -- ��������.\n"
 
-#: g10/pkclist.c:490
+#: g10/pkclist.c:506
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr "��������: ���� ���� �� ������� ���������� ����������� ���������!\n"
 
-#: g10/pkclist.c:493
+#: g10/pkclist.c:509
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "          ��� �����������, ��� ������� ����������� ���������.\n"
 
-#: g10/pkclist.c:546 g10/pkclist.c:559 g10/pkclist.c:622 g10/pkclist.c:650
+#: g10/pkclist.c:562 g10/pkclist.c:575 g10/pkclist.c:638 g10/pkclist.c:666
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ��������: %s\n"
 
-#: g10/pkclist.c:568
+#: g10/pkclist.c:584
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1090,20 +1093,20 @@ msgstr ""
 "\"-r\").\n"
 "\n"
 
-#: g10/pkclist.c:573
+#: g10/pkclist.c:589
 msgid "Enter the user ID: "
 msgstr "������� ������������� ������������: "
 
-#: g10/pkclist.c:584
+#: g10/pkclist.c:600
 msgid "No such user ID.\n"
 msgstr "��� ������ �������������� ������������.\n"
 
-#: g10/pkclist.c:630
+#: g10/pkclist.c:646
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: ������ ��� �������� �����: %s\n"
 
-#: g10/pkclist.c:656
+#: g10/pkclist.c:672
 msgid "no valid addressees\n"
 msgstr "��� ���������� �������\n"
 
@@ -1182,7 +1185,20 @@ msgstr "���������� ������ DSA ������ - �� 512 �� 1024 ���\n"
 msgid "keysize too small; 768 is smallest value allowed.\n"
 msgstr "������� ��������� ����� �����, ���������� �������� - 768.\n"
 
-#: g10/keygen.c:459
+#. It is ridiculous and an annoyance to use larger key sizes!
+#. * GnuPG can handle much larger sizes; but it takes an eternity
+#. * to create such a key (but less than the time the Sirius
+#. * Computer Corporation needs to process one of the usual
+#. * complaints) and {de,en}cryption although needs some time.
+#. * So, before you complain about this limitation, I suggest that
+#. * you start a discussion with Marvin about this theme and then
+#. * do whatever you want.
+#: g10/keygen.c:466
+#, fuzzy, c-format
+msgid "keysize too large; %d is largest value allowed.\n"
+msgstr "������� ��������� ����� �����, ���������� �������� - 768.\n"
+
+#: g10/keygen.c:471
 #, fuzzy
 msgid ""
 "Keysizes larger than 2048 are not suggested because\n"
@@ -1191,11 +1207,11 @@ msgstr ""
 "����� ������ ������ 2048 �� �������������, ������ ��� ������������������ "
 "����� ����� �������!\n"
 
-#: g10/keygen.c:462
+#: g10/keygen.c:474
 msgid "Are you sure that you want this keysize? "
 msgstr "�� ������������� ������ ���� ����� �����? "
 
-#: g10/keygen.c:463
+#: g10/keygen.c:475
 msgid ""
 "Okay, but keep in mind that your monitor and keyboard radiation is also very "
 "vulnerable to attacks!\n"
@@ -1203,21 +1219,21 @@ msgstr ""
 "��, ������ �� ���������, ��� ��������� ����� ���������� � �������� ����\n"
 "������ ��� �������� ��� ����.\n"
 
-#: g10/keygen.c:471
+#: g10/keygen.c:483
 msgid "Do you really need such a large keysize? "
 msgstr "��� ������������� ����� ����� ������� ����? "
 
-#: g10/keygen.c:477
+#: g10/keygen.c:489
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "����������� ���� ����� ����� %u ���\n"
 
-#: g10/keygen.c:480 g10/keygen.c:484
+#: g10/keygen.c:492 g10/keygen.c:496
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "��������� �� %u ���\n"
 
-#: g10/keygen.c:497
+#: g10/keygen.c:509
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -1233,29 +1249,29 @@ msgstr ""
 "      <n>m = ���� �������� ����� n �������\n"
 "      <n>y = ���� �������� ����� n ���\n"
 
-#: g10/keygen.c:512
+#: g10/keygen.c:524
 msgid "Key is valid for? (0) "
 msgstr "���� ������������ � �������? (0) "
 
-#: g10/keygen.c:523
+#: g10/keygen.c:535
 msgid "invalid value\n"
 msgstr "������������ ��������.\n"
 
-#: g10/keygen.c:528
+#: g10/keygen.c:540
 msgid "Key does not expire at all\n"
 msgstr "���������� ����.\n"
 
 #. print the date when the key expires
-#: g10/keygen.c:534
+#: g10/keygen.c:546
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "���� ��������� �� %s\n"
 
-#: g10/keygen.c:540
+#: g10/keygen.c:552
 msgid "Is this correct (y/n)? "
 msgstr "��� �����? (y/n) "
 
-#: g10/keygen.c:583
+#: g10/keygen.c:595
 msgid ""
 "\n"
 "You need a User-ID to identify your key; the software constructs the user "
@@ -1271,44 +1287,44 @@ msgstr ""
 "    \"Vasya Pupkin (KRUTOI) <[email protected]>\"\n"
 "\n"
 
-#: g10/keygen.c:594
+#: g10/keygen.c:606
 msgid "Real name: "
 msgstr "���� ��� (\"��� �������\"): "
 
-#: g10/keygen.c:598
+#: g10/keygen.c:610
 msgid "Invalid character in name\n"
 msgstr "������������ ������ � �����\n"
 
-#: g10/keygen.c:600
+#: g10/keygen.c:612
 msgid "Name may not start with a digit\n"
 msgstr "������ ��� �� ����� ���������� � �����.\n"
 
-#: g10/keygen.c:602
+#: g10/keygen.c:614
 msgid "Name must be at least 5 characters long\n"
 msgstr "������ ��� ������ �������� �� ����� ��� �� 5�� ��������.\n"
 
-#: g10/keygen.c:610
+#: g10/keygen.c:622
 msgid "Email address: "
 msgstr "E-Mail: "
 
-#: g10/keygen.c:621
+#: g10/keygen.c:633
 msgid "Not a valid email address\n"
 msgstr "������������ E-Mail\n"
 
-#: g10/keygen.c:629
+#: g10/keygen.c:641
 msgid "Comment: "
 msgstr "�����������: "
 
-#: g10/keygen.c:635
+#: g10/keygen.c:647
 msgid "Invalid character in comment\n"
 msgstr "������������ ������ � �����������.\n"
 
-#: g10/keygen.c:657
+#: g10/keygen.c:669
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr ""
 
-#: g10/keygen.c:663
+#: g10/keygen.c:675
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -1319,16 +1335,16 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:666
+#: g10/keygen.c:678
 msgid "NnCcEeOoQq"
 msgstr ""
 
-#: g10/keygen.c:676
+#: g10/keygen.c:688
 #, fuzzy
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "��������: N=���, C=�����������, E=E-Mail, O=Okay/Q=�����? "
 
-#: g10/keygen.c:728
+#: g10/keygen.c:740
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -1336,11 +1352,11 @@ msgstr ""
 "��� ������ ������ ����� ����� �������� �����.\n"
 "\n"
 
-#: g10/keyedit.c:421 g10/keygen.c:736
+#: g10/keyedit.c:433 g10/keygen.c:748
 msgid "passphrase not correctly repeated; try again.\n"
 msgstr "�������� ����� �� ���� ��������������, ���������� �����.\n"
 
-#: g10/keygen.c:742
+#: g10/keygen.c:754
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -1352,47 +1368,47 @@ msgstr ""
 "�����, �������� ��� ��������� � ���������� \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:763
+#: g10/keygen.c:775
 #, fuzzy
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
-"the disks) during the prime generation; this gives the random\n"
-"number generator a better chance to gain enough entropy.\n"
+"disks) during the prime generation; this gives the random number\n"
+"generator a better chance to gain enough entropy.\n"
 msgstr ""
 "��� ����� ������������� ����� ��������� ������. ������ ����� ������ ���� ��\n"
 "���-�� �������� �� ������ (���������� � ������ ����, ��������� ����,\n"
 "��������� ������� ��� �������� ����������). ��� ���� ���������� ���������\n"
 "����� ����������� ������� ���������� ��������.\n"
 
-#: g10/keygen.c:833
+#: g10/keygen.c:845
 msgid "Key generation can only be used in interactive mode\n"
 msgstr "��������� ����� ����� ���� ��������� ������ � ������������� ������.\n"
 
-#: g10/keygen.c:841
+#: g10/keygen.c:853
 msgid "DSA keypair will have 1024 bits.\n"
 msgstr "�������� ���� DSA ����� ����� ����� 1024 ����.\n"
 
-#: g10/keygen.c:847
+#: g10/keygen.c:859
 #, fuzzy
 msgid "Key generation cancelled.\n"
 msgstr "��������� ����� ��������: %s\n"
 
-#: g10/keygen.c:857
+#: g10/keygen.c:869
 #, c-format
 msgid "writing public certificate to `%s'\n"
 msgstr "�������� ���������� ������������ � `%s'\n"
 
-#: g10/keygen.c:858
+#: g10/keygen.c:870
 #, c-format
 msgid "writing secret certificate to `%s'\n"
 msgstr "��������� ���������� ������������ � `%s'\n"
 
-#: g10/keygen.c:935
+#: g10/keygen.c:947
 msgid "public and secret key created and signed.\n"
 msgstr "�������� � ��������� ����� ������� � ���������.\n"
 
-#: g10/keygen.c:937
+#: g10/keygen.c:949
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -1403,12 +1419,12 @@ msgstr ""
 "���������������\n"
 "����� ��� ����������.\n"
 
-#: g10/keygen.c:951 g10/keygen.c:1050
+#: g10/keygen.c:963 g10/keygen.c:1062
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "��������� ����� �� �������: %s\n"
 
-#: g10/keygen.c:995 g10/sig-check.c:212 g10/sign.c:52
+#: g10/keygen.c:1007 g10/sig-check.c:299 g10/sign.c:52
 #, fuzzy, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1416,7 +1432,7 @@ msgstr ""
 "�������� ���� ������������ � ������� (����������� ������� ��� ����������� "
 "����������� ����)\n"
 
-#: g10/keygen.c:997 g10/sig-check.c:214 g10/sign.c:54
+#: g10/keygen.c:1009 g10/sig-check.c:301 g10/sign.c:54
 #, fuzzy, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1424,33 +1440,38 @@ msgstr ""
 "�������� ���� ������������ � ������� (����������� ������� ��� ����������� "
 "����������� ����)\n"
 
-#: g10/keygen.c:1028
+#: g10/keygen.c:1040
 #, fuzzy
 msgid "Really create? "
 msgstr "������������� �������? "
 
-#: g10/encode.c:90 g10/openfile.c:86 g10/openfile.c:174 g10/tdbio.c:467
-#: g10/tdbio.c:527
+#: g10/encode.c:91 g10/openfile.c:86 g10/openfile.c:174 g10/tdbio.c:467
+#: g10/tdbio.c:528
 #, c-format
 msgid "%s: can't open: %s\n"
 msgstr "%s: ���������� �������: %s\n"
 
-#: g10/encode.c:112
+#: g10/encode.c:113
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "������ ��� �������� �������� �����: %s\n"
 
-#: g10/encode.c:166 g10/encode.c:285
+#: g10/encode.c:167 g10/encode.c:290
 #, fuzzy, c-format
 msgid "%s: WARNING: empty file\n"
 msgstr "%s: ��������������: ������ ����.\n"
 
-#: g10/encode.c:235
+#: g10/encode.c:240
 #, c-format
 msgid "reading from `%s'\n"
 msgstr "�������� �� `%s'\n"
 
-#: g10/encode.c:413
+#: g10/encode.c:435 g10/sign.c:346
+#, fuzzy, c-format
+msgid "WARNING: `%s' is an empty file\n"
+msgstr "%s: ��������������: ������ ����.\n"
+
+#: g10/encode.c:605
 #, fuzzy, c-format
 msgid "%s/%s encrypted for: %s\n"
 msgstr "%s ����������� ���: %s\n"
@@ -1483,7 +1504,7 @@ msgstr ""
 msgid "too many entries in unk cache - disabled\n"
 msgstr ""
 
-#: g10/getkey.c:1531 g10/getkey.c:1587
+#: g10/getkey.c:1535 g10/getkey.c:1591
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "������������ �������������� ���� %09lX ������ ��������� %08lX%\n"
@@ -1508,364 +1529,373 @@ msgstr ""
 msgid "read error: %s\n"
 msgstr "������ ������: %s\n"
 
-#: g10/import.c:174
+#: g10/import.c:175
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr ""
 
-#: g10/import.c:176
+#: g10/import.c:177
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr ""
 
-#: g10/import.c:178
+#: g10/import.c:179
 #, c-format
 msgid "              imported: %lu"
 msgstr ""
 
-#: g10/import.c:184
+#: g10/import.c:185
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr ""
 
-#: g10/import.c:186
+#: g10/import.c:187
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr ""
 
-#: g10/import.c:188
+#: g10/import.c:189
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr ""
 
-#: g10/import.c:190
+#: g10/import.c:191
 #, fuzzy, c-format
 msgid "        new signatures: %lu\n"
 msgstr "���� %08lX: %d ����� ��������\n"
 
-#: g10/import.c:192
+#: g10/import.c:193
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr ""
 
-#: g10/import.c:194
+#: g10/import.c:195
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr ""
 
-#: g10/import.c:196
+#: g10/import.c:197
 #, fuzzy, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "���� %08lX: ��������� ���� ������������\n"
 
-#: g10/import.c:198
+#: g10/import.c:199
 #, fuzzy, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "����������� ������������ ��������� ����"
 
-#: g10/import.c:340 g10/import.c:532
+#: g10/import.c:342 g10/import.c:534
 #, c-format
 msgid "key %08lX: no user id\n"
 msgstr "���� %08lX: ��� �������������� ������������\n"
 
-#: g10/import.c:351
+#: g10/import.c:353
 #, c-format
 msgid "key %08lX: no valid user ids\n"
 msgstr "���� %08lX: ��� ���������� ��������������� �������������\n"
 
-#: g10/import.c:353
+#: g10/import.c:355
 msgid "this may be caused by a missing self-signature\n"
 msgstr "��� ����� ���� ������� ����������� ����-�������\n"
 
-#: g10/import.c:364 g10/import.c:600
+#: g10/import.c:366 g10/import.c:604
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "���� %08lX: �������� ���� �� ������: %s\n"
 
-#: g10/import.c:370
+#: g10/import.c:372
 msgid "no default public keyring\n"
 msgstr "��� ������ �������� ������ �� ���������\n"
 
-#: g10/import.c:374 g10/openfile.c:115 g10/sign.c:215 g10/sign.c:498
+#: g10/import.c:376 g10/openfile.c:115 g10/sign.c:215 g10/sign.c:501
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "������������ � `%s'\n"
 
-#: g10/import.c:378 g10/import.c:438 g10/import.c:654
+#: g10/import.c:380 g10/import.c:440 g10/import.c:658
 #, c-format
 msgid "can't lock public keyring: %s\n"
 msgstr "���������� ������������� ������ �������� ������: %s\n"
 
-#: g10/import.c:381
+#: g10/import.c:383
 #, c-format
 msgid "can't write to keyring: %s\n"
 msgstr "���������� �������� � ������ ������: %s\n"
 
-#: g10/import.c:385
+#: g10/import.c:387
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "���� %08lX: �������� ���� ������������\n"
 
-#: g10/import.c:398
+#: g10/import.c:400
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "���� %08lX: �� ��������� � ����� ������\n"
 
-#: g10/import.c:411 g10/import.c:609
+#: g10/import.c:413 g10/import.c:613
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "���� %08lX: ���������� ���������� original keyblock: %s\n"
 
-#: g10/import.c:418 g10/import.c:616
+#: g10/import.c:420 g10/import.c:620
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "���� %08lX: ���������� ��������� original keyblock: %s\n"
 
-#: g10/import.c:435 g10/import.c:547 g10/import.c:651
+#: g10/import.c:437 g10/import.c:549 g10/import.c:655
 msgid "writing keyblock\n"
 msgstr "������������ ���� �����\n"
 
-#: g10/import.c:441 g10/import.c:657
+#: g10/import.c:443 g10/import.c:661
 #, c-format
 msgid "can't write keyblock: %s\n"
 msgstr "���������� �������� ���� �����: %s\n"
 
-#: g10/import.c:446
+#: g10/import.c:448
 #, c-format
 msgid "key %08lX: 1 new user-id\n"
 msgstr "���� %08lX: 1 ����� ������������� ������������\n"
 
-#: g10/import.c:449
+#: g10/import.c:451
 #, c-format
 msgid "key %08lX: %d new user-ids\n"
 msgstr "���� %08lX: %d ����� ��������������� �������������\n"
 
-#: g10/import.c:452
+#: g10/import.c:454
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "���� %08lX: 1 ����� �������\n"
 
-#: g10/import.c:455
+#: g10/import.c:457
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "���� %08lX: %d ����� ��������\n"
 
-#: g10/import.c:458
+#: g10/import.c:460
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "���� %08lX: 1 ����� ���-����\n"
 
-#: g10/import.c:461
+#: g10/import.c:463
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "���� %08lX: %d ����� ���-������\n"
 
-#: g10/import.c:471
+#: g10/import.c:473
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "���� %08lX: �� �������\n"
 
-#: g10/import.c:550
+#: g10/import.c:552
 #, c-format
 msgid "can't lock secret keyring: %s\n"
 msgstr "���������� ������������� ������ ��������� ������: %s\n"
 
-#: g10/import.c:553
+#: g10/import.c:555
 #, fuzzy, c-format
 msgid "can't write keyring: %s\n"
 msgstr "���������� �������� ������ ������: %s\n"
 
-#. we are ready
-#: g10/import.c:556
+#: g10/import.c:559
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "���� %08lX: ��������� ���� ������������\n"
 
 #. we can't merge secret keys
-#: g10/import.c:560
+#: g10/import.c:564
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "���� %08lX: ��� �� ������ ��������� ������\n"
 
-#: g10/import.c:565
+#: g10/import.c:569
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "���� %08lX: ��������� ���� �� ������: %s\n"
 
-#: g10/import.c:594
+#: g10/import.c:598
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "���� %08lX: ��� ��������� ����� - ���������� ��������� ���������� "
 "����������\n"
 
-#: g10/import.c:627
+#: g10/import.c:631
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "���� %08lX: ������������ ���������� ����������: %s - ���������\n"
 
-#: g10/import.c:661
+#: g10/import.c:665
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "���� %08lX: ���������� ���������� ������������\n"
 
-#: g10/import.c:695
+#: g10/import.c:699
 #, c-format
 msgid "key %08lX: no user-id for signature\n"
 msgstr "���� %08lX: ��� �������������� ������������ ��� �������\n"
 
-#: g10/import.c:702 g10/import.c:727
+#: g10/import.c:706 g10/import.c:731
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "���� %08lX: ���������������� �������� ��������� �����\n"
 
-#: g10/import.c:703
+#: g10/import.c:707
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "���� %08lX: ������������ ����-�������\n"
 
-#: g10/import.c:719
+#: g10/import.c:723
 #, fuzzy, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "���� %08lX: ��� �������������� ������������\n"
 
-#: g10/import.c:728
+#: g10/import.c:732
 #, fuzzy, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "���� %08lX: ��� ���������� ��������������� �������������\n"
 
-#: g10/import.c:760
+#: g10/import.c:764
 #, c-format
 msgid "key %08lX: skipped userid '"
 msgstr "���� %08lX: �������� ������������� ������������ '"
 
-#: g10/import.c:780
+#: g10/import.c:787
 #, fuzzy, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "���� %08lX: 1 ����� ���-����\n"
 
-#: g10/import.c:800
+#. here we violate the rfc a bit by still allowing
+#. * to import non-exportable signature when we have the
+#. * the secret key used to create this signature - it
+#. * seems that this makes sense
+#: g10/import.c:812
 #, fuzzy, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "���� %08lX: ���������� ���������� � ������������ ����� - ��������\n"
 
-#: g10/import.c:809
+#: g10/import.c:821
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "���� %08lX: ���������� ���������� � ������������ ����� - ��������\n"
 
-#: g10/import.c:817
+#: g10/import.c:829
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "���� %08lX: ������������ ���������� ����������: %s - ��������\n"
 
-#: g10/import.c:878
+#: g10/import.c:890
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "���� %08lX: ���������� ���������� ��������\n"
 
-#: g10/import.c:992 g10/import.c:1047
+#: g10/import.c:1008 g10/import.c:1063
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "���� %08lX: ���� ����� �� ����� ����-�������\n"
 
-#: g10/keyedit.c:88
+#: g10/keyedit.c:91
 #, c-format
 msgid "%s: user not found\n"
 msgstr "%s: ������������ �� ������\n"
 
-#: g10/keyedit.c:171
+#: g10/keyedit.c:177
+msgid "[revocation]"
+msgstr ""
+
+#: g10/keyedit.c:178
 #, fuzzy
 msgid "[self-signature]"
 msgstr "[����-�������]\n"
 
-#: g10/keyedit.c:189
+#: g10/keyedit.c:196
 #, fuzzy
 msgid "1 bad signature\n"
 msgstr "1 ������ �������\n"
 
-#: g10/keyedit.c:191
+#: g10/keyedit.c:198
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d ������ ��������\n"
 
-#: g10/keyedit.c:193
+#: g10/keyedit.c:200
 #, fuzzy
 msgid "1 signature not checked due to a missing key\n"
 msgstr "1 ������� �� ��������� ��-�� ���������� �����\n"
 
-#: g10/keyedit.c:195
+#: g10/keyedit.c:202
 #, fuzzy, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "%s �������� �� ��������� ��-�� ���������� ������\n"
 
-#: g10/keyedit.c:197
+#: g10/keyedit.c:204
 #, fuzzy
 msgid "1 signature not checked due to an error\n"
 msgstr "1 ������� �� ��������� ��-�� ������\n"
 
-#: g10/keyedit.c:199
+#: g10/keyedit.c:206
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "%s �������� �� ��������� ��-�� ������\n"
 
-#: g10/keyedit.c:201
+#: g10/keyedit.c:208
 #, fuzzy
 msgid "1 user id without valid self-signature detected\n"
 msgstr "��������� 1 ������������� ������������ ��� ���������� ����-�������\n"
 
-#: g10/keyedit.c:203
+#: g10/keyedit.c:210
 #, c-format
 msgid "%d user ids without valid self-signatures detected\n"
 msgstr ""
 "���������� %d ��������������� ������������� ��� ���������� ����-��������\n"
 
-#: g10/keyedit.c:281
+#. Fixme: see whether there is a revocation in which
+#. * case we should allow to sign it again.
+#: g10/keyedit.c:290
 #, fuzzy, c-format
 msgid "Already signed by key %08lX\n"
 msgstr "��� ��������� ������ %08lX.\n"
 
-#: g10/keyedit.c:289
+#: g10/keyedit.c:298
 #, fuzzy, c-format
 msgid "Nothing to sign with key %08lX\n"
 msgstr "������ ����������� ������ %08lX\n"
 
-#: g10/keyedit.c:298
+#: g10/keyedit.c:307
 #, fuzzy
 msgid ""
 "Are you really sure that you want to sign this key\n"
 "with your key: \""
 msgstr "�� ������������� �������, ��� ������ ��������� ���� ���� �����:\n"
 
-#: g10/keyedit.c:307
+#: g10/keyedit.c:316
 msgid ""
 "The signature will be marked as non-exportable.\n"
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:309
+#: g10/keyedit.c:321
 msgid "Really sign? "
 msgstr "������������� ���������? "
 
-#: g10/keyedit.c:335 g10/sign.c:75
+#: g10/keyedit.c:347 g10/keyedit.c:1684 g10/keyedit.c:1733 g10/sign.c:75
 #, fuzzy, c-format
 msgid "signing failed: %s\n"
 msgstr "������ ������������: %s\n"
 
-#: g10/keyedit.c:388
+#: g10/keyedit.c:400
 msgid "This key is not protected.\n"
 msgstr "���� ���� �� �������.\n"
 
-#: g10/keyedit.c:391
+#: g10/keyedit.c:403
 msgid "Key is protected.\n"
 msgstr "���� ���� �������.\n"
 
-#: g10/keyedit.c:408
+#: g10/keyedit.c:420
 #, c-format
 msgid "Can't edit this key: %s\n"
 msgstr "���������� ������������� ���� ����: %s\n"
 
-#: g10/keyedit.c:413
+#: g10/keyedit.c:425
 msgid ""
 "Enter the new passphrase for this secret key.\n"
 "\n"
@@ -1873,7 +1903,7 @@ msgstr ""
 "������� ����� �������� ����� ��� ����� ���������� �����.\n"
 "\n"
 
-#: g10/keyedit.c:425
+#: g10/keyedit.c:437
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "\n"
@@ -1881,400 +1911,471 @@ msgstr ""
 "�� �� ������ �������� ����� - ��� ������ ����� *������* ����!\n"
 "\n"
 
-#: g10/keyedit.c:428
+#: g10/keyedit.c:440
 msgid "Do you really want to do this? "
 msgstr "�� ������������� ����� ������? "
 
-#: g10/keyedit.c:487
+#: g10/keyedit.c:499
 msgid "moving a key signature to the correct place\n"
 msgstr ""
 
-#: g10/keyedit.c:523
+#: g10/keyedit.c:535
 msgid "quit"
 msgstr "�����"
 
-#: g10/keyedit.c:523
+#: g10/keyedit.c:535
 msgid "quit this menu"
 msgstr "����� �� ����"
 
-#: g10/keyedit.c:524
+#: g10/keyedit.c:536
 msgid "q"
 msgstr ""
 
-#: g10/keyedit.c:525
+#: g10/keyedit.c:537
 msgid "save"
 msgstr "��������"
 
-#: g10/keyedit.c:525
+#: g10/keyedit.c:537
 msgid "save and quit"
 msgstr "�������� � �����"
 
-#: g10/keyedit.c:526
+#: g10/keyedit.c:538
 msgid "help"
 msgstr "������"
 
-#: g10/keyedit.c:526
+#: g10/keyedit.c:538
 msgid "show this help"
 msgstr "�������� ������"
 
-#: g10/keyedit.c:528
+#: g10/keyedit.c:540
 msgid "fpr"
 msgstr ""
 
-#: g10/keyedit.c:528
+#: g10/keyedit.c:540
 #, fuzzy
 msgid "show fingerprint"
 msgstr "�������� \"��������� ������\""
 
-#: g10/keyedit.c:529
+#: g10/keyedit.c:541
 #, fuzzy
 msgid "list"
 msgstr "������"
 
-#: g10/keyedit.c:529
+#: g10/keyedit.c:541
 #, fuzzy
 msgid "list key and user ids"
 msgstr "������ ������ � ��������������� �������������"
 
-#: g10/keyedit.c:530
+#: g10/keyedit.c:542
 msgid "l"
 msgstr ""
 
-#: g10/keyedit.c:531
+#: g10/keyedit.c:543
 msgid "uid"
 msgstr ""
 
-#: g10/keyedit.c:531
+#: g10/keyedit.c:543
 msgid "select user id N"
 msgstr "������� ������������� ������������ N"
 
-#: g10/keyedit.c:532
+#: g10/keyedit.c:544
 msgid "key"
 msgstr "����"
 
-#: g10/keyedit.c:532
+#: g10/keyedit.c:544
 msgid "select secondary key N"
 msgstr "������� �������������� ���� N"
 
-#: g10/keyedit.c:533
+#: g10/keyedit.c:545
 msgid "check"
 msgstr "��������"
 
-#: g10/keyedit.c:533
+#: g10/keyedit.c:545
 #, fuzzy
 msgid "list signatures"
 msgstr "������ ������ � �� ��������"
 
-#: g10/keyedit.c:534
+#: g10/keyedit.c:546
 msgid "c"
 msgstr ""
 
-#: g10/keyedit.c:535
+#: g10/keyedit.c:547
 msgid "sign"
 msgstr "���������"
 
-#: g10/keyedit.c:535
+#: g10/keyedit.c:547
 #, fuzzy
 msgid "sign the key"
 msgstr "��������� ����"
 
-#: g10/keyedit.c:536
+#: g10/keyedit.c:548
 msgid "s"
 msgstr ""
 
-#: g10/keyedit.c:537
+#: g10/keyedit.c:549
 #, fuzzy
 msgid "lsign"
 msgstr "���������"
 
-#: g10/keyedit.c:537
+#: g10/keyedit.c:549
 #, fuzzy
 msgid "sign the key locally"
 msgstr "��������� ����"
 
-#: g10/keyedit.c:538
+#: g10/keyedit.c:550
 msgid "debug"
 msgstr "�������"
 
-#: g10/keyedit.c:539
+#: g10/keyedit.c:551
 msgid "adduid"
 msgstr ""
 
-#: g10/keyedit.c:539
+#: g10/keyedit.c:551
 msgid "add a user id"
 msgstr "�������� ������������� ������������"
 
-#: g10/keyedit.c:540
+#: g10/keyedit.c:552
 msgid "deluid"
 msgstr ""
 
-#: g10/keyedit.c:540
+#: g10/keyedit.c:552
 #, fuzzy
 msgid "delete user id"
 msgstr "������� ������������� ������������"
 
-#: g10/keyedit.c:541
+#: g10/keyedit.c:553
 msgid "addkey"
 msgstr ""
 
-#: g10/keyedit.c:541
+#: g10/keyedit.c:553
 #, fuzzy
 msgid "add a secondary key"
 msgstr "�������� �������������� ����"
 
-#: g10/keyedit.c:542
+#: g10/keyedit.c:554
 msgid "delkey"
 msgstr ""
 
-#: g10/keyedit.c:542
+#: g10/keyedit.c:554
 msgid "delete a secondary key"
 msgstr "������� �������������� ����"
 
-#: g10/keyedit.c:543
+#: g10/keyedit.c:555
 msgid "expire"
 msgstr ""
 
-#: g10/keyedit.c:543
+#: g10/keyedit.c:555
 #, fuzzy
 msgid "change the expire date"
 msgstr "�������� �������� �����"
 
-#: g10/keyedit.c:544
+#: g10/keyedit.c:556
 msgid "toggle"
 msgstr ""
 
-#: g10/keyedit.c:544
+#: g10/keyedit.c:556
 msgid "toggle between secret and public key listing"
 msgstr "����������� ����� ������� ��������� � �������� ������"
 
-#: g10/keyedit.c:546
+#: g10/keyedit.c:558
 msgid "t"
 msgstr ""
 
-#: g10/keyedit.c:547
+#: g10/keyedit.c:559
 msgid "pref"
 msgstr ""
 
-#: g10/keyedit.c:547
+#: g10/keyedit.c:559
 msgid "list preferences"
 msgstr ""
 
-#: g10/keyedit.c:548
+#: g10/keyedit.c:560
 msgid "passwd"
 msgstr ""
 
-#: g10/keyedit.c:548
+#: g10/keyedit.c:560
 #, fuzzy
 msgid "change the passphrase"
 msgstr "�������� �������� �����"
 
-#: g10/keyedit.c:549
+#: g10/keyedit.c:561
 msgid "trust"
 msgstr ""
 
-#: g10/keyedit.c:549
+#: g10/keyedit.c:561
 msgid "change the ownertrust"
 msgstr "�������� ��������� �������"
 
-#: g10/keyedit.c:568
+#: g10/keyedit.c:562
+#, fuzzy
+msgid "revsig"
+msgstr "���������"
+
+#: g10/keyedit.c:562
+#, fuzzy
+msgid "revoke signatures"
+msgstr "��������� ������� �� �����"
+
+#: g10/keyedit.c:563
+#, fuzzy
+msgid "revkey"
+msgstr "����"
+
+#: g10/keyedit.c:563
+#, fuzzy
+msgid "revoke a secondary key"
+msgstr "������� �������������� ����"
+
+#: g10/keyedit.c:582
 msgid "can't do that in batchmode\n"
 msgstr "���������� ������� ��� � �������� ������.\n"
 
 #. check that they match
 #. FIXME: check that they both match
-#: g10/keyedit.c:595
+#: g10/keyedit.c:609
 #, fuzzy
 msgid "Secret key is available.\n"
 msgstr "������� ��������� ����.\n"
 
-#: g10/keyedit.c:624
+#: g10/keyedit.c:638
 #, fuzzy
 msgid "Command> "
 msgstr "�������> "
 
-#: g10/keyedit.c:651
+#: g10/keyedit.c:665
 #, fuzzy
 msgid "Need the secret key to do this.\n"
 msgstr "����� ��� �������, ����� ��������� ����.\n"
 
-#: g10/keyedit.c:673
+#: g10/keyedit.c:687
 msgid "Save changes? "
 msgstr "��������� ���������? "
 
-#: g10/keyedit.c:676
+#: g10/keyedit.c:690
 msgid "Quit without saving? "
 msgstr "����� ��� ����������? "
 
-#: g10/keyedit.c:686
+#: g10/keyedit.c:700
 #, fuzzy, c-format
 msgid "update failed: %s\n"
 msgstr "���������� �� �������: %s\n"
 
-#: g10/keyedit.c:693
+#: g10/keyedit.c:707
 #, fuzzy, c-format
 msgid "update secret failed: %s\n"
 msgstr "���������� ������� �� �������: %s\n"
 
-#: g10/keyedit.c:700
+#: g10/keyedit.c:714
 msgid "Key not changed so no update needed.\n"
 msgstr "���� �� ���������, ���������� �� �����.\n"
 
-#: g10/keyedit.c:703 g10/keyedit.c:762
+#: g10/keyedit.c:717 g10/keyedit.c:776
 #, fuzzy, c-format
 msgid "update of trustdb failed: %s\n"
 msgstr "���������� ���� ������ ������� �� �������: %s\n"
 
-#: g10/keyedit.c:736
+#: g10/keyedit.c:750
 msgid "Really sign all user ids? "
 msgstr "������������� ��������� ��� �������������� ������������? "
 
-#: g10/keyedit.c:737
+#: g10/keyedit.c:751
 msgid "Hint: Select the user ids to sign\n"
 msgstr ""
 "���������: �������� �������������� ������������ ������� ������ ���������\n"
 
-#: g10/keyedit.c:773
+#: g10/keyedit.c:787
 msgid "You must select at least one user id.\n"
 msgstr "�� ������ ������� ���� �� ���� ������������� ������������.\n"
 
-#: g10/keyedit.c:775
+#: g10/keyedit.c:789
 msgid "You can't delete the last user id!\n"
 msgstr "�� �� ������ ������� ��������� ������������� ������������!\n"
 
-#: g10/keyedit.c:778
+#: g10/keyedit.c:792
 #, fuzzy
 msgid "Really remove all selected user ids? "
 msgstr "������������� ������� ��� ��������� �������������� ������������? "
 
-#: g10/keyedit.c:779
+#: g10/keyedit.c:793
 #, fuzzy
 msgid "Really remove this user id? "
 msgstr "������������� ������� ���� ������������� ������������? "
 
-#: g10/keyedit.c:802
+#: g10/keyedit.c:816 g10/keyedit.c:838
 msgid "You must select at least one key.\n"
 msgstr "�� ������ ������� ���� �� ���� ����.\n"
 
-#: g10/keyedit.c:806
+#: g10/keyedit.c:820
 #, fuzzy
 msgid "Do you really want to delete the selected keys? "
 msgstr "�� ������������� ������ ������� ��������� �����? "
 
-#: g10/keyedit.c:807
+#: g10/keyedit.c:821
 #, fuzzy
 msgid "Do you really want to delete this key? "
 msgstr "�� ������������� ������ ������� ���� ����? "
 
-#: g10/keyedit.c:854
+#: g10/keyedit.c:842
+#, fuzzy
+msgid "Do you really want to revoke the selected keys? "
+msgstr "�� ������������� ������ ������� ��������� �����? "
+
+#: g10/keyedit.c:843
+#, fuzzy
+msgid "Do you really want to revoke this key? "
+msgstr "�� ������������� ������ ������� ���� ����? "
+
+#: g10/keyedit.c:897
 msgid "Invalid command  (try \"help\")\n"
 msgstr "������������ ������� (���������� \"help\")\n"
 
-#: g10/keyedit.c:1232
+#: g10/keyedit.c:1289
 msgid "Please remove selections from the secret keys.\n"
 msgstr ""
 
-#: g10/keyedit.c:1238
+#: g10/keyedit.c:1295
 #, fuzzy
 msgid "Please select at most one secondary key.\n"
 msgstr "�� ������ ������� ���� �� ���� ����.\n"
 
-#: g10/keyedit.c:1242
+#: g10/keyedit.c:1299
 msgid "Changing exiration time for a secondary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1244
+#: g10/keyedit.c:1301
 msgid "Changing exiration time for the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1285
+#: g10/keyedit.c:1342
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr ""
 
-#: g10/keyedit.c:1301
+#: g10/keyedit.c:1358
 msgid "No corresponding signature in secret ring\n"
 msgstr ""
 
-#: g10/keyedit.c:1361
+#: g10/keyedit.c:1418
 #, c-format
 msgid "No user id with index %d\n"
 msgstr "��� �������������� ������������ � �������� %d\n"
 
-#: g10/keyedit.c:1407
+#: g10/keyedit.c:1464
 #, c-format
 msgid "No secondary key with index %d\n"
 msgstr "��� ��������������� ����� � �������� %d\n"
 
-#: g10/mainproc.c:184
+#: g10/keyedit.c:1562
+#, fuzzy
+msgid "user ID: \""
+msgstr "������� ������������� ������������: "
+
+#: g10/keyedit.c:1565
+#, fuzzy, c-format
+msgid ""
+"\"\n"
+"signed with your key %08lX at %s\n"
+msgstr "������ ����������� ������ %08lX\n"
+
+#: g10/keyedit.c:1569
+#, fuzzy
+msgid "Create a revocation certificate for this signature? (y/N)"
+msgstr "������������� ���������� ����������"
+
+#: g10/keyedit.c:1649
+#, fuzzy
+msgid "Really create the revocation certificates? (y/N)"
+msgstr "������������� ���������� ����������"
+
+#: g10/keyedit.c:1672
+#, fuzzy
+msgid "no secret key\n"
+msgstr "������ ��������� ����"
+
+#: g10/mainproc.c:185
 #, fuzzy, c-format
 msgid "public key is %08lX\n"
 msgstr "�������� ���� �� ������"
 
-#: g10/mainproc.c:212
+#: g10/mainproc.c:213
 #, fuzzy
 msgid "public key encrypted data: good DEK\n"
 msgstr "����������� �������� ������ �� ������� %s\n"
 
 #. fixme: defer this message until we have parsed all packets of
 #. * this type - do this by building a list of keys with their stati
-#. * and store it with the conetxt.  do_proc_packets can then use
+#. * and store it with the context.  do_proc_packets can then use
 #. * this list to display some information
-#: g10/mainproc.c:219
+#: g10/mainproc.c:220
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "����������� �������� ������ �� ������� %s\n"
 
-#: g10/mainproc.c:246
+#: g10/mainproc.c:249
 #, fuzzy
 msgid "decryption okay\n"
 msgstr "����������� �� �������: %s\n"
 
-#: g10/mainproc.c:249
+#: g10/mainproc.c:253
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "����������� �� �������: %s\n"
 
-#: g10/mainproc.c:266
+#: g10/mainproc.c:270
 #, fuzzy
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "���������: ����������� �������� \"������-���-�����-����\"\n"
 
-#: g10/mainproc.c:268
+#: g10/mainproc.c:272
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr ""
 
-#: g10/mainproc.c:849
+#: g10/mainproc.c:876
 msgid "signature verification suppressed\n"
 msgstr ""
 
-#: g10/mainproc.c:855
+#: g10/mainproc.c:883
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "������� ������� %.*s, ��������� %s ���� %08lX\n"
 
+#: g10/mainproc.c:895
+#, fuzzy
+msgid "encrypted message is valid\n"
+msgstr "������ ������������ ��������-��������\n"
+
+#: g10/mainproc.c:899
+msgid "WARNING: encrypted message has been manipulated!\n"
+msgstr ""
+
+#: g10/mainproc.c:904
+#, fuzzy, c-format
+msgid "Can't check MDC: %s\n"
+msgstr "���������� ��������� �������: %s\n"
+
 #. just in case that we have no userid
-#: g10/mainproc.c:881 g10/mainproc.c:892
+#: g10/mainproc.c:925 g10/mainproc.c:936
 msgid "BAD signature from \""
 msgstr "������ ������� �� \""
 
-#: g10/mainproc.c:882 g10/mainproc.c:893
+#: g10/mainproc.c:926 g10/mainproc.c:937
 msgid "Good signature from \""
 msgstr "������� ������� �� \""
 
-#: g10/mainproc.c:884
+#: g10/mainproc.c:928
 msgid "                aka \""
 msgstr ""
 
-#: g10/mainproc.c:930
+#: g10/mainproc.c:974
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "���������� ��������� �������: %s\n"
 
-#: g10/mainproc.c:1003
+#: g10/mainproc.c:1047
 msgid "old style (PGP 2.x) signature\n"
 msgstr ""
 
-#: g10/mainproc.c:1008
+#: g10/mainproc.c:1052
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
@@ -2299,7 +2400,7 @@ msgstr ""
 "����������� RSA ������� �� �������������, ����������, ��������� � ��������\n"
 "������ ����� ��� ������������� � �������\n"
 
-#: g10/misc.c:235
+#: g10/misc.c:236
 msgid "this cipher algorithm is depreciated; please use a more standard one!\n"
 msgstr ""
 
@@ -2313,7 +2414,7 @@ msgstr "���������� ������������� ������ �������� ������: %s\n"
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
 
-#: g10/passphrase.c:151
+#: g10/passphrase.c:157
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2323,22 +2424,22 @@ msgstr ""
 "��� ����� �������� �����, ����� ��������� ����\n"
 "������������: \""
 
-#: g10/passphrase.c:160
+#: g10/passphrase.c:166
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "(%u-��� %s ����, ID %08lX, ������ %s)\n"
 
-#: g10/passphrase.c:165
+#: g10/passphrase.c:171
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr ""
 
-#: g10/passphrase.c:184
+#: g10/passphrase.c:190
 #, fuzzy
 msgid "Enter passphrase: "
 msgstr "������� �������� �����: %s\n"
 
-#: g10/passphrase.c:188
+#: g10/passphrase.c:194
 #, fuzzy
 msgid "Repeat passphrase: "
 msgstr "��������� �������� �����: %s\n"
@@ -2380,41 +2481,45 @@ msgstr "�������� ������ %d �� ��������������\n"
 msgid "NOTE: cipher algorithm %d not found in preferences\n"
 msgstr "���������: ������������ �������� %d �� ������ � �������������\n"
 
-#: g10/seckey-cert.c:57
+#: g10/seckey-cert.c:55
 #, fuzzy, c-format
 msgid "protection algorithm %d is not supported\n"
 msgstr "�������� ������ %d �� ��������������\n"
 
-#: g10/seckey-cert.c:177
+#: g10/seckey-cert.c:171
 msgid "Invalid passphrase; please try again ...\n"
 msgstr "������������ �������� �����, ���������� ����� ...\n"
 
-#: g10/seckey-cert.c:232
+#: g10/seckey-cert.c:227
 #, fuzzy
 msgid "WARNING: Weak key detected - please change passphrase again.\n"
 msgstr "��������������: ��������� ������ ���� - ������� �������� �����.\n"
 
-#: g10/sig-check.c:195
+#: g10/sig-check.c:186
+msgid "assuming bad MDC due to an unknown critical bit\n"
+msgstr ""
+
+#: g10/sig-check.c:282
 msgid ""
 "this is a PGP generated ElGamal key which is NOT secure for signatures!\n"
 msgstr "���� ElGamal ����, ��������� PGP, �� ������� ��� �������� ��������!\n"
 
-#: g10/sig-check.c:203
+#: g10/sig-check.c:290
 #, fuzzy, c-format
 msgid "public key is %lu second newer than the signature\n"
 msgstr "���� %08lX: ��� �������������� ������������ ��� �������\n"
 
-#: g10/sig-check.c:204
+#: g10/sig-check.c:291
 #, fuzzy, c-format
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "���� %08lX: ��� �������������� ������������ ��� �������\n"
 
-#: g10/sig-check.c:220
+#: g10/sig-check.c:307
 #, fuzzy, c-format
 msgid "NOTE: signature key expired %s\n"
 msgstr "��������������: ���� ������� ������� %s\n"
 
-#: g10/sig-check.c:277
+#: g10/sig-check.c:364
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 
@@ -2423,7 +2528,7 @@ msgstr ""
 msgid "%s signature from: %s\n"
 msgstr "������ ������� �� \""
 
-#: g10/sign.c:210 g10/sign.c:493
+#: g10/sign.c:210 g10/sign.c:496
 #, fuzzy, c-format
 msgid "can't create %s: %s\n"
 msgstr "%s: ���������� �������: %s\n"
@@ -2433,11 +2538,6 @@ msgstr "%s: ���������� �������: %s\n"
 msgid "signing:"
 msgstr "���������"
 
-#: g10/sign.c:346
-#, fuzzy, c-format
-msgid "WARNING: `%s' is an empty file\n"
-msgstr "%s: ��������������: ������ ����.\n"
-
 #: g10/textfilter.c:122
 #, c-format
 msgid "can't handle text lines longer than %d characters\n"
@@ -2448,12 +2548,12 @@ msgstr ""
 msgid "input line longer than %d characters\n"
 msgstr ""
 
-#: g10/tdbio.c:116 g10/tdbio.c:1504
+#: g10/tdbio.c:116 g10/tdbio.c:1505
 #, fuzzy, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "���������� ������� �� �������: %s\n"
 
-#: g10/tdbio.c:122 g10/tdbio.c:1511
+#: g10/tdbio.c:122 g10/tdbio.c:1512
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr ""
@@ -2482,12 +2582,12 @@ msgstr "%s: ���������� �������: %s\n"
 msgid "%s: directory does not exist!\n"
 msgstr ""
 
-#: g10/openfile.c:111 g10/openfile.c:181 g10/ringedit.c:1325 g10/tdbio.c:457
+#: g10/openfile.c:111 g10/openfile.c:181 g10/ringedit.c:1344 g10/tdbio.c:457
 #, fuzzy, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: ���������� �������: %s\n"
 
-#: g10/tdbio.c:472 g10/tdbio.c:520
+#: g10/tdbio.c:472 g10/tdbio.c:521
 #, fuzzy, c-format
 msgid "%s: can't create lock\n"
 msgstr "%s: ���������� �������: %s\n"
@@ -2502,83 +2602,83 @@ msgstr ""
 msgid "%s: invalid trustdb created\n"
 msgstr "%s: ���������� �������: %s\n"
 
-#: g10/tdbio.c:492
+#: g10/tdbio.c:493
 #, fuzzy, c-format
 msgid "%s: trustdb created\n"
 msgstr "%s: ���������� �������: %s\n"
 
-#: g10/tdbio.c:529
+#: g10/tdbio.c:530
 #, fuzzy, c-format
 msgid "%s: invalid trustdb\n"
 msgstr "���������� ���� ������ ������� �� �������: %s\n"
 
-#: g10/tdbio.c:562
+#: g10/tdbio.c:563
 #, fuzzy, c-format
 msgid "%s: failed to create hashtable: %s\n"
 msgstr "%s: ���������� �������: %s\n"
 
-#: g10/tdbio.c:570
+#: g10/tdbio.c:571
 #, fuzzy, c-format
 msgid "%s: error updating version record: %s\n"
 msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n"
 
-#: g10/tdbio.c:586 g10/tdbio.c:625 g10/tdbio.c:647 g10/tdbio.c:677
-#: g10/tdbio.c:702 g10/tdbio.c:1437 g10/tdbio.c:1464
+#: g10/tdbio.c:587 g10/tdbio.c:626 g10/tdbio.c:648 g10/tdbio.c:678
+#: g10/tdbio.c:703 g10/tdbio.c:1438 g10/tdbio.c:1465
 #, fuzzy, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n"
 
-#: g10/tdbio.c:599 g10/tdbio.c:658
+#: g10/tdbio.c:600 g10/tdbio.c:659
 #, fuzzy, c-format
 msgid "%s: error writing version record: %s\n"
 msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n"
 
-#: g10/tdbio.c:1131
+#: g10/tdbio.c:1132
 #, fuzzy, c-format
 msgid "trustdb: lseek failed: %s\n"
 msgstr "���������� ������� �� �������: %s\n"
 
-#: g10/tdbio.c:1139
+#: g10/tdbio.c:1140
 #, fuzzy, c-format
 msgid "trustdb: read failed (n=%d): %s\n"
 msgstr "���������� ���� ������ ������� �� �������: %s\n"
 
-#: g10/tdbio.c:1160
+#: g10/tdbio.c:1161
 #, fuzzy, c-format
 msgid "%s: not a trustdb file\n"
 msgstr "���������� ���� ������ ������� �� �������: %s\n"
 
-#: g10/tdbio.c:1176
+#: g10/tdbio.c:1177
 #, c-format
 msgid "%s: version record with recnum %lu\n"
 msgstr ""
 
-#: g10/tdbio.c:1181
+#: g10/tdbio.c:1182
 #, fuzzy, c-format
 msgid "%s: invalid file version %d\n"
 msgstr "������������ ������ ��������� �������\n"
 
-#: g10/tdbio.c:1470
+#: g10/tdbio.c:1471
 #, fuzzy, c-format
 msgid "%s: error reading free record: %s\n"
 msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n"
 
-#: g10/tdbio.c:1478
+#: g10/tdbio.c:1479
 #, fuzzy, c-format
 msgid "%s: error writing dir record: %s\n"
 msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n"
 
-#: g10/tdbio.c:1488
+#: g10/tdbio.c:1489
 #, c-format
 msgid "%s: failed to zero a record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1518
+#: g10/tdbio.c:1519
 #, c-format
 msgid "%s: failed to append a record: %s\n"
 msgstr ""
 
-#: g10/tdbio.c:1629
+#: g10/tdbio.c:1630
 #, fuzzy
 msgid "The trustdb is corrupted; please run \"gpgm --fix-trustdb\".\n"
 msgstr "���� ������ ������� ���������: ��������� \"gpgm --fix-trust-db\".\n"
@@ -2795,7 +2895,7 @@ msgstr ""
 msgid "Too many preference items"
 msgstr ""
 
-#: g10/trustdb.c:1549 g10/trustdb.c:3045 g10/trustdb.c:3075
+#: g10/trustdb.c:1549 g10/trustdb.c:3075 g10/trustdb.c:3105
 msgid "WARNING: can't yet handle long pref records\n"
 msgstr ""
 
@@ -2965,22 +3065,22 @@ msgstr "���� %08lX.%lu: ���� �������� ����� %s\n"
 msgid "key %08lX.%lu: trust check failed: %s\n"
 msgstr "���� %08lX.%lu: �������� ������� �� �������: %s\n"
 
-#: g10/trustdb.c:2851
+#: g10/trustdb.c:2881
 #, fuzzy, c-format
 msgid "user '%s' not found: %s\n"
 msgstr "%s: ������������ �� ������\n"
 
-#: g10/trustdb.c:2853
+#: g10/trustdb.c:2883
 #, fuzzy, c-format
 msgid "problem finding '%s' in trustdb: %s\n"
 msgstr "������ ������������� ���� ������ �������: %s\n"
 
-#: g10/trustdb.c:2856
+#: g10/trustdb.c:2886
 #, fuzzy, c-format
 msgid "user '%s' not in trustdb - inserting\n"
 msgstr "���������� ���� ������ ������� �� �������: %s\n"
 
-#: g10/trustdb.c:2859
+#: g10/trustdb.c:2889
 #, fuzzy, c-format
 msgid "failed to put '%s' into trustdb: %s\n"
 msgstr "������ ������������� ���� ������ �������: %s\n"
@@ -2990,26 +3090,26 @@ msgstr "������ ������������� ���� ������ �������: %s\n"
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s: ���������� �������: %s\n"
 
-#: g10/ringedit.c:322 g10/ringedit.c:1330
+#: g10/ringedit.c:333 g10/ringedit.c:1349
 #, fuzzy, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: ���������� �������: %s\n"
 
-#: g10/ringedit.c:1507
+#: g10/ringedit.c:1526
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr ""
 
-#: g10/ringedit.c:1508
+#: g10/ringedit.c:1527
 #, fuzzy, c-format
 msgid "%s is the unchanged one\n"
 msgstr "����������� ������������ ��������� ����"
 
-#: g10/ringedit.c:1509
+#: g10/ringedit.c:1528
 #, c-format
 msgid "%s is the new one\n"
 msgstr ""
 
-#: g10/ringedit.c:1510
+#: g10/ringedit.c:1529
 msgid "Please fix this possible security flaw\n"
 msgstr ""
 
@@ -3054,17 +3154,17 @@ msgstr "���������� ������� ����������� ������ `%s' .\n"
 msgid "%s: new options file created\n"
 msgstr ""
 
-#: g10/encr-data.c:59
+#: g10/encr-data.c:60
 #, fuzzy, c-format
 msgid "%s encrypted data\n"
 msgstr "����������� ������"
 
-#: g10/encr-data.c:61
+#: g10/encr-data.c:62
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr ""
 
-#: g10/encr-data.c:74
+#: g10/encr-data.c:77
 #, fuzzy
 msgid ""
 "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
@@ -3223,6 +3323,20 @@ msgstr "������ �����������."
 msgid "No help available for `%s'"
 msgstr "������ ��� `%s' �����������."
 
+#~ msgid "Usage: gpgm [options] [files] (-h for help)"
+#~ msgstr "�������������: gpgm [���������] [�����] (-h ��� ������)"
+
+#, fuzzy
+#~ msgid ""
+#~ "Syntax: gpgm [options] [files]\n"
+#~ "GnuPG maintenance utility\n"
+#~ msgstr ""
+#~ "���������: gpgm [���������] [�����]\n"
+#~ "��������� ������������� GNUPG\n"
+
+#~ msgid "usage: gpgm [options] "
+#~ msgstr "�������������: gpgm [���������] "
+
 #, fuzzy
 #~ msgid "'%s' is not a valid long keyID\n"
 #~ msgstr "������������ ������ � �����������.\n"
@@ -3291,9 +3405,6 @@ msgstr "������ ��� `%s' �����������."
 #~ msgid "Hmmm, public key lost?"
 #~ msgstr "������ �������� ����"
 
-#~ msgid "use this user-id for encryption"
-#~ msgstr "������������ ��������� ������������� ������������ ��� ����������"
-
 #~ msgid "invalid clear text header: "
 #~ msgstr "������������ ��������� ���������: "