Release snapshot 1.0.4d

24 files changed, 2070 insertions, 2003 deletions

diff --git a/doc/ChangeLog b/doc/ChangeLog
index f824d243a..8f0905634 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2001-01-09  Werner Koch  <[email protected]>
+
+	* DETAILS: Fixed docs for NEED_PASSPHRASE and added USERID_HINT.
+
 2000-11-30  Werner Koch  <[email protected]>
 
 	* gpg.sgml: Fixed the description of --verify.  Add a short note
diff --git a/doc/DETAILS b/doc/DETAILS
index dc9743c6d..8577c13b2 100644
--- a/doc/DETAILS
+++ b/doc/DETAILS
@@ -141,7 +141,7 @@ more arguments in future versions.
     GET_HIDDEN
     GOT_IT
 
-    NEED_PASSPHRASE <long keyid>  <keytype>  <keylength>
+    NEED_PASSPHRASE <long main keyid> <long keyid> <keytype> <keylength>
 	Issued whenever a passphrase is needed.
 	keytype is the numerical value of the public key algorithm
 	or 0 if this is not applicable, keylength is the length
@@ -242,9 +242,12 @@ more arguments in future versions.
 
     NOTATION_NAME <name> 
     NOTATION_DATA <string>
-        name and string are %XX escaped; the data may be spliited
+        name and string are %XX escaped; the data may be splitted
         among several notation_data lines.
 
+    USERID_HINT <long main keyid> <string>
+        Give a hint about the user ID for a certain keyID. 
+
     POLICY_URL <string>
         string is %XX escaped
 
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 84dd695eb..e1c3c4a24 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,7 +1,26 @@
+2001-01-11  Werner Koch  <[email protected]>
+
+	* sig-check.c (do_check): Print the signature key expire message
+	only in verbose mode and added the keyID.
+
+2001-01-09  Werner Koch  <[email protected]>
+
+	* status.c, status.h: New status USERID_HINT. 
+	(write_status_text): Replace LF and CR int text by C-escape sequence.
+
+	* passphrase.c (passphrase_to_dek): Fixed the NEED_PASSPHRASE
+	output.  It does now always print 2 keyIDs.  Emit the new
+	USERID_HINT.
+
+2001-01-08  Werner Koch  <[email protected]>
+
+	* g10.c, options.h: New option --no-expensive-trust-checks.
+	* keylist.c (list_keyblock): Act on this option.
+
 2001-01-04  Werner Koch  <[email protected]>
 
 	* g10.c (main): Set homedir only in the pre-parsing phase and
-	replaces backslashes in the W32 version.
+	replace backslashes in the W32 version.
 
 2001-01-03  Werner Koch  <[email protected]>
 
diff --git a/g10/g10.c b/g10/g10.c
index e19f7e8f8..a45f4f584 100644
--- a/g10/g10.c
+++ b/g10/g10.c
@@ -200,6 +200,7 @@ enum cmd_and_opt_values { aNull = 0,
     oMergeOnly,
     oTryAllSecrets,
     oTrustedKey,
+    oNoExpensiveTrustChecks,
     oEmu3DESS2KBug,  /* will be removed in 1.1 */
     oEmuMDEncodeBug,
 aTest };
@@ -393,6 +394,7 @@ static ARGPARSE_OPTS opts[] = {
     { oAllowSecretKeyImport, "allow-secret-key-import", 0, "@" },
     { oTryAllSecrets,  "try-all-secrets", 0, "@" },
     { oEnableSpecialFilenames, "enable-special-filenames", 0, "@" },
+    { oNoExpensiveTrustChecks, "no-expensive-trust-checks", 0, "@" },
     { oEmu3DESS2KBug,  "emulate-3des-s2k-bug", 0, "@"},
     { oEmuMDEncodeBug,	"emulate-md-encode-bug", 0, "@"},
 {0} };
@@ -972,6 +974,8 @@ main( int argc, char **argv )
           case oEnableSpecialFilenames:
             iobuf_enable_special_filenames (1);
             break;
+          case oNoExpensiveTrustChecks: opt.no_expensive_trust_checks=1; break;
+
 	  default : pargs.err = configfp? 1:2; break;
 	}
     }
diff --git a/g10/keylist.c b/g10/keylist.c
index 32012f422..9408b2782 100644
--- a/g10/keylist.c
+++ b/g10/keylist.c
@@ -280,7 +280,7 @@ list_keyblock( KBNODE keyblock, int secret )
 	sk = NULL;
 	keyid_from_pk( pk, keyid );
 	if( opt.with_colons ) {
-	    if ( opt.fast_list_mode ) {
+	    if ( opt.fast_list_mode || opt.no_expensive_trust_checks ) {
 		fputs( "pub::", stdout );
 		trustletter = 0;
 	    }
@@ -299,7 +299,8 @@ list_keyblock( KBNODE keyblock, int secret )
 	    if( pk->local_id )
 		printf("%lu", pk->local_id );
 	    putchar(':');
-	    if( pk->local_id && !opt.fast_list_mode )
+	    if( pk->local_id && !opt.fast_list_mode
+                && !opt.no_expensive_trust_checks  )
 		putchar( get_ownertrust_info( pk->local_id ) );
 	    putchar(':');
 	}
@@ -313,7 +314,10 @@ list_keyblock( KBNODE keyblock, int secret )
     for( kbctx=NULL; (node=walk_kbnode( keyblock, &kbctx, 0)) ; ) {
 	if( node->pkt->pkttype == PKT_USER_ID && !opt.fast_list_mode ) {
 	    if( any ) {
-		if ( opt.with_colons ) {
+		if ( opt.with_colons && opt.no_expensive_trust_checks ) {
+        	    printf("uid:::::::::");
+	        }
+		else if ( opt.with_colons ) {
 		    byte namehash[20];
 
 		    if( pk && !ulti_hack ) {
@@ -371,7 +375,7 @@ list_keyblock( KBNODE keyblock, int secret )
 
 	    keyid_from_pk( pk2, keyid2 );
 	    if( opt.with_colons ) {
-		if ( opt.fast_list_mode ) {
+		if ( opt.fast_list_mode || opt.no_expensive_trust_checks ) {
 		    fputs( "sub::", stdout );
 		}
 		else {
@@ -439,7 +443,7 @@ list_keyblock( KBNODE keyblock, int secret )
 	else if( opt.list_sigs && node->pkt->pkttype == PKT_SIGNATURE ) {
 	    PKT_signature *sig = node->pkt->pkt.signature;
 	    int sigrc;
-	   char *sigstr;
+            char *sigstr;
 
 	    if( !any ) { /* no user id, (maybe a revocation follows)*/
 		if( sig->sig_class == 0x20 )
@@ -484,7 +488,7 @@ list_keyblock( KBNODE keyblock, int secret )
 		rc = 0;
 		sigrc = ' ';
 	    }
-	   fputs( sigstr, stdout );
+            fputs( sigstr, stdout );
 	    if( opt.with_colons ) {
 		putchar(':');
 		if( sigrc != ' ' )
diff --git a/g10/options.h b/g10/options.h
index 55c2a18fa..407ed3423 100644
--- a/g10/options.h
+++ b/g10/options.h
@@ -99,6 +99,7 @@ struct {
     int merge_only;
     int allow_secret_key_import;
     int try_all_secrets;
+    int no_expensive_trust_checks;
 } opt;
 
 
diff --git a/g10/passphrase.c b/g10/passphrase.c
index c3260b69d..67db368e4 100644
--- a/g10/passphrase.c
+++ b/g10/passphrase.c
@@ -521,12 +521,29 @@ passphrase_to_dek( u32 *keyid, int pubkey_algo,
 
     if( !next_pw && is_status_enabled() ) {
 	char buf[50];
+
 	if( keyid ) {
-	    sprintf( buf, "%08lX%08lX", (ulong)keyid[0], (ulong)keyid[1] );
-	    if( keyid[2] && keyid[3] && keyid[0] != keyid[2]
-				     && keyid[1] != keyid[3] )
-		sprintf( buf+strlen(buf), " %08lX%08lX %d 0",
-			   (ulong)keyid[2], (ulong)keyid[3], pubkey_algo );
+            u32 used_kid[2];
+            char *us;
+
+	    if( keyid[2] && keyid[3] ) {
+                used_kid[0] = keyid[2];
+                used_kid[1] = keyid[3];
+            }
+            else {
+                used_kid[0] = keyid[0];
+                used_kid[1] = keyid[1];
+            }
+
+            us = get_long_user_id_string( keyid );
+            write_status_text( STATUS_USERID_HINT, us );
+            m_free(us);
+
+	    sprintf( buf, "%08lX%08lX %08lX%08lX %d 0",
+                     (ulong)keyid[0], (ulong)keyid[1],
+                     (ulong)used_kid[0], (ulong)used_kid[1],
+                     pubkey_algo );
+                     
 	    write_status_text( STATUS_NEED_PASSPHRASE, buf );
 	}
 	else {
diff --git a/g10/sig-check.c b/g10/sig-check.c
index 67efad019..686cf09ff 100644
--- a/g10/sig-check.c
+++ b/g10/sig-check.c
@@ -321,8 +321,13 @@ do_check( PKT_public_key *pk, PKT_signature *sig, MD_HANDLE digest,
     }
 
     if( pk->expiredate && pk->expiredate < cur_time ) {
-	log_info(_("NOTE: signature key expired %s\n"),
-					asctimestamp( pk->expiredate ) );
+        if (opt.verbose) {
+	    u32 tmp_kid[2];
+
+	    keyid_from_pk( pk, tmp_kid );
+            log_info(_("NOTE: signature key %08lX expired %s\n"),
+                     (ulong)tmp_kid[1], asctimestamp( pk->expiredate ) );
+        }
 	write_status(STATUS_SIGEXPIRED);
 	*r_expired = 1;
     }
diff --git a/g10/status.c b/g10/status.c
index d2da0b662..1a778ce41 100644
--- a/g10/status.c
+++ b/g10/status.c
@@ -137,6 +137,7 @@ get_status_string ( int no )
       case STATUS_BEGIN_STREAM   : s = "BEGIN_STREAM"; break;
       case STATUS_END_STREAM     : s = "END_STREAM"; break;
       case STATUS_KEY_CREATED    : s = "KEY_CREATED"; break;
+      case STATUS_USERID_HINT    : s = "USERID_HINT"; break;
       default: s = "?"; break;
     }
     return s;
@@ -194,7 +195,14 @@ write_status_text ( int no, const char *text)
     fputs ( get_status_string (no), statusfp );
     if( text ) {
         putc ( ' ', statusfp );
-        fputs ( text, statusfp );
+        for (; *text; text++) {
+            if (*text == '\n')
+                fputs ( "\\n", statusfp );
+            else if (*text == '\r')
+                fputs ( "\\r", statusfp );
+            else 
+                putc ( *(const byte *)text,  statusfp );
+        }
     }
     putc ('\n',statusfp);
     fflush (statusfp);
diff --git a/g10/status.h b/g10/status.h
index bc8ac5f0a..75ee385d3 100644
--- a/g10/status.h
+++ b/g10/status.h
@@ -88,6 +88,8 @@
 #define STATUS_BEGIN_STREAM     56
 #define STATUS_END_STREAM       57
 #define STATUS_KEY_CREATED      58
+#define STATUS_USERID_HINT      59
+
 
 /*-- status.c --*/
 void set_status_fd ( int fd );
diff --git a/po/da.po b/po/da.po
index e4af365e4..96ccb56ee 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.0h\n"
-"POT-Creation-Date: 2000-12-19 11:58+0100\n"
+"POT-Creation-Date: 2001-01-11 13:11+0100\n"
 "PO-Revision-Date: 2000-03-07 22:51+01:00\n"
 "Last-Translator: Birger Langkjer <[email protected]>\n"
 "Language-Team: Danish <[email protected]>\n"
@@ -338,7 +338,7 @@ msgstr ""
 "Ikke nok tilf�ldige byte tilg�ngelig.  Please do some other work to give\n"
 "the OS a chance to collect more entropy! (Kr�ver %d byte mere)\n"
 
-#: g10/g10.c:210
+#: g10/g10.c:211
 msgid ""
 "@Commands:\n"
 " "
@@ -346,139 +346,139 @@ msgstr ""
 "@Kommandoer:\n"
 " "
 
-#: g10/g10.c:212
+#: g10/g10.c:213
 msgid "|[file]|make a signature"
 msgstr "|[filer]|opret en signatur"
 
-#: g10/g10.c:213
+#: g10/g10.c:214
 msgid "|[file]|make a clear text signature"
 msgstr "|[filer]|opret rentekst signatur"
 
-#: g10/g10.c:214
+#: g10/g10.c:215
 msgid "make a detached signature"
 msgstr "opret en separat signatur"
 
-#: g10/g10.c:215
+#: g10/g10.c:216
 msgid "encrypt data"
 msgstr "krypt�r data"
 
-#: g10/g10.c:216
+#: g10/g10.c:217
 msgid "encryption only with symmetric cipher"
 msgstr "krypt�r kun med symmetriske cifre"
 
-#: g10/g10.c:217
+#: g10/g10.c:218
 msgid "store only"
 msgstr "gem kun"
 
-#: g10/g10.c:218
+#: g10/g10.c:219
 msgid "decrypt data (default)"
 msgstr "afkrypt�r data (standard)"
 
-#: g10/g10.c:219
+#: g10/g10.c:220
 msgid "verify a signature"
 msgstr "godkend en signatur"
 
-#: g10/g10.c:221
+#: g10/g10.c:222
 msgid "list keys"
 msgstr "vis n�gler"
 
-#: g10/g10.c:223
+#: g10/g10.c:224
 msgid "list keys and signatures"
 msgstr "vis n�gler og signaturer"
 
-#: g10/g10.c:224
+#: g10/g10.c:225
 msgid "check key signatures"
 msgstr "tjek n�glesignaturer"
 
-#: g10/g10.c:225
+#: g10/g10.c:226
 msgid "list keys and fingerprints"
 msgstr "vis n�gle og fingeraftryk"
 
-#: g10/g10.c:226
+#: g10/g10.c:227
 msgid "list secret keys"
 msgstr "vis hemmelige n�gler"
 
-#: g10/g10.c:227
+#: g10/g10.c:228
 msgid "generate a new key pair"
 msgstr "gener�r et nyt n�glepar"
 
-#: g10/g10.c:228
+#: g10/g10.c:229
 msgid "remove key from the public keyring"
 msgstr "fjern n�gle fra den offentlige n�glering"
 
-#: g10/g10.c:230
+#: g10/g10.c:231
 msgid "remove key from the secret keyring"
 msgstr "fjern n�gle fra den hemmelige n�glering"
 
-#: g10/g10.c:231
+#: g10/g10.c:232
 msgid "sign a key"
 msgstr "sign�r en n�gle"
 
-#: g10/g10.c:232
+#: g10/g10.c:233
 msgid "sign a key locally"
 msgstr "sign�r en n�gle lokalt"
 
-#: g10/g10.c:233
+#: g10/g10.c:234
 msgid "sign or edit a key"
 msgstr "sign�r eller redig�r en n�gle"
 
-#: g10/g10.c:234
+#: g10/g10.c:235
 msgid "generate a revocation certificate"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/g10.c:235
+#: g10/g10.c:236
 msgid "export keys"
 msgstr "eksport�r n�gler"
 
-#: g10/g10.c:236
+#: g10/g10.c:237
 msgid "export keys to a key server"
 msgstr "eksport�r n�gler til en n�gletjener"
 
-#: g10/g10.c:237
+#: g10/g10.c:238
 msgid "import keys from a key server"
 msgstr "import�r n�gler fra en n�gleserver"
 
-#: g10/g10.c:241
+#: g10/g10.c:242
 msgid "import/merge keys"
 msgstr "import�r/fusion�r n�gler"
 
-#: g10/g10.c:243
+#: g10/g10.c:244
 msgid "list only the sequence of packets"
 msgstr "vis kun pakkesekvensen"
 
-#: g10/g10.c:245
+#: g10/g10.c:246
 msgid "export the ownertrust values"
 msgstr "eksport�r ejertillidsv�rdierne"
 
-#: g10/g10.c:247
+#: g10/g10.c:248
 msgid "import ownertrust values"
 msgstr "import�r ejertillidsv�rdierne"
 
-#: g10/g10.c:249
+#: g10/g10.c:250
 msgid "update the trust database"
 msgstr "opdat�r tillidsdatabasen"
 
-#: g10/g10.c:251
+#: g10/g10.c:252
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NAMES]|tjek tillidsdatabasen"
 
-#: g10/g10.c:252
+#: g10/g10.c:253
 msgid "fix a corrupted trust database"
 msgstr "repar�r en �delagt tillidsdatabase"
 
-#: g10/g10.c:253
+#: g10/g10.c:254
 msgid "De-Armor a file or stdin"
 msgstr "De-beskydt en fil el. stdin"
 
-#: g10/g10.c:255
+#: g10/g10.c:256
 msgid "En-Armor a file or stdin"
 msgstr "Beskydt en fil el. stdin"
 
-#: g10/g10.c:257
+#: g10/g10.c:258
 msgid "|algo [files]|print message digests"
 msgstr "|algo [filer]|print meddelelsesresum�"
 
-#: g10/g10.c:261
+#: g10/g10.c:262
 msgid ""
 "@\n"
 "Options:\n"
@@ -488,162 +488,162 @@ msgstr ""
 "Indstillinger:\n"
 " "
 
-#: g10/g10.c:263
+#: g10/g10.c:264
 msgid "create ascii armored output"
 msgstr "opret ascii beskyttet uddata"
 
-#: g10/g10.c:265
+#: g10/g10.c:266
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|krypt�r for NAME"
 
-#: g10/g10.c:268
+#: g10/g10.c:269
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAME|brug NAME som standard modtager"
 
-#: g10/g10.c:270
+#: g10/g10.c:271
 msgid "use the default key as default recipient"
 msgstr "brug standard n�glen som standard modtager"
 
-#: g10/g10.c:274
+#: g10/g10.c:275
 msgid "use this user-id to sign or decrypt"
 msgstr "brug denne bruger-id til at signere eller dekryptere"
 
-#: g10/g10.c:275
+#: g10/g10.c:276
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|s�t kompresningsniveau N (0 = sl�et fra)"
 
-#: g10/g10.c:277
+#: g10/g10.c:278
 msgid "use canonical text mode"
 msgstr "brug kanonisk tekstmodus"
 
-#: g10/g10.c:278
+#: g10/g10.c:279
 msgid "use as output file"
 msgstr "brug som uddatafil"
 
-#: g10/g10.c:279
+#: g10/g10.c:280
 msgid "verbose"
 msgstr "meddelsom"
 
-#: g10/g10.c:280
+#: g10/g10.c:281
 msgid "be somewhat more quiet"
 msgstr "v�r mere stille"
 
-#: g10/g10.c:281
+#: g10/g10.c:282
 msgid "don't use the terminal at all"
 msgstr "brug overhovedet ikke terminalen"
 
-#: g10/g10.c:282
+#: g10/g10.c:283
 msgid "force v3 signatures"
 msgstr "tving v3 signaturer"
 
-#: g10/g10.c:283
+#: g10/g10.c:284
 msgid "always use a MDC for encryption"
 msgstr "brug altid en MDC for kryptering"
 
-#: g10/g10.c:284
+#: g10/g10.c:285
 msgid "do not make any changes"
 msgstr "lav ingen �ndringer"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:286
+#: g10/g10.c:287
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/g10.c:287
+#: g10/g10.c:288
 msgid "batch mode: never ask"
 msgstr "k�rselsmodus: sp�rg aldrig"
 
-#: g10/g10.c:288
+#: g10/g10.c:289
 msgid "assume yes on most questions"
 msgstr "forvent ja til de fleste spr�gsm�l"
 
-#: g10/g10.c:289
+#: g10/g10.c:290
 msgid "assume no on most questions"
 msgstr "forvent nej til de fleste spr�gsm�l"
 
-#: g10/g10.c:290
+#: g10/g10.c:291
 msgid "add this keyring to the list of keyrings"
 msgstr "tilf�j denne n�glering til n�gleringslisten"
 
-#: g10/g10.c:291
+#: g10/g10.c:292
 msgid "add this secret keyring to the list"
 msgstr "tilf�j denne hemmeligen�glering til listen"
 
-#: g10/g10.c:292
+#: g10/g10.c:293
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|brug NAME som standard hemmelign�gle"
 
-#: g10/g10.c:293
+#: g10/g10.c:294
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|brug denne n�gletjener til at sl� n�gler op"
 
-#: g10/g10.c:294
+#: g10/g10.c:295
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAME|s�t terminal karakters�t til NAME"
 
-#: g10/g10.c:295
+#: g10/g10.c:296
 msgid "read options from file"
 msgstr "l�s indstillinger fra fil"
 
-#: g10/g10.c:299
+#: g10/g10.c:300
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skriv statusinfo til denne FD"
 
-#: g10/g10.c:304
+#: g10/g10.c:305
 msgid "|KEYID|ulimately trust this key"
 msgstr ""
 
-#: g10/g10.c:305
+#: g10/g10.c:306
 msgid "|FILE|load extension module FILE"
 msgstr "|FILE|indl�s udvidelsesmodul FILE"
 
-#: g10/g10.c:306
+#: g10/g10.c:307
 msgid "emulate the mode described in RFC1991"
 msgstr "emul�r modusen beskrevet i RFC1991"
 
-#: g10/g10.c:307
+#: g10/g10.c:308
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "s�t alle pakker, cifre og resum� flag til OpenPGP standard"
 
-#: g10/g10.c:308
+#: g10/g10.c:309
 msgid "|N|use passphrase mode N"
 msgstr "|N|brug pasfrasemodus N"
 
-#: g10/g10.c:310
+#: g10/g10.c:311
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAME|brug meddelelses resum�algoritme NAME for pasfrase"
 
-#: g10/g10.c:312
+#: g10/g10.c:313
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAME|brug cifrealgoritme NAME for pasfrase"
 
-#: g10/g10.c:313
+#: g10/g10.c:314
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|brug cifferalgoritme NAME"
 
-#: g10/g10.c:314
+#: g10/g10.c:315
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|brug meddelelsesresum� algoritme NAME"
 
-#: g10/g10.c:315
+#: g10/g10.c:316
 msgid "|N|use compress algorithm N"
 msgstr "|N|brug kompresalgoritme N"
 
-#: g10/g10.c:316
+#: g10/g10.c:317
 msgid "throw keyid field of encrypted packets"
 msgstr ""
 
-#: g10/g10.c:317
+#: g10/g10.c:318
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NAME=VALUE|brug denne notationsdata"
 
-#: g10/g10.c:320
+#: g10/g10.c:321
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:323
+#: g10/g10.c:324
 msgid ""
 "@\n"
 "Examples:\n"
@@ -663,16 +663,16 @@ msgstr ""
 " --list-keys [navne]        vis n�gler\n"
 " --fingerprint [navne]      vis fingeraftryk\n"
 
-#: g10/g10.c:427
+#: g10/g10.c:429
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Rapport�r venligst fejl til <[email protected]>.\n"
 
-#: g10/g10.c:431
+#: g10/g10.c:433
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
 
 # Skal alt dette overs�ttes eller er det flagene?
-#: g10/g10.c:434
+#: g10/g10.c:436
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -682,7 +682,7 @@ msgstr ""
 "sign, check, encrypt eller decrypt\n"
 "standard operation afh�nger af inddata\n"
 
-#: g10/g10.c:441
+#: g10/g10.c:443
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -690,199 +690,199 @@ msgstr ""
 "\n"
 "Underst�ttede algoritmer:\n"
 
-#: g10/g10.c:520
+#: g10/g10.c:522
 msgid "usage: gpg [options] "
 msgstr "brug: gpg [flag] "
 
-#: g10/g10.c:573
+#: g10/g10.c:575
 msgid "conflicting commands\n"
 msgstr "konfliktende kommandoer\n"
 
-#: g10/g10.c:713
+#: g10/g10.c:725
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTITS: ingen standard alternativfil '%s'\n"
 
-#: g10/g10.c:717
+#: g10/g10.c:729
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "alternativfil`%s': %s\n"
 
-#: g10/g10.c:724
+#: g10/g10.c:736
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "l�ser indstillinger fra `%s'\n"
 
-#: g10/g10.c:925
+#: g10/g10.c:937
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/g10.c:994
+#: g10/g10.c:1008
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/g10.c:998 g10/g10.c:1007
+#: g10/g10.c:1012 g10/g10.c:1021
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTITS: %s er ikke til normal brug!\n"
 
-#: g10/g10.c:1000
+#: g10/g10.c:1014
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ikke tilladt med %s!\n"
 
-#: g10/g10.c:1003
+#: g10/g10.c:1017
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s er meningsl�s sammen med %s!\n"
 
-#: g10/g10.c:1023 g10/g10.c:1035
+#: g10/g10.c:1037 g10/g10.c:1049
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
-#: g10/g10.c:1029 g10/g10.c:1041
+#: g10/g10.c:1043 g10/g10.c:1055
 msgid "selected digest algorithm is invalid\n"
 msgstr "valgte resum�algoritme er ugyldig\n"
 
-#: g10/g10.c:1045
+#: g10/g10.c:1059
 msgid "the given policy URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/g10.c:1048
+#: g10/g10.c:1062
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr ""
 
-#: g10/g10.c:1050
+#: g10/g10.c:1064
 msgid "completes-needed must be greater than 0\n"
 msgstr ""
 
-#: g10/g10.c:1052
+#: g10/g10.c:1066
 msgid "marginals-needed must be greater than 1\n"
 msgstr ""
 
-#: g10/g10.c:1054
+#: g10/g10.c:1068
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr ""
 
-#: g10/g10.c:1057
+#: g10/g10.c:1071
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTE: simpel S2K modus (0) frar�des p� det skarpeste\n"
 
-#: g10/g10.c:1061
+#: g10/g10.c:1075
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ugyldig S2K modus; skal v�re 0, 1 el. 3\n"
 
 # er det klogt at overs�tte TrustDB?
-#: g10/g10.c:1146
+#: g10/g10.c:1160
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: g10/g10.c:1152
+#: g10/g10.c:1166
 msgid "--store [filename]"
 msgstr "--store [filnavn (som gemmes)]"
 
-#: g10/g10.c:1159
+#: g10/g10.c:1173
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/g10.c:1167
+#: g10/g10.c:1181
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnavn (som krypteres)]"
 
-#: g10/g10.c:1180
+#: g10/g10.c:1194
 msgid "--sign [filename]"
 msgstr "--sign [filnavn (som signeres)]"
 
-#: g10/g10.c:1193
+#: g10/g10.c:1207
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/g10.c:1207
+#: g10/g10.c:1221
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnavn]"
 
-#: g10/g10.c:1224
+#: g10/g10.c:1238
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnavn (som dekrypteres)]"
 
-#: g10/g10.c:1232
+#: g10/g10.c:1246
 msgid "--sign-key user-id"
 msgstr "--sign-key bruger-id"
 
-#: g10/g10.c:1240
+#: g10/g10.c:1254
 msgid "--lsign-key user-id"
 msgstr "--lsign-key bruger-id"
 
-#: g10/g10.c:1248
+#: g10/g10.c:1262
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key bruger-id [kommandoer]"
 
-#: g10/g10.c:1264
+#: g10/g10.c:1278
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key bruger-id"
 
-#: g10/g10.c:1267
+#: g10/g10.c:1281
 msgid "--delete-key user-id"
 msgstr "--delete-key bruger-id"
 
-#: g10/encode.c:268 g10/g10.c:1304 g10/sign.c:393
+#: g10/encode.c:268 g10/g10.c:1318 g10/sign.c:393
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "kan ikke �bne %s: %s\n"
 
-#: g10/g10.c:1319
+#: g10/g10.c:1333
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [bruger-id] [n�glering]"
 
-#: g10/g10.c:1385
+#: g10/g10.c:1399
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/g10.c:1393
+#: g10/g10.c:1407
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/g10.c:1464
+#: g10/g10.c:1478
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ugyldig hash-algoritme `%s'\n"
 
-#: g10/g10.c:1551
+#: g10/g10.c:1565
 msgid "[filename]"
 msgstr "[filnavn]"
 
-#: g10/g10.c:1555
+#: g10/g10.c:1569
 msgid "Go ahead and type your message ...\n"
 msgstr "G� til sagen og skriv meddelelsen ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1558 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:59 g10/g10.c:1572 g10/verify.c:94 g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan ikke �bne `%s'\n"
 
-#: g10/g10.c:1767
+#: g10/g10.c:1781
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr ""
 "f�rste bogstav af en notationsnavn skal v�re et bogstave eller en "
 "understregning\n"
 
-#: g10/g10.c:1773
+#: g10/g10.c:1787
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
 msgstr ""
 
-#: g10/g10.c:1779
+#: g10/g10.c:1793
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr ""
 
-#: g10/g10.c:1787
+#: g10/g10.c:1801
 msgid "a notation value must not use any control characters\n"
 msgstr "en notationsv�rdi m� ikke bruge nogen kontroltegn\n"
 
@@ -1506,44 +1506,44 @@ msgstr "DSA n�glepar vil have 1024 bit.\n"
 msgid "Key generation canceled.\n"
 msgstr "N�gleoprettelse annulleret.\n"
 
-#: g10/keygen.c:1571
+#: g10/keygen.c:1572
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skriver offentligt certifikat til '%s'\n"
 
-#: g10/keygen.c:1572
+#: g10/keygen.c:1573
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/keygen.c:1668
+#: g10/keygen.c:1670
 msgid "public and secret key created and signed.\n"
 msgstr "offentlig og hemmelig n�gle oprettet og signeret.\n"
 
-#: g10/keygen.c:1673
+#: g10/keygen.c:1675
 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"
 msgstr ""
 
-#: g10/keygen.c:1690 g10/keygen.c:1791
+#: g10/keygen.c:1692 g10/keygen.c:1798
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr ""
 
-#: g10/keygen.c:1734 g10/sig-check.c:315 g10/sign.c:112
+#: g10/keygen.c:1739 g10/sig-check.c:315 g10/sign.c:112
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:1736 g10/sig-check.c:317 g10/sign.c:114
+#: g10/keygen.c:1741 g10/sig-check.c:317 g10/sign.c:114
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 
-#: g10/keygen.c:1769
+#: g10/keygen.c:1774
 msgid "Really create? "
 msgstr "Vil du virkelig oprette?"
 
@@ -2484,7 +2484,7 @@ msgid "revoked"
 msgstr ""
 
 #. of subkey
-#: g10/keylist.c:400 g10/mainproc.c:834
+#: g10/keylist.c:404 g10/mainproc.c:834
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "N�gle udl�ber d. %s\n"
@@ -2632,7 +2632,7 @@ msgstr ""
 msgid "can't connect to `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:557
+#: g10/passphrase.c:313 g10/passphrase.c:574
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (hovedn�gle-ID %08lX)"
@@ -2672,27 +2672,27 @@ msgstr ""
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
 
-#: g10/passphrase.c:543
+#: g10/passphrase.c:560
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
 "user: \""
 msgstr ""
 
-#: g10/passphrase.c:552
+#: g10/passphrase.c:569
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr ""
 
-#: g10/passphrase.c:590
+#: g10/passphrase.c:607
 msgid "can't query password in batchmode\n"
 msgstr ""
 
-#: g10/passphrase.c:594
+#: g10/passphrase.c:611
 msgid "Enter passphrase: "
 msgstr "Indtast kodes�tning: "
 
-#: g10/passphrase.c:598
+#: g10/passphrase.c:615
 msgid "Repeat passphrase: "
 msgstr "Gentag kodes�tning: "
 
@@ -2820,12 +2820,12 @@ msgstr ""
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr ""
 
-#: g10/sig-check.c:324
+#: g10/sig-check.c:328
 #, c-format
-msgid "NOTE: signature key expired %s\n"
+msgid "NOTE: signature key %08lX expired %s\n"
 msgstr ""
 
-#: g10/sig-check.c:393
+#: g10/sig-check.c:398
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 
diff --git a/po/de.po b/po/de.po
index 7d6f91f14..fd1776852 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.0h\n"
-"POT-Creation-Date: 2000-12-19 11:58+0100\n"
+"POT-Creation-Date: 2001-01-11 13:11+0100\n"
 "PO-Revision-Date: 2000-10-15 14:30+0200\n"
 "Last-Translator: Walter Koch <[email protected]>\n"
 "Language-Team: German <[email protected]>\n"
@@ -340,7 +340,7 @@ msgstr ""
 "Arbeiten durch, damit das Betriebssystem weitere Entropie sammeln kann!\n"
 "(Es werden noch %d Byte ben�tigt.)\n"
 
-#: g10/g10.c:210
+#: g10/g10.c:211
 msgid ""
 "@Commands:\n"
 " "
@@ -348,139 +348,139 @@ msgstr ""
 "@Befehle:\n"
 " "
 
-#: g10/g10.c:212
+#: g10/g10.c:213
 msgid "|[file]|make a signature"
 msgstr "|[Datei]|Eine Unterschrift erzeugen"
 
-#: g10/g10.c:213
+#: g10/g10.c:214
 msgid "|[file]|make a clear text signature"
 msgstr "|[Datei]|Eine Klartextunterschrift erzeugen"
 
-#: g10/g10.c:214
+#: g10/g10.c:215
 msgid "make a detached signature"
 msgstr "Eine abgetrennte Unterschrift erzeugen"
 
-#: g10/g10.c:215
+#: g10/g10.c:216
 msgid "encrypt data"
 msgstr "Daten verschl�sseln"
 
-#: g10/g10.c:216
+#: g10/g10.c:217
 msgid "encryption only with symmetric cipher"
 msgstr "Daten symmetrisch verschl�sseln"
 
-#: g10/g10.c:217
+#: g10/g10.c:218
 msgid "store only"
 msgstr "Nur speichern"
 
-#: g10/g10.c:218
+#: g10/g10.c:219
 msgid "decrypt data (default)"
 msgstr "Daten entschl�sseln (Voreinstellung)"
 
-#: g10/g10.c:219
+#: g10/g10.c:220
 msgid "verify a signature"
 msgstr "Signatur pr�fen"
 
-#: g10/g10.c:221
+#: g10/g10.c:222
 msgid "list keys"
 msgstr "Liste der Schl�ssel"
 
-#: g10/g10.c:223
+#: g10/g10.c:224
 msgid "list keys and signatures"
 msgstr "Liste der Schl�ssel und ihrer Signaturen"
 
-#: g10/g10.c:224
+#: g10/g10.c:225
 msgid "check key signatures"
 msgstr "Signaturen der Schl�ssel pr�fen"
 
-#: g10/g10.c:225
+#: g10/g10.c:226
 msgid "list keys and fingerprints"
 msgstr "Liste der Schl�ssel und ihrer \"Fingerabdr�cke\""
 
-#: g10/g10.c:226
+#: g10/g10.c:227
 msgid "list secret keys"
 msgstr "Liste der geheimen Schl�ssel"
 
-#: g10/g10.c:227
+#: g10/g10.c:228
 msgid "generate a new key pair"
 msgstr "Ein neues Schl�sselpaar erzeugen"
 
-#: g10/g10.c:228
+#: g10/g10.c:229
 msgid "remove key from the public keyring"
 msgstr "Schl�ssel aus dem �ff. Schl�sselbund entfernen"
 
-#: g10/g10.c:230
+#: g10/g10.c:231
 msgid "remove key from the secret keyring"
 msgstr "Schl�ssel aus dem geh. Schl�sselbund entfernen"
 
-#: g10/g10.c:231
+#: g10/g10.c:232
 msgid "sign a key"
 msgstr "Schl�ssel signieren"
 
-#: g10/g10.c:232
+#: g10/g10.c:233
 msgid "sign a key locally"
 msgstr "Schl�ssel nur auf diesem Rechner signieren"
 
-#: g10/g10.c:233
+#: g10/g10.c:234
 msgid "sign or edit a key"
 msgstr "Unterschreiben oder Bearbeiten eines Schl."
 
-#: g10/g10.c:234
+#: g10/g10.c:235
 msgid "generate a revocation certificate"
 msgstr "Ein Schl�sselwiderruf-Zertifikat erzeugen"
 
-#: g10/g10.c:235
+#: g10/g10.c:236
 msgid "export keys"
 msgstr "Schl�ssel exportieren"
 
-#: g10/g10.c:236
+#: g10/g10.c:237
 msgid "export keys to a key server"
 msgstr "Schl�ssel zu einem Schl�.server exportieren"
 
-#: g10/g10.c:237
+#: g10/g10.c:238
 msgid "import keys from a key server"
 msgstr "Schl�ssel von einem Schl�.server importieren"
 
-#: g10/g10.c:241
+#: g10/g10.c:242
 msgid "import/merge keys"
 msgstr "Schl�ssel importieren/kombinieren"
 
-#: g10/g10.c:243
+#: g10/g10.c:244
 msgid "list only the sequence of packets"
 msgstr "Lediglich Struktur der Datenpakete anzeigen"
 
-#: g10/g10.c:245
+#: g10/g10.c:246
 msgid "export the ownertrust values"
 msgstr "Exportieren der \"Owner trust\" Werte"
 
-#: g10/g10.c:247
+#: g10/g10.c:248
 msgid "import ownertrust values"
 msgstr "Importieren der \"Owner trust\" Werte"
 
-#: g10/g10.c:249
+#: g10/g10.c:250
 msgid "update the trust database"
 msgstr "�ndern der \"Trust\"-Datenbank"
 
-#: g10/g10.c:251
+#: g10/g10.c:252
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NAMEN]|�berpr�fen der \"Trust\"-Datenbank"
 
-#: g10/g10.c:252
+#: g10/g10.c:253
 msgid "fix a corrupted trust database"
 msgstr "Reparieren einer besch�digten \"Trust\"-Datenb."
 
-#: g10/g10.c:253
+#: g10/g10.c:254
 msgid "De-Armor a file or stdin"
 msgstr "Datei oder stdin von der ASCII-H�lle befreien"
 
-#: g10/g10.c:255
+#: g10/g10.c:256
 msgid "En-Armor a file or stdin"
 msgstr "Datei oder stdin in eine ASCII-H�lle einpacken"
 
-#: g10/g10.c:257
+#: g10/g10.c:258
 msgid "|algo [files]|print message digests"
 msgstr "|algo [Dateien]|Message-Digests f�r die Dateien ausgeben"
 
-#: g10/g10.c:261
+#: g10/g10.c:262
 msgid ""
 "@\n"
 "Options:\n"
@@ -490,160 +490,160 @@ msgstr ""
 "Optionen:\n"
 " "
 
-#: g10/g10.c:263
+#: g10/g10.c:264
 msgid "create ascii armored output"
 msgstr "Ausgabe mit ASCII-H�lle versehen"
 
-#: g10/g10.c:265
+#: g10/g10.c:266
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|Verschl�sseln f�r NAME"
 
-#: g10/g10.c:268
+#: g10/g10.c:269
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAME|NAME als voreingestellten Empf�nger benutzen"
 
-#: g10/g10.c:270
+#: g10/g10.c:271
 msgid "use the default key as default recipient"
 msgstr ""
 "Den Standardschl�ssel als voreingestellten\n"
 "Empf�nger benutzen"
 
-#: g10/g10.c:274
+#: g10/g10.c:275
 msgid "use this user-id to sign or decrypt"
 msgstr "Mit dieser User-ID signieren"
 
-#: g10/g10.c:275
+#: g10/g10.c:276
 msgid "|N|set compress level N (0 disables)"
 msgstr "Kompressionsstufe auf N setzen (0=keine)"
 
-#: g10/g10.c:277
+#: g10/g10.c:278
 msgid "use canonical text mode"
 msgstr "Textmodus benutzen"
 
-#: g10/g10.c:278
+#: g10/g10.c:279
 msgid "use as output file"
 msgstr "Als Ausgabedatei benutzen"
 
-#: g10/g10.c:279
+#: g10/g10.c:280
 msgid "verbose"
 msgstr "Detaillierte Informationen"
 
-#: g10/g10.c:280
+#: g10/g10.c:281
 msgid "be somewhat more quiet"
 msgstr "Etwas weniger Infos"
 
-#: g10/g10.c:281
+#: g10/g10.c:282
 msgid "don't use the terminal at all"
 msgstr "das Terminal gar nicht benutzen"
 
-#: g10/g10.c:282
+#: g10/g10.c:283
 msgid "force v3 signatures"
 msgstr "v3 Signaturen erzwingen"
 
-#: g10/g10.c:283
+#: g10/g10.c:284
 msgid "always use a MDC for encryption"
 msgstr "Beim Verschl�sseln ein Siegel (MDC) verwenden"
 
-#: g10/g10.c:284
+#: g10/g10.c:285
 msgid "do not make any changes"
 msgstr "Keine wirklichen �nderungen durchf�hren"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:286
+#: g10/g10.c:287
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/g10.c:287
+#: g10/g10.c:288
 msgid "batch mode: never ask"
 msgstr "Stapelmodus: Keine Abfragen"
 
-#: g10/g10.c:288
+#: g10/g10.c:289
 msgid "assume yes on most questions"
 msgstr "\"Ja\" als Standardantwort annehmen"
 
-#: g10/g10.c:289
+#: g10/g10.c:290
 msgid "assume no on most questions"
 msgstr "\"Nein\" als Standardantwort annehmen"
 
-#: g10/g10.c:290
+#: g10/g10.c:291
 msgid "add this keyring to the list of keyrings"
 msgstr "Als �ffentlichen Schl�sselbund mitbenutzen"
 
-#: g10/g10.c:291
+#: g10/g10.c:292
 msgid "add this secret keyring to the list"
 msgstr "Als geheimen Schl�sselbund mitbenutzen"
 
-#: g10/g10.c:292
+#: g10/g10.c:293
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|NAME als voreingestellten Schl�ssel benutzen"
 
-#: g10/g10.c:293
+#: g10/g10.c:294
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|Schl�ssel bei diesem Server nachschlagen"
 
-#: g10/g10.c:294
+#: g10/g10.c:295
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAME|Terminalzeichensatz NAME benutzen"
 
-#: g10/g10.c:295
+#: g10/g10.c:296
 msgid "read options from file"
 msgstr "Optionen aus der Datei lesen"
 
-#: g10/g10.c:299
+#: g10/g10.c:300
 msgid "|FD|write status info to this FD"
 msgstr "|FD|Statusinfo auf FD (Dateihandle) ausgeben"
 
-#: g10/g10.c:304
+#: g10/g10.c:305
 msgid "|KEYID|ulimately trust this key"
 msgstr "|KEYID|diesem Schl�ssel uneingeschr�nkt vertrauen"
 
-#: g10/g10.c:305
+#: g10/g10.c:306
 msgid "|FILE|load extension module FILE"
 msgstr "|DATEI|Erweiterungsmodul DATEI laden"
 
-#: g10/g10.c:306
+#: g10/g10.c:307
 msgid "emulate the mode described in RFC1991"
 msgstr "Den in RFC1991 beschriebenen Modus nachahmen"
 
-#: g10/g10.c:307
+#: g10/g10.c:308
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 "alle Paket-, Verschl�sselungs- und\n"
 "Hashoptionen auf OpenPGP-Verhalten einstellen"
 
-#: g10/g10.c:308
+#: g10/g10.c:309
 msgid "|N|use passphrase mode N"
 msgstr "|N|Verwenden des Mantra-Modus N"
 
-#: g10/g10.c:310
+#: g10/g10.c:311
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAME|Hashverfahren NAME f�r Mantras benutzen"
 
-#: g10/g10.c:312
+#: g10/g10.c:313
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAME|Verschl�.verfahren NAME f�r Mantras benutzen"
 
-#: g10/g10.c:313
+#: g10/g10.c:314
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|Verschl�.verfahren NAME benutzen"
 
-#: g10/g10.c:314
+#: g10/g10.c:315
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|Hashverfahren NAME benutzen"
 
-#: g10/g10.c:315
+#: g10/g10.c:316
 msgid "|N|use compress algorithm N"
 msgstr "|N|Komprimierverfahren N benutzen"
 
-#: g10/g10.c:316
+#: g10/g10.c:317
 msgid "throw keyid field of encrypted packets"
 msgstr "Entferne Empf�nger-ID verschl�sselter Pakete"
 
-#: g10/g10.c:317
+#: g10/g10.c:318
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NAME=WERT|verwende diese \"notation\"-Daten"
 
-#: g10/g10.c:320
+#: g10/g10.c:321
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -652,7 +652,7 @@ msgstr ""
 "(Auf der \"man\"-Seite ist eine vollst�ndige Liste aller Kommandos und "
 "Optionen)\n"
 
-#: g10/g10.c:323
+#: g10/g10.c:324
 msgid ""
 "@\n"
 "Examples:\n"
@@ -672,17 +672,17 @@ msgstr ""
 " --list-keys [Namen]        Schl�ssel anzeigen\n"
 " --fingerprint [Namen]      \"Fingerabdr�cke\" anzeigen\n"
 
-#: g10/g10.c:427
+#: g10/g10.c:429
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Berichte �ber Bugs (Programmfehler) bitte an <[email protected]>.\n"
 "Sinn- oder Schreibfehler in den deutschen Texten bitte an <[email protected]>.\n"
 
-#: g10/g10.c:431
+#: g10/g10.c:433
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Aufruf: gpg [Optionen] [Dateien] (-h f�r Hilfe)"
 
-#: g10/g10.c:434
+#: g10/g10.c:436
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -692,7 +692,7 @@ msgstr ""
 "Signieren, pr�fen, verschl�sseln, entschl�sseln\n"
 "Die voreingestellte Operation ist abh�ngig von den Eingabedaten\n"
 
-#: g10/g10.c:441
+#: g10/g10.c:443
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -700,188 +700,188 @@ msgstr ""
 "\n"
 "Unterst�tzte Verfahren:\n"
 
-#: g10/g10.c:520
+#: g10/g10.c:522
 msgid "usage: gpg [options] "
 msgstr "Aufruf: gpg [Optionen] "
 
-#: g10/g10.c:573
+#: g10/g10.c:575
 msgid "conflicting commands\n"
 msgstr "Widerspr�chliche Befehle\n"
 
-#: g10/g10.c:713
+#: g10/g10.c:725
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n"
 
-#: g10/g10.c:717
+#: g10/g10.c:729
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "Optionendatei '%s': %s\n"
 
-#: g10/g10.c:724
+#: g10/g10.c:736
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Optionen werden aus '%s' gelesen\n"
 
-#: g10/g10.c:925
+#: g10/g10.c:937
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s ist kein g�ltiger Zeichensatz.\n"
 
-#: g10/g10.c:994
+#: g10/g10.c:1008
 msgid "WARNING: program may create a core file!\n"
 msgstr "WARNUNG: Programm k�nnte eine core-dump-Datei schreiben!\n"
 
-#: g10/g10.c:998 g10/g10.c:1007
+#: g10/g10.c:1012 g10/g10.c:1021
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "Hinweis: %s ist nicht f�r den �blichen Gebrauch gedacht!\n"
 
-#: g10/g10.c:1000
+#: g10/g10.c:1014
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s kann nicht zusammen mit %s verwendet werden!\n"
 
-#: g10/g10.c:1003
+#: g10/g10.c:1017
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s zusammen mit %s ist nicht sinnvoll!\n"
 
-#: g10/g10.c:1023 g10/g10.c:1035
+#: g10/g10.c:1037 g10/g10.c:1049
 msgid "selected cipher algorithm is invalid\n"
 msgstr "Das ausgew�hlte Verschl�sslungsverfahren ist ung�ltig\n"
 
-#: g10/g10.c:1029 g10/g10.c:1041
+#: g10/g10.c:1043 g10/g10.c:1055
 msgid "selected digest algorithm is invalid\n"
 msgstr "Das ausgew�hlte Hashverfahren ist ung�ltig\n"
 
-#: g10/g10.c:1045
+#: g10/g10.c:1059
 msgid "the given policy URL is invalid\n"
 msgstr "Die angegebene URL f�r Richtlinien ist ung�ltig\n"
 
-#: g10/g10.c:1048
+#: g10/g10.c:1062
 #, 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:1050
+#: g10/g10.c:1064
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed m�ssen gr��er als 0 sein\n"
 
-#: g10/g10.c:1052
+#: g10/g10.c:1066
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed m�ssen gr��er als 1 sein\n"
 
-#: g10/g10.c:1054
+#: g10/g10.c:1068
 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:1057
+#: g10/g10.c:1071
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n"
 
-#: g10/g10.c:1061
+#: g10/g10.c:1075
 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:1146
+#: g10/g10.c:1160
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
 
-#: g10/g10.c:1152
+#: g10/g10.c:1166
 msgid "--store [filename]"
 msgstr "--store [Dateiname]"
 
-#: g10/g10.c:1159
+#: g10/g10.c:1173
 msgid "--symmetric [filename]"
 msgstr "--symmetric [Dateiname]"
 
-#: g10/g10.c:1167
+#: g10/g10.c:1181
 msgid "--encrypt [filename]"
 msgstr "--encrypt [Dateiname]"
 
-#: g10/g10.c:1180
+#: g10/g10.c:1194
 msgid "--sign [filename]"
 msgstr "--sign [Dateiname]"
 
-#: g10/g10.c:1193
+#: g10/g10.c:1207
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [Dateiname]"
 
-#: g10/g10.c:1207
+#: g10/g10.c:1221
 msgid "--clearsign [filename]"
 msgstr "--clearsign [Dateiname]"
 
-#: g10/g10.c:1224
+#: g10/g10.c:1238
 msgid "--decrypt [filename]"
 msgstr "--decrypt [Dateiname]"
 
-#: g10/g10.c:1232
+#: g10/g10.c:1246
 msgid "--sign-key user-id"
 msgstr "--sign-key User-ID"
 
-#: g10/g10.c:1240
+#: g10/g10.c:1254
 msgid "--lsign-key user-id"
 msgstr "--lsign-key User-ID"
 
-#: g10/g10.c:1248
+#: g10/g10.c:1262
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key User-ID [Befehle]"
 
-#: g10/g10.c:1264
+#: g10/g10.c:1278
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key User-ID"
 
-#: g10/g10.c:1267
+#: g10/g10.c:1281
 msgid "--delete-key user-id"
 msgstr "--delete-key User-ID"
 
-#: g10/encode.c:268 g10/g10.c:1304 g10/sign.c:393
+#: g10/encode.c:268 g10/g10.c:1318 g10/sign.c:393
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "'%s' kann nicht ge�ffnet werden: %s\n"
 
-#: g10/g10.c:1319
+#: g10/g10.c:1333
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [User-ID] [Schl�sselbund]"
 
-#: g10/g10.c:1385
+#: g10/g10.c:1399
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "Entfernen der ASCII-H�lle ist fehlgeschlagen: %s\n"
 
-#: g10/g10.c:1393
+#: g10/g10.c:1407
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "Anbringen der ASCII-H�lle ist fehlgeschlagen: %s\n"
 
-#: g10/g10.c:1464
+#: g10/g10.c:1478
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "Ung�ltiges Hashverfahren '%s'\n"
 
-#: g10/g10.c:1551
+#: g10/g10.c:1565
 msgid "[filename]"
 msgstr "[Dateiname]"
 
-#: g10/g10.c:1555
+#: g10/g10.c:1569
 msgid "Go ahead and type your message ...\n"
 msgstr "Auf geht's - Botschaft eintippen ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1558 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:59 g10/g10.c:1572 g10/verify.c:94 g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "'%s' kann nicht ge�ffnet werden\n"
 
-#: g10/g10.c:1767
+#: g10/g10.c:1781
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr ""
 "Das erste Zeichen eines \"notation\"-Namens mu� ein Buchstabe oder\n"
 "ein Unterstrich sein\n"
 
-#: g10/g10.c:1773
+#: g10/g10.c:1787
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -889,12 +889,12 @@ msgstr ""
 "Ein \"notation\"-Name darf nur Buchstaben, Zahlen, Punkte oder Unterstriche "
 "enthalten und mu� mit einem '=' enden\n"
 
-#: g10/g10.c:1779
+#: g10/g10.c:1793
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr ""
 "Punkte in einem \"notation\"-Namen m�ssen von anderen Zeichen umgeben sein\n"
 
-#: g10/g10.c:1787
+#: g10/g10.c:1801
 msgid "a notation value must not use any control characters\n"
 msgstr "Ein \"notation\"-Wert darf keine Kontrollzeichen verwenden\n"
 
@@ -1588,21 +1588,21 @@ msgstr "Der DSA Schl�ssel wird 1024 Bit haben.\n"
 msgid "Key generation canceled.\n"
 msgstr "Schl�sselerzeugung abgebrochen.\n"
 
-#: g10/keygen.c:1571
+#: g10/keygen.c:1572
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "schreiben des �ffentlichen Schl�ssels nach '%s'\n"
 
-#: g10/keygen.c:1572
+#: g10/keygen.c:1573
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "schreiben des geheimen Schl�ssels nach '%s'\n"
 
-#: g10/keygen.c:1668
+#: g10/keygen.c:1670
 msgid "public and secret key created and signed.\n"
 msgstr "�ffentlichen und geheimen Schl�ssel erzeugt und signiert.\n"
 
-#: g10/keygen.c:1673
+#: g10/keygen.c:1675
 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"
@@ -1611,12 +1611,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:1690 g10/keygen.c:1791
+#: g10/keygen.c:1692 g10/keygen.c:1798
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Schl�sselerzeugung fehlgeschlagen: %s\n"
 
-#: g10/keygen.c:1734 g10/sig-check.c:315 g10/sign.c:112
+#: g10/keygen.c:1739 g10/sig-check.c:315 g10/sign.c:112
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1624,7 +1624,7 @@ msgstr ""
 "Der Schl�ssel wurde %lu Sekunde in der Zukunft erzeugt (Zeitreise oder Uhren "
 "stimmen nicht �berein)\n"
 
-#: g10/keygen.c:1736 g10/sig-check.c:317 g10/sign.c:114
+#: g10/keygen.c:1741 g10/sig-check.c:317 g10/sign.c:114
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1632,7 +1632,7 @@ msgstr ""
 "Der Schl�ssel wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise oder "
 "Uhren stimmen nicht �berein)\n"
 
-#: g10/keygen.c:1769
+#: g10/keygen.c:1774
 msgid "Really create? "
 msgstr "Wirklich erzeugen? "
 
@@ -2586,7 +2586,7 @@ msgid "revoked"
 msgstr "widerrufen"
 
 #. of subkey
-#: g10/keylist.c:400 g10/mainproc.c:834
+#: g10/keylist.c:404 g10/mainproc.c:834
 #, c-format
 msgid " [expires: %s]"
 msgstr " [verf�llt: %s]"
@@ -2742,7 +2742,7 @@ msgstr ""
 msgid "can't connect to `%s': %s\n"
 msgstr "Verbindung zu '%s' kann nicht aufgebaut werden: %s\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:557
+#: g10/passphrase.c:313 g10/passphrase.c:574
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (Hauptschl�ssel-ID %08lX)"
@@ -2785,7 +2785,7 @@ msgstr ""
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
 
-#: g10/passphrase.c:543
+#: g10/passphrase.c:560
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2795,20 +2795,20 @@ msgstr ""
 "Sie ben�tigen ein Mantra, um den geheimen Schl�ssel zu entsperren.\n"
 "Benutzer: \""
 
-#: g10/passphrase.c:552
+#: g10/passphrase.c:569
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "%u-Bit %s Schl�ssel, ID %08lX, erzeugt %s"
 
-#: g10/passphrase.c:590
+#: g10/passphrase.c:607
 msgid "can't query password in batchmode\n"
 msgstr "Mantra kann im Batchmodus nicht abgefragt werden\n"
 
-#: g10/passphrase.c:594
+#: g10/passphrase.c:611
 msgid "Enter passphrase: "
 msgstr "Geben Sie das Mantra ein: "
 
-#: g10/passphrase.c:598
+#: g10/passphrase.c:615
 msgid "Repeat passphrase: "
 msgstr "Geben Sie das Mantra nochmal ein: "
 
@@ -2945,12 +2945,12 @@ 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:324
-#, c-format
-msgid "NOTE: signature key expired %s\n"
+#: g10/sig-check.c:328
+#, fuzzy, c-format
+msgid "NOTE: signature key %08lX expired %s\n"
 msgstr "Hinweis: Schl�ssel der Signatur ist verfallen am %s.\n"
 
-#: g10/sig-check.c:393
+#: g10/sig-check.c:398
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 "Vermutlich eine FALSCHE Unterschrift, wegen unbekanntem \"critical bit\"\n"
diff --git a/po/eo.po b/po/eo.po
index 956268666..e13dceb93 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.1e\n"
-"POT-Creation-Date: 2000-12-19 11:58+0100\n"
+"POT-Creation-Date: 2001-01-11 13:11+0100\n"
 "PO-Revision-Date: 2000-08-16 23:19+01:00\n"
 "Last-Translator: Edmund GRIMLEY EVANS <[email protected]>\n"
 "Language-Team: Esperanto <[email protected]>\n"
@@ -336,7 +336,7 @@ msgstr ""
 "Nesufi�e da stokastaj datenoj. Bonvolu fari ion por ebligi al la\n"
 "mastruma sistemo kolekti pli da entropio! (Mankas %d bitokoj)\n"
 
-#: g10/g10.c:210
+#: g10/g10.c:211
 msgid ""
 "@Commands:\n"
 " "
@@ -344,139 +344,139 @@ msgstr ""
 "@Komandoj:\n"
 " "
 
-#: g10/g10.c:212
+#: g10/g10.c:213
 msgid "|[file]|make a signature"
 msgstr "|[dosiero]|fari subskribon"
 
-#: g10/g10.c:213
+#: g10/g10.c:214
 msgid "|[file]|make a clear text signature"
 msgstr "|[dosiero]|fari klartekstan subskribon"
 
-#: g10/g10.c:214
+#: g10/g10.c:215
 msgid "make a detached signature"
 msgstr "fari apartan subskribon"
 
-#: g10/g10.c:215
+#: g10/g10.c:216
 msgid "encrypt data"
 msgstr "�ifri datenojn"
 
-#: g10/g10.c:216
+#: g10/g10.c:217
 msgid "encryption only with symmetric cipher"
 msgstr "�ifri nur kun simetria �ifro"
 
-#: g10/g10.c:217
+#: g10/g10.c:218
 msgid "store only"
 msgstr "nur skribi"
 
-#: g10/g10.c:218
+#: g10/g10.c:219
 msgid "decrypt data (default)"
 msgstr "mal�ifri datenojn (implicita elekto)"
 
-#: g10/g10.c:219
+#: g10/g10.c:220
 msgid "verify a signature"
 msgstr "kontroli subskribon"
 
-#: g10/g10.c:221
+#: g10/g10.c:222
 msgid "list keys"
 msgstr "listigi �losilojn"
 
-#: g10/g10.c:223
+#: g10/g10.c:224
 msgid "list keys and signatures"
 msgstr "listigi �losilojn kaj subskribojn"
 
-#: g10/g10.c:224
+#: g10/g10.c:225
 msgid "check key signatures"
 msgstr "kontroli �losilsubskribojn"
 
-#: g10/g10.c:225
+#: g10/g10.c:226
 msgid "list keys and fingerprints"
 msgstr "listigi �losilojn kaj fingro�purojn"
 
-#: g10/g10.c:226
+#: g10/g10.c:227
 msgid "list secret keys"
 msgstr "listigi sekretajn �losilojn"
 
-#: g10/g10.c:227
+#: g10/g10.c:228
 msgid "generate a new key pair"
 msgstr "krei novan �losilparon"
 
-#: g10/g10.c:228
+#: g10/g10.c:229
 msgid "remove key from the public keyring"
 msgstr "forigi �losilon de la publika �losilaro"
 
-#: g10/g10.c:230
+#: g10/g10.c:231
 msgid "remove key from the secret keyring"
 msgstr "forigi �losilon de la sekreta �losilaro"
 
-#: g10/g10.c:231
+#: g10/g10.c:232
 msgid "sign a key"
 msgstr "subskribi �losilon"
 
-#: g10/g10.c:232
+#: g10/g10.c:233
 msgid "sign a key locally"
 msgstr "subskribi �losilon loke"
 
-#: g10/g10.c:233
+#: g10/g10.c:234
 msgid "sign or edit a key"
 msgstr "subskribi a� redakti �losilon"
 
-#: g10/g10.c:234
+#: g10/g10.c:235
 msgid "generate a revocation certificate"
 msgstr "krei revokatestilon"
 
-#: g10/g10.c:235
+#: g10/g10.c:236
 msgid "export keys"
 msgstr "eksporti �losilojn"
 
-#: g10/g10.c:236
+#: g10/g10.c:237
 msgid "export keys to a key server"
 msgstr "eksporti �losilojn al �losilservilo"
 
-#: g10/g10.c:237
+#: g10/g10.c:238
 msgid "import keys from a key server"
 msgstr "importi �losilojn de �losilservilo"
 
-#: g10/g10.c:241
+#: g10/g10.c:242
 msgid "import/merge keys"
 msgstr "importi/kunfandi �losilojn"
 
-#: g10/g10.c:243
+#: g10/g10.c:244
 msgid "list only the sequence of packets"
 msgstr "listigi nur la sinsekvon de paketoj"
 
-#: g10/g10.c:245
+#: g10/g10.c:246
 msgid "export the ownertrust values"
 msgstr "eksporti la posedantofido-valorojn"
 
-#: g10/g10.c:247
+#: g10/g10.c:248
 msgid "import ownertrust values"
 msgstr "importi posedantofido-valorojn"
 
-#: g10/g10.c:249
+#: g10/g10.c:250
 msgid "update the trust database"
 msgstr "aktualigi la fido-datenaron"
 
-#: g10/g10.c:251
+#: g10/g10.c:252
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMOJ]|kontroli la fido-datenaron"
 
-#: g10/g10.c:252
+#: g10/g10.c:253
 msgid "fix a corrupted trust database"
 msgstr "ripari fu�itan fido-datenaron"
 
-#: g10/g10.c:253
+#: g10/g10.c:254
 msgid "De-Armor a file or stdin"
 msgstr "elkirasigi dosieron a� la normalan enigon"
 
-#: g10/g10.c:255
+#: g10/g10.c:256
 msgid "En-Armor a file or stdin"
 msgstr "enkirasigi dosieron a� la normalan enigon"
 
-#: g10/g10.c:257
+#: g10/g10.c:258
 msgid "|algo [files]|print message digests"
 msgstr "|metodo [dosieroj]|presi mesa�o-kompendiojn"
 
-#: g10/g10.c:261
+#: g10/g10.c:262
 msgid ""
 "@\n"
 "Options:\n"
@@ -486,156 +486,156 @@ msgstr ""
 "Opcioj:\n"
 " "
 
-#: g10/g10.c:263
+#: g10/g10.c:264
 msgid "create ascii armored output"
 msgstr "krei eligon en askia kiraso"
 
-#: g10/g10.c:265
+#: g10/g10.c:266
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOMO|�ifri por NOMO"
 
-#: g10/g10.c:268
+#: g10/g10.c:269
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOMO|uzi NOMOn kiel implicitan ricevonton"
 
-#: g10/g10.c:270
+#: g10/g10.c:271
 msgid "use the default key as default recipient"
 msgstr "uzi la implicitan �losilon kiel implicitan ricevonton"
 
-#: g10/g10.c:274
+#: g10/g10.c:275
 msgid "use this user-id to sign or decrypt"
 msgstr "uzi �i tiun uzantidentigilon por subskribi a� mal�ifri"
 
-#: g10/g10.c:275
+#: g10/g10.c:276
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|difini densig-nivelon N (0=nenia)"
 
-#: g10/g10.c:277
+#: g10/g10.c:278
 msgid "use canonical text mode"
 msgstr "uzi tekstan re�imon"
 
-#: g10/g10.c:278
+#: g10/g10.c:279
 msgid "use as output file"
 msgstr "uzi dosieron por eligo"
 
-#: g10/g10.c:279
+#: g10/g10.c:280
 msgid "verbose"
 msgstr "detala eligo"
 
-#: g10/g10.c:280
+#: g10/g10.c:281
 msgid "be somewhat more quiet"
 msgstr "iom malpli da informoj"
 
-#: g10/g10.c:281
+#: g10/g10.c:282
 msgid "don't use the terminal at all"
 msgstr "tute ne uzi la terminalon"
 
-#: g10/g10.c:282
+#: g10/g10.c:283
 msgid "force v3 signatures"
 msgstr "devigi v3-subskribojn"
 
-#: g10/g10.c:283
+#: g10/g10.c:284
 msgid "always use a MDC for encryption"
 msgstr "�iam uzi sigelon (MDC) por �ifrado"
 
-#: g10/g10.c:284
+#: g10/g10.c:285
 msgid "do not make any changes"
 msgstr "fari neniajn �an�ojn"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:286
+#: g10/g10.c:287
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/g10.c:287
+#: g10/g10.c:288
 msgid "batch mode: never ask"
 msgstr "neinteraga re�imo: neniam demandi"
 
-#: g10/g10.c:288
+#: g10/g10.c:289
 msgid "assume yes on most questions"
 msgstr "supozi \"jes\" �e la plej multaj demandoj"
 
-#: g10/g10.c:289
+#: g10/g10.c:290
 msgid "assume no on most questions"
 msgstr "supozi \"ne\" �e la plej multaj demandoj"
 
-#: g10/g10.c:290
+#: g10/g10.c:291
 msgid "add this keyring to the list of keyrings"
 msgstr "aldoni �i tiun �losilaron al la listo de �losilaroj"
 
-#: g10/g10.c:291
+#: g10/g10.c:292
 msgid "add this secret keyring to the list"
 msgstr "aldoni �i tiun sekretan �losilaron al la listo"
 
-#: g10/g10.c:292
+#: g10/g10.c:293
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOMO|uzi NOMOn kiel la implicitan sekretan �losilon"
 
-#: g10/g10.c:293
+#: g10/g10.c:294
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|SERVILO|uzi �i tiun �losilservilon por ser�i �losilojn"
 
-#: g10/g10.c:294
+#: g10/g10.c:295
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOMO|difini NOMOn kiel la signaron de la terminalo"
 
-#: g10/g10.c:295
+#: g10/g10.c:296
 msgid "read options from file"
 msgstr "legi la opciojn el dosiero"
 
-#: g10/g10.c:299
+#: g10/g10.c:300
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skribi statusinformojn al FD (dosierpriskribilo)"
 
-#: g10/g10.c:304
+#: g10/g10.c:305
 msgid "|KEYID|ulimately trust this key"
 msgstr ""
 
-#: g10/g10.c:305
+#: g10/g10.c:306
 msgid "|FILE|load extension module FILE"
 msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
 
-#: g10/g10.c:306
+#: g10/g10.c:307
 msgid "emulate the mode described in RFC1991"
 msgstr "imiti la re�imon priskribitan en RFC 1991"
 
-#: g10/g10.c:307
+#: g10/g10.c:308
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "�alti �iujn paket-, �ifrad- kaj kompendi-opciojn al OpenPGP-konduto"
 
-#: g10/g10.c:308
+#: g10/g10.c:309
 msgid "|N|use passphrase mode N"
 msgstr "|N|uzi pasfraz-re�imon N"
 
-#: g10/g10.c:310
+#: g10/g10.c:311
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NOMO|uzi kompendi-metodon NOMO por pasfrazoj"
 
-#: g10/g10.c:312
+#: g10/g10.c:313
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NOMO|uzi �ifrad-metodon NOMO por pasfrazoj"
 
-#: g10/g10.c:313
+#: g10/g10.c:314
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOMO|uzi �ifrad-metodon NOMO"
 
-#: g10/g10.c:314
+#: g10/g10.c:315
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOMO|uzi kompendi-metodon NOMO"
 
-#: g10/g10.c:315
+#: g10/g10.c:316
 msgid "|N|use compress algorithm N"
 msgstr "|N|uzi densig-metodon N"
 
-#: g10/g10.c:316
+#: g10/g10.c:317
 msgid "throw keyid field of encrypted packets"
 msgstr "forigi la �losilidentigilon de �ifritaj paketoj"
 
-#: g10/g10.c:317
+#: g10/g10.c:318
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOMO=VALORO|uzi �i tiun notacian datenon"
 
-#: g10/g10.c:320
+#: g10/g10.c:321
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -643,7 +643,7 @@ msgstr ""
 "@\n"
 "(Vidu la manpa�on por kompleta listo de �iuj komandoj kaj opcioj)\n"
 
-#: g10/g10.c:323
+#: g10/g10.c:324
 msgid ""
 "@\n"
 "Examples:\n"
@@ -663,15 +663,15 @@ msgstr ""
 " --list-keys [nomoj]        montri �losilojn\n"
 " --fingerprint [nomoj]      montri fingro�purojn\n"
 
-#: g10/g10.c:427
+#: g10/g10.c:429
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Bonvolu raporti cimojn al <[email protected]>.\n"
 
-#: g10/g10.c:431
+#: g10/g10.c:433
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: g10/g10.c:434
+#: g10/g10.c:436
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -681,7 +681,7 @@ msgstr ""
 "subskribi, kontroli, �ifri a� mal�ifri\n"
 "implicita operacio dependas de la enigataj datenoj\n"
 
-#: g10/g10.c:441
+#: g10/g10.c:443
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -689,186 +689,186 @@ msgstr ""
 "\n"
 "Realigitaj metodoj:\n"
 
-#: g10/g10.c:520
+#: g10/g10.c:522
 msgid "usage: gpg [options] "
 msgstr "uzado: gpg [opcioj] "
 
-#: g10/g10.c:573
+#: g10/g10.c:575
 msgid "conflicting commands\n"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/g10.c:713
+#: g10/g10.c:725
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
 
-#: g10/g10.c:717
+#: g10/g10.c:729
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "opcio-dosiero '%s': %s\n"
 
-#: g10/g10.c:724
+#: g10/g10.c:736
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "legas opciojn el '%s'\n"
 
-#: g10/g10.c:925
+#: g10/g10.c:937
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/g10.c:994
+#: g10/g10.c:1008
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVERTO: programo povas krei core-dosieron!\n"
 
-#: g10/g10.c:998 g10/g10.c:1007
+#: g10/g10.c:1012 g10/g10.c:1021
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTO: %s ne estas por normala uzado!\n"
 
-#: g10/g10.c:1000
+#: g10/g10.c:1014
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ne eblas kun %s!\n"
 
-#: g10/g10.c:1003
+#: g10/g10.c:1017
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/g10.c:1023 g10/g10.c:1035
+#: g10/g10.c:1037 g10/g10.c:1049
 msgid "selected cipher algorithm is invalid\n"
 msgstr "elektita �ifrad-metodo ne validas\n"
 
-#: g10/g10.c:1029 g10/g10.c:1041
+#: g10/g10.c:1043 g10/g10.c:1055
 msgid "selected digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/g10.c:1045
+#: g10/g10.c:1059
 msgid "the given policy URL is invalid\n"
 msgstr "la donita gvidlinia URL ne validas\n"
 
-#: g10/g10.c:1048
+#: g10/g10.c:1062
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "la densig-metodo devas esti inter %d kaj %d\n"
 
-#: g10/g10.c:1050
+#: g10/g10.c:1064
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed devas esti pli granda ol 0\n"
 
-#: g10/g10.c:1052
+#: g10/g10.c:1066
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed devas esti pli granda ol 1\n"
 
-#: g10/g10.c:1054
+#: g10/g10.c:1068
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth devas esti inter 1 kaj 255\n"
 
-#: g10/g10.c:1057
+#: g10/g10.c:1071
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTO: simpla S2K-re�imo (0) estas forte malrekomendata\n"
 
-#: g10/g10.c:1061
+#: g10/g10.c:1075
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "nevalida S2K-re�imo; devas esti 0, 1 a� 3\n"
 
-#: g10/g10.c:1146
+#: g10/g10.c:1160
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: g10/g10.c:1152
+#: g10/g10.c:1166
 msgid "--store [filename]"
 msgstr "--store [dosiero]"
 
-#: g10/g10.c:1159
+#: g10/g10.c:1173
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosiero]"
 
-#: g10/g10.c:1167
+#: g10/g10.c:1181
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosiero]"
 
-#: g10/g10.c:1180
+#: g10/g10.c:1194
 msgid "--sign [filename]"
 msgstr "--sign [dosiero]"
 
-#: g10/g10.c:1193
+#: g10/g10.c:1207
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/g10.c:1207
+#: g10/g10.c:1221
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosiero]"
 
-#: g10/g10.c:1224
+#: g10/g10.c:1238
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosiero]"
 
-#: g10/g10.c:1232
+#: g10/g10.c:1246
 msgid "--sign-key user-id"
 msgstr "--sign-key uzantidentigilo"
 
-#: g10/g10.c:1240
+#: g10/g10.c:1254
 msgid "--lsign-key user-id"
 msgstr "--lsign-key uzantidentigilo"
 
-#: g10/g10.c:1248
+#: g10/g10.c:1262
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key uzantidentigilo [komandoj]"
 
-#: g10/g10.c:1264
+#: g10/g10.c:1278
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key uzantidentigilo"
 
-#: g10/g10.c:1267
+#: g10/g10.c:1281
 msgid "--delete-key user-id"
 msgstr "--delete-key uzantidentigilo"
 
-#: g10/encode.c:268 g10/g10.c:1304 g10/sign.c:393
+#: g10/encode.c:268 g10/g10.c:1318 g10/sign.c:393
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "ne povas malfermi %s: %s\n"
 
-#: g10/g10.c:1319
+#: g10/g10.c:1333
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [uzantidentigilo] [�losilaro]"
 
-#: g10/g10.c:1385
+#: g10/g10.c:1399
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "elkirasigo malsukcesis: %s\n"
 
-#: g10/g10.c:1393
+#: g10/g10.c:1407
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: g10/g10.c:1464
+#: g10/g10.c:1478
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "nevalida kompendi-metodo '%s'\n"
 
-#: g10/g10.c:1551
+#: g10/g10.c:1565
 msgid "[filename]"
 msgstr "[dosiero]"
 
-#: g10/g10.c:1555
+#: g10/g10.c:1569
 msgid "Go ahead and type your message ...\n"
 msgstr "Ektajpu vian mesa�on ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1558 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:59 g10/g10.c:1572 g10/verify.c:94 g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "ne povas malfermi '%s'\n"
 
-#: g10/g10.c:1767
+#: g10/g10.c:1781
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr "la unua signo de notacia nomo devas esti litero a� substreko\n"
 
-#: g10/g10.c:1773
+#: g10/g10.c:1787
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -876,11 +876,11 @@ msgstr ""
 "notacia nomo devas enhavi nur literojn, ciferojn, punktojn a� substrekojn "
 "kaj fini per '='\n"
 
-#: g10/g10.c:1779
+#: g10/g10.c:1793
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr "punktoj en notacia nomo devas esti inter aliaj signoj\n"
 
-#: g10/g10.c:1787
+#: g10/g10.c:1801
 msgid "a notation value must not use any control characters\n"
 msgstr "notacia valoro ne povas enhavi stirsignojn\n"
 
@@ -1558,21 +1558,21 @@ msgstr "DSA-�losilparo havos 1024 bitojn.\n"
 msgid "Key generation canceled.\n"
 msgstr "Kreado de �losiloj nuligita.\n"
 
-#: g10/keygen.c:1571
+#: g10/keygen.c:1572
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skribas publikan �losilon al '%s'\n"
 
-#: g10/keygen.c:1572
+#: g10/keygen.c:1573
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/keygen.c:1668
+#: g10/keygen.c:1670
 msgid "public and secret key created and signed.\n"
 msgstr "publika kaj sekreta �losiloj kreitaj kaj subskribitaj.\n"
 
-#: g10/keygen.c:1673
+#: g10/keygen.c:1675
 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"
@@ -1580,12 +1580,12 @@ msgstr ""
 "Notu, ke �i tiu �losilo ne estas uzebla por �ifrado. Vi eble volos\n"
 "uzi la komandon \"--edit-key\" por krei flankan �losilon por tiu celo.\n"
 
-#: g10/keygen.c:1690 g10/keygen.c:1791
+#: g10/keygen.c:1692 g10/keygen.c:1798
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/keygen.c:1734 g10/sig-check.c:315 g10/sign.c:112
+#: g10/keygen.c:1739 g10/sig-check.c:315 g10/sign.c:112
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1593,7 +1593,7 @@ msgstr ""
 "�losilo estis kreita %lu sekundon en la estonteco (tempotordo a� "
 "horlo�eraro)\n"
 
-#: g10/keygen.c:1736 g10/sig-check.c:317 g10/sign.c:114
+#: g10/keygen.c:1741 g10/sig-check.c:317 g10/sign.c:114
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1601,7 +1601,7 @@ msgstr ""
 "�losilo estis kreita %lu sekundojn en la estonteco (tempotordo a� "
 "horlo�eraro)\n"
 
-#: g10/keygen.c:1769
+#: g10/keygen.c:1774
 msgid "Really create? "
 msgstr "�u vere krei? "
 
@@ -2551,7 +2551,7 @@ msgid "revoked"
 msgstr "rev"
 
 #. of subkey
-#: g10/keylist.c:400 g10/mainproc.c:834
+#: g10/keylist.c:404 g10/mainproc.c:834
 #, c-format
 msgid " [expires: %s]"
 msgstr " [eksvalidi�os: %s]"
@@ -2700,7 +2700,7 @@ msgstr ""
 msgid "can't connect to `%s': %s\n"
 msgstr "ne povas konekti�i al '%s': %s\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:557
+#: g10/passphrase.c:313 g10/passphrase.c:574
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (�ef�losilo %08lX)"
@@ -2743,7 +2743,7 @@ msgstr ""
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
 
-#: g10/passphrase.c:543
+#: g10/passphrase.c:560
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2753,20 +2753,20 @@ msgstr ""
 "Vi bezonas pasfrazon por mal�losi la sekretan �losilon\n"
 "por la uzanto: \""
 
-#: g10/passphrase.c:552
+#: g10/passphrase.c:569
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "%u-bita %s-�losilo, %08lX, kreita je %s"
 
-#: g10/passphrase.c:590
+#: g10/passphrase.c:607
 msgid "can't query password in batchmode\n"
 msgstr "ne povas kontroli pasvorton en neinteraga re�imo\n"
 
-#: g10/passphrase.c:594
+#: g10/passphrase.c:611
 msgid "Enter passphrase: "
 msgstr "Donu pasfrazon: "
 
-#: g10/passphrase.c:598
+#: g10/passphrase.c:615
 msgid "Repeat passphrase: "
 msgstr "Ripetu pasfrazon: "
 
@@ -2897,12 +2897,12 @@ msgstr "la publika �losilo estas %lu sekundon pli nova ol la subskribo\n"
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "la publika �losilo estas %lu sekundojn pli nova ol la subskribo\n"
 
-#: g10/sig-check.c:324
-#, c-format
-msgid "NOTE: signature key expired %s\n"
+#: g10/sig-check.c:328
+#, fuzzy, c-format
+msgid "NOTE: signature key %08lX expired %s\n"
 msgstr "NOTO: subskribo-�losilo eksvalidi�is je %s\n"
 
-#: g10/sig-check.c:393
+#: g10/sig-check.c:398
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "supozas malbonan subskribon pro nekonata \"critical bit\"\n"
 
diff --git a/po/es_ES.po b/po/es_ES.po
index 43b70f1ec..5519cdbcf 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -7,7 +7,7 @@
 # GPG version: 1.0.0
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-12-19 11:58+0100\n"
+"POT-Creation-Date: 2001-01-11 13:11+0100\n"
 "PO-Revision-Date: 1999-10-27 06:35+0200\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Date: 1998-11-13 10:49:25+0100\n"
@@ -348,7 +348,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:210
+#: g10/g10.c:211
 msgid ""
 "@Commands:\n"
 " "
@@ -356,140 +356,140 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/g10.c:212
+#: g10/g10.c:213
 msgid "|[file]|make a signature"
 msgstr "|[file]|hace una firma"
 
-#: g10/g10.c:213
+#: g10/g10.c:214
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|hace una firma en texto claro"
 
-#: g10/g10.c:214
+#: g10/g10.c:215
 msgid "make a detached signature"
 msgstr "hace una firma separada"
 
-#: g10/g10.c:215
+#: g10/g10.c:216
 msgid "encrypt data"
 msgstr "cifra datos"
 
-#: g10/g10.c:216
+#: g10/g10.c:217
 msgid "encryption only with symmetric cipher"
 msgstr "cifra s�lo con un cifrado sim�trico"
 
-#: g10/g10.c:217
+#: g10/g10.c:218
 msgid "store only"
 msgstr "s�lo almacenar"
 
-#: g10/g10.c:218
+#: g10/g10.c:219
 msgid "decrypt data (default)"
 msgstr "descifra datos (predefinido)"
 
-#: g10/g10.c:219
+#: g10/g10.c:220
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/g10.c:221
+#: g10/g10.c:222
 msgid "list keys"
 msgstr "lista claves"
 
-#: g10/g10.c:223
+#: g10/g10.c:224
 msgid "list keys and signatures"
 msgstr "lista claves y firmas"
 
-#: g10/g10.c:224
+#: g10/g10.c:225
 msgid "check key signatures"
 msgstr "comprueba las firmas de las claves"
 
-#: g10/g10.c:225
+#: g10/g10.c:226
 msgid "list keys and fingerprints"
 msgstr "lista claves y huellas dactilares"
 
-#: g10/g10.c:226
+#: g10/g10.c:227
 msgid "list secret keys"
 msgstr "lista claves secretas"
 
-#: g10/g10.c:227
+#: g10/g10.c:228
 msgid "generate a new key pair"
 msgstr "genera un nuevo par de claves"
 
-#: g10/g10.c:228
+#: g10/g10.c:229
 msgid "remove key from the public keyring"
 msgstr "elimina la clave del anillo p�blico"
 
-#: g10/g10.c:230
+#: g10/g10.c:231
 #, fuzzy
 msgid "remove key from the secret keyring"
 msgstr "elimina la clave del anillo p�blico"
 
-#: g10/g10.c:231
+#: g10/g10.c:232
 msgid "sign a key"
 msgstr "firma la clave"
 
-#: g10/g10.c:232
+#: g10/g10.c:233
 msgid "sign a key locally"
 msgstr "firma la clave localmente"
 
-#: g10/g10.c:233
+#: g10/g10.c:234
 msgid "sign or edit a key"
 msgstr "firma o modifica una clave"
 
-#: g10/g10.c:234
+#: g10/g10.c:235
 msgid "generate a revocation certificate"
 msgstr "genera un certificado de revocaci�n"
 
-#: g10/g10.c:235
+#: g10/g10.c:236
 msgid "export keys"
 msgstr "exporta claves"
 
-#: g10/g10.c:236
+#: g10/g10.c:237
 msgid "export keys to a key server"
 msgstr "exporta claves a un servidor de claves"
 
-#: g10/g10.c:237
+#: g10/g10.c:238
 msgid "import keys from a key server"
 msgstr "importa claves desde un servidor de claves"
 
-#: g10/g10.c:241
+#: g10/g10.c:242
 msgid "import/merge keys"
 msgstr "importa/fusiona claves"
 
-#: g10/g10.c:243
+#: g10/g10.c:244
 msgid "list only the sequence of packets"
 msgstr "lista s�lo la secuencia de paquetes"
 
-#: g10/g10.c:245
+#: g10/g10.c:246
 msgid "export the ownertrust values"
 msgstr "exporta los valores de confianza"
 
-#: g10/g10.c:247
+#: g10/g10.c:248
 msgid "import ownertrust values"
 msgstr "importa los valores de confianza"
 
-#: g10/g10.c:249
+#: g10/g10.c:250
 msgid "update the trust database"
 msgstr "actualiza la base de datos de confianza"
 
-#: g10/g10.c:251
+#: g10/g10.c:252
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMBRES]|comprueba la base de datos de confianza"
 
-#: g10/g10.c:252
+#: g10/g10.c:253
 msgid "fix a corrupted trust database"
 msgstr "arregla una base de datos de confianza da�ada"
 
-#: g10/g10.c:253
+#: g10/g10.c:254
 msgid "De-Armor a file or stdin"
 msgstr "quita la armadura de un fichero o stdin"
 
-#: g10/g10.c:255
+#: g10/g10.c:256
 msgid "En-Armor a file or stdin"
 msgstr "crea la armadura a un fichero o stdin"
 
-#: g10/g10.c:257
+#: g10/g10.c:258
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheros]|imprime res�menes de mensaje"
 
-#: g10/g10.c:261
+#: g10/g10.c:262
 msgid ""
 "@\n"
 "Options:\n"
@@ -499,168 +499,168 @@ msgstr ""
 "Opciones:\n"
 " "
 
-#: g10/g10.c:263
+#: g10/g10.c:264
 msgid "create ascii armored output"
 msgstr "crea una salida ascii con armadura"
 
-#: g10/g10.c:265
+#: g10/g10.c:266
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOMBRE|cifra para NOMBRE"
 
-#: g10/g10.c:268
+#: g10/g10.c:269
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOMBRE|usa NOMBRE como destinatario por defecto"
 
-#: g10/g10.c:270
+#: g10/g10.c:271
 msgid "use the default key as default recipient"
 msgstr "usa la clave por defecto como destinatario"
 
-#: g10/g10.c:274
+#: g10/g10.c:275
 msgid "use this user-id to sign or decrypt"
 msgstr "usa este usuario para firmar o descifrar"
 
-#: g10/g10.c:275
+#: g10/g10.c:276
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|nivel de compresi�n N (0 no comprime)"
 
-#: g10/g10.c:277
+#: g10/g10.c:278
 msgid "use canonical text mode"
 msgstr "usa modo de texto can�nico"
 
-#: g10/g10.c:278
+#: g10/g10.c:279
 msgid "use as output file"
 msgstr "usa como fichero de salida"
 
-#: g10/g10.c:279
+#: g10/g10.c:280
 msgid "verbose"
 msgstr "prolijo"
 
-#: g10/g10.c:280
+#: g10/g10.c:281
 msgid "be somewhat more quiet"
 msgstr "algo m�s discreto"
 
-#: g10/g10.c:281
+#: g10/g10.c:282
 msgid "don't use the terminal at all"
 msgstr "no usa la terminal en absoluto"
 
-#: g10/g10.c:282
+#: g10/g10.c:283
 msgid "force v3 signatures"
 msgstr "fuerza firmas v3"
 
-#: g10/g10.c:283
+#: g10/g10.c:284
 msgid "always use a MDC for encryption"
 msgstr "siempre usa un MCD para cifrar"
 
-#: g10/g10.c:284
+#: g10/g10.c:285
 msgid "do not make any changes"
 msgstr "no hace ning�n cambio"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:286
+#: g10/g10.c:287
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/g10.c:287
+#: g10/g10.c:288
 msgid "batch mode: never ask"
 msgstr "proceso por lotes: nunca preguntar"
 
-#: g10/g10.c:288
+#: g10/g10.c:289
 msgid "assume yes on most questions"
 msgstr "asume \"s�\" en casi todas las preguntas"
 
-#: g10/g10.c:289
+#: g10/g10.c:290
 msgid "assume no on most questions"
 msgstr "asume \"no\" en casi todas las preguntas"
 
-#: g10/g10.c:290
+#: g10/g10.c:291
 msgid "add this keyring to the list of keyrings"
 msgstr "a�ade este anillo a la lista de anillos"
 
-#: g10/g10.c:291
+#: g10/g10.c:292
 msgid "add this secret keyring to the list"
 msgstr "a�ade este anillo secreto a la lista"
 
-#: g10/g10.c:292
+#: g10/g10.c:293
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOMBRE|usa NOMBRE como clave secreta por defecto"
 
-#: g10/g10.c:293
+#: g10/g10.c:294
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|SERVIDOR|usa este servidor de claves"
 
-#: g10/g10.c:294
+#: g10/g10.c:295
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOMBRE|usa el juego de caracteres NOMBRE"
 
-#: g10/g10.c:295
+#: g10/g10.c:296
 msgid "read options from file"
 msgstr "lee opciones del fichero"
 
-#: g10/g10.c:299
+#: g10/g10.c:300
 msgid "|FD|write status info to this FD"
 msgstr "|DF|escribe informaci�n de estado en descriptor DF"
 
-#: g10/g10.c:304
+#: g10/g10.c:305
 msgid "|KEYID|ulimately trust this key"
 msgstr "|ID-CLAVE|conf�a plenamente en esta clave"
 
-#: g10/g10.c:305
+#: g10/g10.c:306
 msgid "|FILE|load extension module FILE"
 msgstr "|FICHERO|carga m�dulo de extensiones FICHERO"
 
-#: g10/g10.c:306
+#: g10/g10.c:307
 msgid "emulate the mode described in RFC1991"
 msgstr "emula el modo descrito en la RFC1991"
 
-#: g10/g10.c:307
+#: g10/g10.c:308
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 "todas las opciones de paquete, cifrado y\n"
 "resumen tipo OpenPGP"
 
-#: g10/g10.c:308
+#: g10/g10.c:309
 msgid "|N|use passphrase mode N"
 msgstr "|N|usa modo de contrase�a N"
 
-#: g10/g10.c:310
+#: g10/g10.c:311
 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:312
+#: g10/g10.c:313
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr ""
 "|NOMBRE|usa el algoritmo de cifrado NOMBRE para las\n"
 "contrase�as"
 
-#: g10/g10.c:313
+#: g10/g10.c:314
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOMBRE|usa el algoritmo de cifrado NOMBRE"
 
-#: g10/g10.c:314
+#: g10/g10.c:315
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOMBRE|usa algoritmo de resumen de mensaje NOMBRE"
 
-#: g10/g10.c:315
+#: g10/g10.c:316
 msgid "|N|use compress algorithm N"
 msgstr "|N|usa el algoritmo de compresi�n N"
 
-#: g10/g10.c:316
+#: g10/g10.c:317
 msgid "throw keyid field of encrypted packets"
 msgstr "elimina campo keyid de los paquetes cifrados"
 
-#: g10/g10.c:317
+#: g10/g10.c:318
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOMBRE=VALOR|usa estos datos de notaci�n"
 
-#: g10/g10.c:320
+#: g10/g10.c:321
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:323
+#: g10/g10.c:324
 msgid ""
 "@\n"
 "Examples:\n"
@@ -680,15 +680,15 @@ msgstr ""
 " --list-keys [nombres]      muestra las claves\n"
 " --fingerprint [nombres]    muestra las huellas dactilares\n"
 
-#: g10/g10.c:427
+#: g10/g10.c:429
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Por favor, informe de posibles \"bugs\" a <[email protected]>.\n"
 
-#: g10/g10.c:431
+#: g10/g10.c:433
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
 
-#: g10/g10.c:434
+#: g10/g10.c:436
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -698,7 +698,7 @@ msgstr ""
 "Firma, comprueba, cifra o descifra.\n"
 "La operaci�n por defecto depende del tipo de datos de entrada.\n"
 
-#: g10/g10.c:441
+#: g10/g10.c:443
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -706,186 +706,186 @@ msgstr ""
 "\n"
 "Algoritmos soportados:\n"
 
-#: g10/g10.c:520
+#: g10/g10.c:522
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opciones] "
 
-#: g10/g10.c:573
+#: g10/g10.c:575
 msgid "conflicting commands\n"
 msgstr "comandos incompatibles\n"
 
-#: g10/g10.c:713
+#: g10/g10.c:725
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: no existe el fichero de opciones predefinido `%s'\n"
 
-#: g10/g10.c:717
+#: g10/g10.c:729
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichero de opciones `%s': %s\n"
 
-#: g10/g10.c:724
+#: g10/g10.c:736
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "leyendo opciones desde `%s'\n"
 
-#: g10/g10.c:925
+#: g10/g10.c:937
 #, 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:994
+#: g10/g10.c:1008
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATENCI�N: �el programa podr�a crear un fichero core dump!\n"
 
-#: g10/g10.c:998 g10/g10.c:1007
+#: g10/g10.c:1012 g10/g10.c:1021
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: �%s no es para uso normal!\n"
 
-#: g10/g10.c:1000
+#: g10/g10.c:1014
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�%s no permitido con %s!\n"
 
-#: g10/g10.c:1003
+#: g10/g10.c:1017
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�%s no tiene sentido con %s!\n"
 
-#: g10/g10.c:1023 g10/g10.c:1035
+#: g10/g10.c:1037 g10/g10.c:1049
 msgid "selected cipher algorithm is invalid\n"
 msgstr "el algoritmo de cifrado seleccionado no es v�lido\n"
 
-#: g10/g10.c:1029 g10/g10.c:1041
+#: g10/g10.c:1043 g10/g10.c:1055
 msgid "selected digest algorithm is invalid\n"
 msgstr "el algoritmo de resumen seleccionado no es v�lido\n"
 
-#: g10/g10.c:1045
+#: g10/g10.c:1059
 msgid "the given policy URL is invalid\n"
 msgstr "URL de pol�tica no v�lida\n"
 
-#: g10/g10.c:1048
+#: g10/g10.c:1062
 #, 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:1050
+#: g10/g10.c:1064
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser mayor que 0\n"
 
-#: g10/g10.c:1052
+#: g10/g10.c:1066
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser mayor que 1\n"
 
-#: g10/g10.c:1054
+#: g10/g10.c:1068
 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:1057
+#: g10/g10.c:1071
 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:1061
+#: g10/g10.c:1075
 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:1146
+#: g10/g10.c:1160
 #, 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:1152
+#: g10/g10.c:1166
 msgid "--store [filename]"
 msgstr "--store [nombre_fichero]"
 
-#: g10/g10.c:1159
+#: g10/g10.c:1173
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nombre_fichero]"
 
-#: g10/g10.c:1167
+#: g10/g10.c:1181
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nombre_fichero]"
 
-#: g10/g10.c:1180
+#: g10/g10.c:1194
 msgid "--sign [filename]"
 msgstr "--sign [nombre_fichero]"
 
-#: g10/g10.c:1193
+#: g10/g10.c:1207
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nombre_fichero]"
 
-#: g10/g10.c:1207
+#: g10/g10.c:1221
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nombre_fichero]"
 
-#: g10/g10.c:1224
+#: g10/g10.c:1238
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nombre_fichero]"
 
-#: g10/g10.c:1232
+#: g10/g10.c:1246
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usuario"
 
-#: g10/g10.c:1240
+#: g10/g10.c:1254
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usuario"
 
-#: g10/g10.c:1248
+#: g10/g10.c:1262
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usuario [comandos]"
 
-#: g10/g10.c:1264
+#: g10/g10.c:1278
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key id-usuario"
 
-#: g10/g10.c:1267
+#: g10/g10.c:1281
 msgid "--delete-key user-id"
 msgstr "--delete-key id-usuario"
 
-#: g10/encode.c:268 g10/g10.c:1304 g10/sign.c:393
+#: g10/encode.c:268 g10/g10.c:1318 g10/sign.c:393
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "no puede abrirse `%s': %s\n"
 
-#: g10/g10.c:1319
+#: g10/g10.c:1333
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-usuario] [anillo]"
 
-#: g10/g10.c:1385
+#: g10/g10.c:1399
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminaci�n de armadura fallida: %s\n"
 
-#: g10/g10.c:1393
+#: g10/g10.c:1407
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creaci�n de armadura fallida: %s\n"
 
-#: g10/g10.c:1464
+#: g10/g10.c:1478
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de distribuci�n no v�lido `%s'\n"
 
-#: g10/g10.c:1551
+#: g10/g10.c:1565
 msgid "[filename]"
 msgstr "[nombre_fichero]"
 
-#: g10/g10.c:1555
+#: g10/g10.c:1569
 msgid "Go ahead and type your message ...\n"
 msgstr "Adelante, teclee su mensaje...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1558 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:59 g10/g10.c:1572 g10/verify.c:94 g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "no puede abrirse `%s'\n"
 
-#: g10/g10.c:1767
+#: g10/g10.c:1781
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr "El primer caracter de una notaci�n debe ser una letra o un subrayado\n"
 
-#: g10/g10.c:1773
+#: g10/g10.c:1787
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -893,11 +893,11 @@ msgstr ""
 "un nombre de notaci�n debe tener s�lo letras, d�gitos, puntos o subrayados, "
 "y acabar con un '='\n"
 
-#: g10/g10.c:1779
+#: g10/g10.c:1793
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr "los puntos en una notaci�n deben estar rodeados por otros caracteres\n"
 
-#: g10/g10.c:1787
+#: g10/g10.c:1801
 msgid "a notation value must not use any control characters\n"
 msgstr "un valor de notaci�n no debe usar ning�n caracter de control\n"
 
@@ -1584,21 +1584,21 @@ msgstr "El par de claves DSA tendr� 1024 bits.\n"
 msgid "Key generation canceled.\n"
 msgstr "Creaci�n de claves cancelada.\n"
 
-#: g10/keygen.c:1571
+#: g10/keygen.c:1572
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "escribiendo certificado p�blico en `%s'\n"
 
-#: g10/keygen.c:1572
+#: g10/keygen.c:1573
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "escribiendo certificado privado en `%s'\n"
 
-#: g10/keygen.c:1668
+#: g10/keygen.c:1670
 msgid "public and secret key created and signed.\n"
 msgstr "Claves p�blica y secreta creadas y firmadas.\n"
 
-#: g10/keygen.c:1673
+#: g10/keygen.c:1675
 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"
@@ -1607,12 +1607,12 @@ msgstr ""
 "el comando \"--edit-key\" para crear una clave secundaria con este "
 "prop�sito.\n"
 
-#: g10/keygen.c:1690 g10/keygen.c:1791
+#: g10/keygen.c:1692 g10/keygen.c:1798
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Creaci�n de la clave fallida: %s\n"
 
-#: g10/keygen.c:1734 g10/sig-check.c:315 g10/sign.c:112
+#: g10/keygen.c:1739 g10/sig-check.c:315 g10/sign.c:112
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1620,7 +1620,7 @@ msgstr ""
 "clave p�blica creada %lu segundos en el futuro (salto en el tiempo o\n"
 "problemas con el reloj)\n"
 
-#: g10/keygen.c:1736 g10/sig-check.c:317 g10/sign.c:114
+#: g10/keygen.c:1741 g10/sig-check.c:317 g10/sign.c:114
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1628,7 +1628,7 @@ msgstr ""
 "clave p�blica creada %lu segundos en el futuro (salto en el tiempo o\n"
 "problemas con el reloj)\n"
 
-#: g10/keygen.c:1769
+#: g10/keygen.c:1774
 msgid "Really create? "
 msgstr "�Crear de verdad? "
 
@@ -2582,7 +2582,7 @@ msgid "revoked"
 msgstr ""
 
 #. of subkey
-#: g10/keylist.c:400 g10/mainproc.c:834
+#: g10/keylist.c:404 g10/mainproc.c:834
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "La clave caduca el %s\n"
@@ -2733,7 +2733,7 @@ msgstr ""
 msgid "can't connect to `%s': %s\n"
 msgstr "no puede abrirse `%s': %s\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:557
+#: g10/passphrase.c:313 g10/passphrase.c:574
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr "(ID clave primaria %08lX)"
@@ -2777,7 +2777,7 @@ msgstr ""
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
 
-#: g10/passphrase.c:543
+#: g10/passphrase.c:560
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2787,20 +2787,20 @@ msgstr ""
 "Necesita una contrase�a para desbloquear la clave secreta\n"
 "del usuario: \""
 
-#: g10/passphrase.c:552
+#: g10/passphrase.c:569
 #, 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:590
+#: g10/passphrase.c:607
 msgid "can't query password in batchmode\n"
 msgstr "imposible pedir contrase�a en modo de proceso por lotes\n"
 
-#: g10/passphrase.c:594
+#: g10/passphrase.c:611
 msgid "Enter passphrase: "
 msgstr "Introduzca contrase�a: "
 
-#: g10/passphrase.c:598
+#: g10/passphrase.c:615
 msgid "Repeat passphrase: "
 msgstr "Repita contrase�a: "
 
@@ -2932,12 +2932,12 @@ msgstr "la clave p�blica es %lu segundos m�s nueva que la firma\n"
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "la clave p�blica es %lu segundos m�s nueva que la firma\n"
 
-#: g10/sig-check.c:324
-#, c-format
-msgid "NOTE: signature key expired %s\n"
+#: g10/sig-check.c:328
+#, fuzzy, c-format
+msgid "NOTE: signature key %08lX expired %s\n"
 msgstr "NOTA: clave de la firma caducada el %s\n"
 
-#: g10/sig-check.c:393
+#: g10/sig-check.c:398
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "asumiendo firma incorrecta debido a un bit cr�tico desconocido\n"
 
diff --git a/po/fr.po b/po/fr.po
index b4c60f6ae..ed5a14bcb 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.1h\n"
-"POT-Creation-Date: 2000-12-19 11:58+0100\n"
+"POT-Creation-Date: 2001-01-11 13:11+0100\n"
 "PO-Revision-Date: 2000-06-28 18:41+02:00\n"
 "Last-Translator: Ga�l Qu�ri <[email protected]>\n"
 "Language-Team: French <[email protected]>\n"
@@ -348,7 +348,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:210
+#: g10/g10.c:211
 msgid ""
 "@Commands:\n"
 " "
@@ -356,139 +356,139 @@ msgstr ""
 "@Commandes:\n"
 " "
 
-#: g10/g10.c:212
+#: g10/g10.c:213
 msgid "|[file]|make a signature"
 msgstr "|[fichier]|faire une signature"
 
-#: g10/g10.c:213
+#: g10/g10.c:214
 msgid "|[file]|make a clear text signature"
 msgstr "|[fichier]|faire une signature en texte clair"
 
-#: g10/g10.c:214
+#: g10/g10.c:215
 msgid "make a detached signature"
 msgstr "faire une signature d�tach�e"
 
-#: g10/g10.c:215
+#: g10/g10.c:216
 msgid "encrypt data"
 msgstr "chiffrer les donn�es"
 
-#: g10/g10.c:216
+#: g10/g10.c:217
 msgid "encryption only with symmetric cipher"
 msgstr "chiffrement sym�trique seulement"
 
-#: g10/g10.c:217
+#: g10/g10.c:218
 msgid "store only"
 msgstr "pas d'action"
 
-#: g10/g10.c:218
+#: g10/g10.c:219
 msgid "decrypt data (default)"
 msgstr "d�chiffrer les donn�es (d�faut)"
 
-#: g10/g10.c:219
+#: g10/g10.c:220
 msgid "verify a signature"
 msgstr "v�rifier une signature"
 
-#: g10/g10.c:221
+#: g10/g10.c:222
 msgid "list keys"
 msgstr "lister les cl�s"
 
-#: g10/g10.c:223
+#: g10/g10.c:224
 msgid "list keys and signatures"
 msgstr "lister les cl�s et les signatures"
 
-#: g10/g10.c:224
+#: g10/g10.c:225
 msgid "check key signatures"
 msgstr "v�rifier les signatures des cl�s"
 
-#: g10/g10.c:225
+#: g10/g10.c:226
 msgid "list keys and fingerprints"
 msgstr "lister les cl�s et les empreintes"
 
-#: g10/g10.c:226
+#: g10/g10.c:227
 msgid "list secret keys"
 msgstr "lister les cl�s secr�tes"
 
-#: g10/g10.c:227
+#: g10/g10.c:228
 msgid "generate a new key pair"
 msgstr "g�n�rer une nouvelle paire de cl�s"
 
-#: g10/g10.c:228
+#: g10/g10.c:229
 msgid "remove key from the public keyring"
 msgstr "enlever la cl� du porte-cl�s public"
 
-#: g10/g10.c:230
+#: g10/g10.c:231
 msgid "remove key from the secret keyring"
 msgstr "enlever la cl� du porte-cl�s secret"
 
-#: g10/g10.c:231
+#: g10/g10.c:232
 msgid "sign a key"
 msgstr "signer une cl�"
 
-#: g10/g10.c:232
+#: g10/g10.c:233
 msgid "sign a key locally"
 msgstr "signer une cl� localement"
 
-#: g10/g10.c:233
+#: g10/g10.c:234
 msgid "sign or edit a key"
 msgstr "signer ou �diter une cl�"
 
-#: g10/g10.c:234
+#: g10/g10.c:235
 msgid "generate a revocation certificate"
 msgstr "g�n�rer un certificat de r�vocation"
 
-#: g10/g10.c:235
+#: g10/g10.c:236
 msgid "export keys"
 msgstr "exporter les cl�s"
 
-#: g10/g10.c:236
+#: g10/g10.c:237
 msgid "export keys to a key server"
 msgstr "exporter les cl�s vers un serveur de cl�s"
 
-#: g10/g10.c:237
+#: g10/g10.c:238
 msgid "import keys from a key server"
 msgstr "importer les cl�s d'un serveur de cl�s"
 
-#: g10/g10.c:241
+#: g10/g10.c:242
 msgid "import/merge keys"
 msgstr "importer/fusionner les cl�s"
 
-#: g10/g10.c:243
+#: g10/g10.c:244
 msgid "list only the sequence of packets"
 msgstr "ne lister que les paquets"
 
-#: g10/g10.c:245
+#: g10/g10.c:246
 msgid "export the ownertrust values"
 msgstr "exporter les indices de confiance"
 
-#: g10/g10.c:247
+#: g10/g10.c:248
 msgid "import ownertrust values"
 msgstr "importer les indices de confiance"
 
-#: g10/g10.c:249
+#: g10/g10.c:250
 msgid "update the trust database"
 msgstr "mettre la base de confiance � jour"
 
-#: g10/g10.c:251
+#: g10/g10.c:252
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMS]|v�rifier la base de confiance"
 
-#: g10/g10.c:252
+#: g10/g10.c:253
 msgid "fix a corrupted trust database"
 msgstr "r�parer une base de confiance corrompue"
 
-#: g10/g10.c:253
+#: g10/g10.c:254
 msgid "De-Armor a file or stdin"
 msgstr "Enlever l'armure d'un fichier ou de stdin"
 
-#: g10/g10.c:255
+#: g10/g10.c:256
 msgid "En-Armor a file or stdin"
 msgstr "Mettre une armure � un fichier ou � stdin"
 
-#: g10/g10.c:257
+#: g10/g10.c:258
 msgid "|algo [files]|print message digests"
 msgstr "|alg. [fich.]|indiquer les fonctions de hachage"
 
-#: g10/g10.c:261
+#: g10/g10.c:262
 msgid ""
 "@\n"
 "Options:\n"
@@ -498,156 +498,156 @@ msgstr ""
 "Options:\n"
 " "
 
-#: g10/g10.c:263
+#: g10/g10.c:264
 msgid "create ascii armored output"
 msgstr "cr�er une sortie ascii avec armure"
 
-#: g10/g10.c:265
+#: g10/g10.c:266
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOM|chiffrer pour NOM"
 
-#: g10/g10.c:268
+#: g10/g10.c:269
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOM|utiliser NOM comme r�cipient par d�faut"
 
-#: g10/g10.c:270
+#: g10/g10.c:271
 msgid "use the default key as default recipient"
 msgstr "utiliser la cl� par d�f. comme r�cipient"
 
-#: g10/g10.c:274
+#: g10/g10.c:275
 msgid "use this user-id to sign or decrypt"
 msgstr "utiliser ce nom pour signer ou d�chiffrer"
 
-#: g10/g10.c:275
+#: g10/g10.c:276
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|niveau de compression N (0 d�sactive)"
 
-#: g10/g10.c:277
+#: g10/g10.c:278
 msgid "use canonical text mode"
 msgstr "utiliser le mode texte canonique"
 
-#: g10/g10.c:278
+#: g10/g10.c:279
 msgid "use as output file"
 msgstr "utiliser comme fichier de sortie"
 
-#: g10/g10.c:279
+#: g10/g10.c:280
 msgid "verbose"
 msgstr "bavard"
 
-#: g10/g10.c:280
+#: g10/g10.c:281
 msgid "be somewhat more quiet"
 msgstr "devenir beaucoup plus silencieux"
 
-#: g10/g10.c:281
+#: g10/g10.c:282
 msgid "don't use the terminal at all"
 msgstr "ne pas utiliser du tout le terminal"
 
-#: g10/g10.c:282
+#: g10/g10.c:283
 msgid "force v3 signatures"
 msgstr "forcer les signatures en v3"
 
-#: g10/g10.c:283
+#: g10/g10.c:284
 msgid "always use a MDC for encryption"
 msgstr "toujours utiliser un sceau pour le chiffrement"
 
-#: g10/g10.c:284
+#: g10/g10.c:285
 msgid "do not make any changes"
 msgstr "ne rien changer"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:286
+#: g10/g10.c:287
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/g10.c:287
+#: g10/g10.c:288
 msgid "batch mode: never ask"
 msgstr "mode automatique: ne jamais rien demander"
 
-#: g10/g10.c:288
+#: g10/g10.c:289
 msgid "assume yes on most questions"
 msgstr "r�pondre oui � la plupart des questions"
 
-#: g10/g10.c:289
+#: g10/g10.c:290
 msgid "assume no on most questions"
 msgstr "r�pondre non � la plupart des questions"
 
-#: g10/g10.c:290
+#: g10/g10.c:291
 msgid "add this keyring to the list of keyrings"
 msgstr "ajouter ce porte-cl�s � la liste"
 
-#: g10/g10.c:291
+#: g10/g10.c:292
 msgid "add this secret keyring to the list"
 msgstr "ajouter ce porte-cl�s secret � la liste"
 
-#: g10/g10.c:292
+#: g10/g10.c:293
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOM|utiliser NOM comme cl� secr�te par d�faut"
 
-#: g10/g10.c:293
+#: g10/g10.c:294
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|H�TE|utiliser ce serveur pour chercher des cl�s"
 
-#: g10/g10.c:294
+#: g10/g10.c:295
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOM|le terminal utilise la table de caract�res NOM"
 
-#: g10/g10.c:295
+#: g10/g10.c:296
 msgid "read options from file"
 msgstr "lire les options du fichier"
 
-#: g10/g10.c:299
+#: g10/g10.c:300
 msgid "|FD|write status info to this FD"
 msgstr "|FD|�crire l'�tat sur ce descripteur"
 
-#: g10/g10.c:304
+#: g10/g10.c:305
 msgid "|KEYID|ulimately trust this key"
 msgstr ""
 
-#: g10/g10.c:305
+#: g10/g10.c:306
 msgid "|FILE|load extension module FILE"
 msgstr "|FICH|charger le module d'extension FICH"
 
-#: g10/g10.c:306
+#: g10/g10.c:307
 msgid "emulate the mode described in RFC1991"
 msgstr "imiter le mode d�crit dans la RFC1991"
 
-#: g10/g10.c:307
+#: g10/g10.c:308
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "utiliser le comportement d�fini par OpenPGP"
 
-#: g10/g10.c:308
+#: g10/g10.c:309
 msgid "|N|use passphrase mode N"
 msgstr "|N|coder les mots de passe suivant le mode N"
 
-#: g10/g10.c:310
+#: g10/g10.c:311
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NOM|utiliser le hachage NOM pour les mots de passe"
 
-#: g10/g10.c:312
+#: g10/g10.c:313
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NOM|utiliser le chiffre NOM pour les mots de passe"
 
-#: g10/g10.c:313
+#: g10/g10.c:314
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOM|utiliser l'algorithme de chiffrement NOM"
 
-#: g10/g10.c:314
+#: g10/g10.c:315
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOM|utiliser la fonction de hachage NOM"
 
-#: g10/g10.c:315
+#: g10/g10.c:316
 msgid "|N|use compress algorithm N"
 msgstr "|N|utiliser l'algorithme de compression N"
 
-#: g10/g10.c:316
+#: g10/g10.c:317
 msgid "throw keyid field of encrypted packets"
 msgstr "supprimer l'ident. des paquets chiffr�s"
 
-#: g10/g10.c:317
+#: g10/g10.c:318
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOM=VALEUR|utiliser ces donn�es de notation"
 
-#: g10/g10.c:320
+#: g10/g10.c:321
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -655,7 +655,7 @@ msgstr ""
 "@\n"
 "(Voir la page de manuel pour une liste compl�te des commandes et options)\n"
 
-#: g10/g10.c:323
+#: g10/g10.c:324
 msgid ""
 "@\n"
 "Examples:\n"
@@ -675,17 +675,17 @@ msgstr ""
 " --list-keys [utilisateur]    montrer les cl�s\n"
 " --fingerprint [utilisateur]  montrer les empreintes\n"
 
-#: g10/g10.c:427
+#: g10/g10.c:429
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Signaler toutes anomalies � <[email protected]> (en anglais)\n"
 "et tout probl�me de traduction � <[email protected]>.\n"
 
-#: g10/g10.c:431
+#: g10/g10.c:433
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: g10/g10.c:434
+#: g10/g10.c:436
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -695,7 +695,7 @@ msgstr ""
 "signer, v�rifier, chiffrer ou d�chiffrer\n"
 "l'op�ration par d�faut d�pend des donn�es entr�es\n"
 
-#: g10/g10.c:441
+#: g10/g10.c:443
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -703,188 +703,188 @@ msgstr ""
 "\n"
 "Algorithmes support�s:\n"
 
-#: g10/g10.c:520
+#: g10/g10.c:522
 msgid "usage: gpg [options] "
 msgstr "utilisation: gpg [options] "
 
-#: g10/g10.c:573
+#: g10/g10.c:575
 msgid "conflicting commands\n"
 msgstr "commandes en conflit\n"
 
-#: g10/g10.c:713
+#: g10/g10.c:725
 #, 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:717
+#: g10/g10.c:729
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichier d'options `%s': %s\n"
 
-#: g10/g10.c:724
+#: g10/g10.c:736
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lire les options de `%s'\n"
 
-#: g10/g10.c:925
+#: g10/g10.c:937
 #, 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:994
+#: g10/g10.c:1008
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENTION: Le programme peut cr�er un fichier �core� !\n"
 
-#: g10/g10.c:998 g10/g10.c:1007
+#: g10/g10.c:1012 g10/g10.c:1021
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTE: %s n'est pas pour une utilisation normale !\n"
 
-#: g10/g10.c:1000
+#: g10/g10.c:1014
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n'est pas permis avec %s !\n"
 
-#: g10/g10.c:1003
+#: g10/g10.c:1017
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n'a aucun sens avec %s !\n"
 
-#: g10/g10.c:1023 g10/g10.c:1035
+#: g10/g10.c:1037 g10/g10.c:1049
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorithme de chiffrement s�lectionn� est invalide\n"
 
-#: g10/g10.c:1029 g10/g10.c:1041
+#: g10/g10.c:1043 g10/g10.c:1055
 msgid "selected digest algorithm is invalid\n"
 msgstr "la fonction de hachage s�lectionn�e est invalide\n"
 
-#: g10/g10.c:1045
+#: g10/g10.c:1059
 msgid "the given policy URL is invalid\n"
 msgstr "l'URL de politique donn�e est invalide\n"
 
-#: g10/g10.c:1048
+#: g10/g10.c:1062
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "l'algorithme de compression doit faire partie de l'intervalle %d..%d\n"
 
-#: g10/g10.c:1050
+#: g10/g10.c:1064
 msgid "completes-needed must be greater than 0\n"
 msgstr "�completes-needed� doit �tre sup�rieur � 0\n"
 
-#: g10/g10.c:1052
+#: g10/g10.c:1066
 msgid "marginals-needed must be greater than 1\n"
 msgstr "�marginals-needed� doit �tre sup�rieur � 1\n"
 
-#: g10/g10.c:1054
+#: g10/g10.c:1068
 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:1057
+#: g10/g10.c:1071
 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:1061
+#: g10/g10.c:1075
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mode S2K invalide; ce doit �tre 0, 1 ou 3\n"
 
-#: g10/g10.c:1146
+#: g10/g10.c:1160
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "impossible d'initialiser la base de confiance: %s\n"
 
-#: g10/g10.c:1152
+#: g10/g10.c:1166
 msgid "--store [filename]"
 msgstr "--store [nom du fichier]"
 
-#: g10/g10.c:1159
+#: g10/g10.c:1173
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom du fichier]"
 
-#: g10/g10.c:1167
+#: g10/g10.c:1181
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom du fichier]"
 
-#: g10/g10.c:1180
+#: g10/g10.c:1194
 msgid "--sign [filename]"
 msgstr "--sign [nom du fichier]"
 
-#: g10/g10.c:1193
+#: g10/g10.c:1207
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom du fichier]"
 
-#: g10/g10.c:1207
+#: g10/g10.c:1221
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom du fichier]"
 
-#: g10/g10.c:1224
+#: g10/g10.c:1238
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom du fichier]"
 
-#: g10/g10.c:1232
+#: g10/g10.c:1246
 msgid "--sign-key user-id"
 msgstr "--sign-key utilisateur"
 
-#: g10/g10.c:1240
+#: g10/g10.c:1254
 msgid "--lsign-key user-id"
 msgstr "--lsign-key utilisateur"
 
-#: g10/g10.c:1248
+#: g10/g10.c:1262
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key utilisateur [commandes]"
 
-#: g10/g10.c:1264
+#: g10/g10.c:1278
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key utilisateur"
 
-#: g10/g10.c:1267
+#: g10/g10.c:1281
 msgid "--delete-key user-id"
 msgstr "--delete-key utilisateur"
 
-#: g10/encode.c:268 g10/g10.c:1304 g10/sign.c:393
+#: g10/encode.c:268 g10/g10.c:1318 g10/sign.c:393
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "impossible d'ouvrir %s: %s\n"
 
-#: g10/g10.c:1319
+#: g10/g10.c:1333
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [utilisateur] [porte-cl�s]"
 
-#: g10/g10.c:1385
+#: g10/g10.c:1399
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "la suppression d'une armure a �chou�: %s\n"
 
-#: g10/g10.c:1393
+#: g10/g10.c:1407
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "la construction d'une armure a �chou�: %s \n"
 
-#: g10/g10.c:1464
+#: g10/g10.c:1478
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algorithme de hachage `%s' invalide\n"
 
-#: g10/g10.c:1551
+#: g10/g10.c:1565
 msgid "[filename]"
 msgstr "[nom du fichier]"
 
-#: g10/g10.c:1555
+#: g10/g10.c:1569
 msgid "Go ahead and type your message ...\n"
 msgstr "Continuez et tapez votre message...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1558 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:59 g10/g10.c:1572 g10/verify.c:94 g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossible d'ouvrir `%s'\n"
 
-#: g10/g10.c:1767
+#: g10/g10.c:1781
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr ""
 "le premier caract�re du nom d'une notation doit �tre un lettre ou un trait\n"
 "de soulignement\n"
 
-#: g10/g10.c:1773
+#: g10/g10.c:1787
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -893,13 +893,13 @@ msgstr ""
 "des points ou des traits de soulignement et doit se terminer par un signe "
 "�gal\n"
 
-#: g10/g10.c:1779
+#: g10/g10.c:1793
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr ""
 "les points dans le nom d'une notation doivent �tre entour�s d'autes "
 "caract�res\n"
 
-#: g10/g10.c:1787
+#: g10/g10.c:1801
 msgid "a notation value must not use any control characters\n"
 msgstr "une valeur de notation ne doit utiliser aucun caract�re de contr�le\n"
 
@@ -1585,21 +1585,21 @@ msgstr "La paire de cl�s DSA fera 1024 bits.\n"
 msgid "Key generation canceled.\n"
 msgstr "La g�n�ration de cl� a �t� annul�e.\n"
 
-#: g10/keygen.c:1571
+#: g10/keygen.c:1572
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "�criture de la cl� publique vers `%s'\n"
 
-#: g10/keygen.c:1572
+#: g10/keygen.c:1573
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "�criture de la cl� secr�te vers `%s'\n"
 
-#: g10/keygen.c:1668
+#: g10/keygen.c:1670
 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:1673
+#: g10/keygen.c:1675
 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"
@@ -1608,13 +1608,13 @@ msgstr ""
 "utiliser la commande �--edit-key� pour g�n�rer une cl� secondaire �\n"
 "cette fin.\n"
 
-#: g10/keygen.c:1690 g10/keygen.c:1791
+#: g10/keygen.c:1692 g10/keygen.c:1798
 #, 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:1734 g10/sig-check.c:315 g10/sign.c:112
+#: g10/keygen.c:1739 g10/sig-check.c:315 g10/sign.c:112
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1622,7 +1622,7 @@ msgstr ""
 "la cl� a �t� cr��e %lu seconde dans le futur (rupture spatio-temporelle ou\n"
 "probl�me d'horloge)\n"
 
-#: g10/keygen.c:1736 g10/sig-check.c:317 g10/sign.c:114
+#: g10/keygen.c:1741 g10/sig-check.c:317 g10/sign.c:114
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1630,7 +1630,7 @@ msgstr ""
 "la cl� a �t� cr��e %lu secondes dans le futur (rupture spatio-temporelle ou\n"
 "probl�me d'horloge\n"
 
-#: g10/keygen.c:1769
+#: g10/keygen.c:1774
 msgid "Really create? "
 msgstr "Cr�er vraiment ? "
 
@@ -2584,7 +2584,7 @@ msgid "revoked"
 msgstr "revcl�"
 
 #. of subkey
-#: g10/keylist.c:400 g10/mainproc.c:834
+#: g10/keylist.c:404 g10/mainproc.c:834
 #, c-format
 msgid " [expires: %s]"
 msgstr " [expire: %s]"
@@ -2735,7 +2735,7 @@ msgstr ""
 msgid "can't connect to `%s': %s\n"
 msgstr "impossible de se connecter � `%s': %s\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:557
+#: g10/passphrase.c:313 g10/passphrase.c:574
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (ID cl� principale %08lX)"
@@ -2778,7 +2778,7 @@ msgstr ""
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
 
-#: g10/passphrase.c:543
+#: g10/passphrase.c:560
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2788,20 +2788,20 @@ msgstr ""
 "Vous avez besoin d'un mot de passe pour d�verrouiller la cl� secr�te pour\n"
 "l'utilisateur: \""
 
-#: g10/passphrase.c:552
+#: g10/passphrase.c:569
 #, 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:590
+#: g10/passphrase.c:607
 msgid "can't query password in batchmode\n"
 msgstr "impossible de demander un mot de passe en mode automatique\n"
 
-#: g10/passphrase.c:594
+#: g10/passphrase.c:611
 msgid "Enter passphrase: "
 msgstr "Entrez le mot de passe: "
 
-#: g10/passphrase.c:598
+#: g10/passphrase.c:615
 msgid "Repeat passphrase: "
 msgstr "R�p�tez le mot de passe: "
 
@@ -2935,12 +2935,12 @@ msgstr "la cl� publique est plus r�cente de %lu seconde que la signature\n"
 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:324
-#, c-format
-msgid "NOTE: signature key expired %s\n"
+#: g10/sig-check.c:328
+#, fuzzy, c-format
+msgid "NOTE: signature key %08lX expired %s\n"
 msgstr "NOTE: la cl� de signature a expir� le %s\n"
 
-#: g10/sig-check.c:393
+#: g10/sig-check.c:398
 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"
diff --git a/po/id.po b/po/id.po
index ad4fa9a68..7b4b84d8b 100644
--- a/po/id.po
+++ b/po/id.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GNU Privacy Guard 1.0.1\n"
-"POT-Creation-Date: 2000-12-19 11:58+0100\n"
+"POT-Creation-Date: 2001-01-11 13:11+0100\n"
 "PO-Revision-Date: 2000-02-06 18:04+07:00\n"
 "Last-Translator: Tedi Heriyanto <[email protected]>\n"
 "Language-Team: Indonesia <[email protected]>\n"
@@ -337,7 +337,7 @@ msgstr ""
 "Tidak tersedia cukup byte random. Silakan melakukan aktivitas lain agar\n"
 "memungkinkan SO mengumpulkan lebih banyak entropi! (Perlu %d byte lagi)\n"
 
-#: g10/g10.c:210
+#: g10/g10.c:211
 msgid ""
 "@Commands:\n"
 " "
@@ -345,140 +345,140 @@ msgstr ""
 "@Perintah:\n"
 "  "
 
-#: g10/g10.c:212
+#: g10/g10.c:213
 msgid "|[file]|make a signature"
 msgstr "|[file]|buat signature"
 
-#: g10/g10.c:213
+#: g10/g10.c:214
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|buat signature teks"
 
-#: g10/g10.c:214
+#: g10/g10.c:215
 msgid "make a detached signature"
 msgstr "buat detached signature"
 
-#: g10/g10.c:215
+#: g10/g10.c:216
 msgid "encrypt data"
 msgstr "enkripsi data"
 
-#: g10/g10.c:216
+#: g10/g10.c:217
 msgid "encryption only with symmetric cipher"
 msgstr "enkripsi hanya dengan symmetric cipher"
 
-#: g10/g10.c:217
+#: g10/g10.c:218
 msgid "store only"
 msgstr "hanya disimpan"
 
-#: g10/g10.c:218
+#: g10/g10.c:219
 msgid "decrypt data (default)"
 msgstr "dekripsi data (default)"
 
-#: g10/g10.c:219
+#: g10/g10.c:220
 msgid "verify a signature"
 msgstr "verifikasi signature"
 
-#: g10/g10.c:221
+#: g10/g10.c:222
 msgid "list keys"
 msgstr "tampilkan kunci"
 
-#: g10/g10.c:223
+#: g10/g10.c:224
 msgid "list keys and signatures"
 msgstr "tampilkan kunci dan signature"
 
-#: g10/g10.c:224
+#: g10/g10.c:225
 msgid "check key signatures"
 msgstr "periksa signature kunci"
 
-#: g10/g10.c:225
+#: g10/g10.c:226
 msgid "list keys and fingerprints"
 msgstr "tampilkan kunci dan fingerprint"
 
-#: g10/g10.c:226
+#: g10/g10.c:227
 msgid "list secret keys"
 msgstr "tampilkan kunci rahasia"
 
-#: g10/g10.c:227
+#: g10/g10.c:228
 msgid "generate a new key pair"
 msgstr "buat sepasang kunci baru"
 
-#: g10/g10.c:228
+#: g10/g10.c:229
 msgid "remove key from the public keyring"
 msgstr "hapus kunci dari keyring publik"
 
-#: g10/g10.c:230
+#: g10/g10.c:231
 #, fuzzy
 msgid "remove key from the secret keyring"
 msgstr "hapus kunci dari keyring publik"
 
-#: g10/g10.c:231
+#: g10/g10.c:232
 msgid "sign a key"
 msgstr "tandai kunci"
 
-#: g10/g10.c:232
+#: g10/g10.c:233
 msgid "sign a key locally"
 msgstr "tandai kunci secara lokal"
 
-#: g10/g10.c:233
+#: g10/g10.c:234
 msgid "sign or edit a key"
 msgstr "tandai atau edit kunci"
 
-#: g10/g10.c:234
+#: g10/g10.c:235
 msgid "generate a revocation certificate"
 msgstr "buat sertifikat revokasi"
 
-#: g10/g10.c:235
+#: g10/g10.c:236
 msgid "export keys"
 msgstr "ekspor kunci"
 
-#: g10/g10.c:236
+#: g10/g10.c:237
 msgid "export keys to a key server"
 msgstr "ekspor kunci ke key server"
 
-#: g10/g10.c:237
+#: g10/g10.c:238
 msgid "import keys from a key server"
 msgstr "impor kunci dari key server"
 
-#: g10/g10.c:241
+#: g10/g10.c:242
 msgid "import/merge keys"
 msgstr "impor/gabung kunci"
 
-#: g10/g10.c:243
+#: g10/g10.c:244
 msgid "list only the sequence of packets"
 msgstr "tampilkan hanya urutan paket"
 
-#: g10/g10.c:245
+#: g10/g10.c:246
 msgid "export the ownertrust values"
 msgstr "ekspor nilai ownertrust"
 
-#: g10/g10.c:247
+#: g10/g10.c:248
 msgid "import ownertrust values"
 msgstr "impor nilai ownertrust"
 
-#: g10/g10.c:249
+#: g10/g10.c:250
 msgid "update the trust database"
 msgstr "perbarui database trust"
 
-#: g10/g10.c:251
+#: g10/g10.c:252
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NAMA]|periksa database trust"
 
-#: g10/g10.c:252
+#: g10/g10.c:253
 msgid "fix a corrupted trust database"
 msgstr "perbaiki database trust yang terkorupsi"
 
-#: g10/g10.c:253
+#: g10/g10.c:254
 msgid "De-Armor a file or stdin"
 msgstr "De-Armor file atau stdin"
 
-#: g10/g10.c:255
+#: g10/g10.c:256
 msgid "En-Armor a file or stdin"
 msgstr "En-Armor file atau stdin"
 
-#: g10/g10.c:257
+#: g10/g10.c:258
 msgid "|algo [files]|print message digests"
 msgstr "|algo [file]|cetak digest pesan"
 
-#: g10/g10.c:261
+#: g10/g10.c:262
 msgid ""
 "@\n"
 "Options:\n"
@@ -488,162 +488,162 @@ msgstr ""
 "Pilihan:\n"
 "  "
 
-#: g10/g10.c:263
+#: g10/g10.c:264
 msgid "create ascii armored output"
 msgstr "ciptakan output ascii"
 
-#: g10/g10.c:265
+#: g10/g10.c:266
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAMA|enkripsi untuk NAMA"
 
-#: g10/g10.c:268
+#: g10/g10.c:269
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAMA|gunakan NAMA sebagai penerima baku"
 
-#: g10/g10.c:270
+#: g10/g10.c:271
 msgid "use the default key as default recipient"
 msgstr "gunakan kunci baku sebagai penerima baku"
 
-#: g10/g10.c:274
+#: g10/g10.c:275
 msgid "use this user-id to sign or decrypt"
 msgstr "gunakan id-user ini untuk menandai/dekripsi"
 
-#: g10/g10.c:275
+#: g10/g10.c:276
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|set tingkat kompresi N (0 tidak ada)"
 
-#: g10/g10.c:277
+#: g10/g10.c:278
 msgid "use canonical text mode"
 msgstr "gunakan mode teks kanonikal"
 
-#: g10/g10.c:278
+#: g10/g10.c:279
 msgid "use as output file"
 msgstr "gunakan sebagai file output"
 
-#: g10/g10.c:279
+#: g10/g10.c:280
 msgid "verbose"
 msgstr "detil"
 
-#: g10/g10.c:280
+#: g10/g10.c:281
 msgid "be somewhat more quiet"
 msgstr "lebih diam"
 
-#: g10/g10.c:281
+#: g10/g10.c:282
 msgid "don't use the terminal at all"
 msgstr "jangan menggunakan terminal"
 
-#: g10/g10.c:282
+#: g10/g10.c:283
 msgid "force v3 signatures"
 msgstr "paksa signature v3"
 
-#: g10/g10.c:283
+#: g10/g10.c:284
 msgid "always use a MDC for encryption"
 msgstr "selalu gunakan MDC untuk enkripsi"
 
-#: g10/g10.c:284
+#: g10/g10.c:285
 msgid "do not make any changes"
 msgstr "jangan buat perubahan"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:286
+#: g10/g10.c:287
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/g10.c:287
+#: g10/g10.c:288
 msgid "batch mode: never ask"
 msgstr "mode batch: tanpa tanya"
 
-#: g10/g10.c:288
+#: g10/g10.c:289
 msgid "assume yes on most questions"
 msgstr "asumsikan ya untuk seluruh pertanyaan"
 
-#: g10/g10.c:289
+#: g10/g10.c:290
 msgid "assume no on most questions"
 msgstr "asumsikan tidak untuk seluruh pertanyaan"
 
-#: g10/g10.c:290
+#: g10/g10.c:291
 msgid "add this keyring to the list of keyrings"
 msgstr "tambah keyring ini ke daftar keyring"
 
-#: g10/g10.c:291
+#: g10/g10.c:292
 msgid "add this secret keyring to the list"
 msgstr "tambah keyring rahasia ini ke daftar"
 
-#: g10/g10.c:292
+#: g10/g10.c:293
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAMA|gunakan NAMA sebagai kunci rahasia baku"
 
-#: g10/g10.c:293
+#: g10/g10.c:294
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|gunakan keyserver ini utk lihat kunci"
 
-#: g10/g10.c:294
+#: g10/g10.c:295
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAMA|set charset terminal ke NAMA"
 
-#: g10/g10.c:295
+#: g10/g10.c:296
 msgid "read options from file"
 msgstr "baca pilihan dari file"
 
-#: g10/g10.c:299
+#: g10/g10.c:300
 msgid "|FD|write status info to this FD"
 msgstr "|FD|tulis info status ke FD ini"
 
-#: g10/g10.c:304
+#: g10/g10.c:305
 msgid "|KEYID|ulimately trust this key"
 msgstr ""
 
-#: g10/g10.c:305
+#: g10/g10.c:306
 msgid "|FILE|load extension module FILE"
 msgstr "|FILE|muat modul ekstensi FILE"
 
-#: g10/g10.c:306
+#: g10/g10.c:307
 msgid "emulate the mode described in RFC1991"
 msgstr "emulasikan mode seperti dalam RFC1991"
 
-#: g10/g10.c:307
+#: g10/g10.c:308
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "set pilihan paket, cipher, digest ke OpenPGP"
 
-#: g10/g10.c:308
+#: g10/g10.c:309
 msgid "|N|use passphrase mode N"
 msgstr "|N|gunakan passphrase mode N"
 
-#: g10/g10.c:310
+#: g10/g10.c:311
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAMA|gunakan algoritma digest NAMA utk passphrase"
 
-#: g10/g10.c:312
+#: g10/g10.c:313
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAMA|gunakan algoritma cipher NAMA untuk passphrase"
 
-#: g10/g10.c:313
+#: g10/g10.c:314
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAMA|gunakan algoritma cipher NAMA"
 
-#: g10/g10.c:314
+#: g10/g10.c:315
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAMA|gunakan algoritma digest pesan NAMA"
 
-#: g10/g10.c:315
+#: g10/g10.c:316
 msgid "|N|use compress algorithm N"
 msgstr "|N|gunakan algoritma kompresi N"
 
-#: g10/g10.c:316
+#: g10/g10.c:317
 msgid "throw keyid field of encrypted packets"
 msgstr "buang field keyid paket terenkripsi"
 
-#: g10/g10.c:317
+#: g10/g10.c:318
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NAMA=NILAI|gunakan notasi data ini"
 
-#: g10/g10.c:320
+#: g10/g10.c:321
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:323
+#: g10/g10.c:324
 msgid ""
 "@\n"
 "Examples:\n"
@@ -663,15 +663,15 @@ msgstr ""
 " --list-keys [nama]      tampilkan kunci\n"
 " --fingerprint [nama]    tampilkan fingerprint\n"
 
-#: g10/g10.c:427
+#: g10/g10.c:429
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Silakan laporkan kesalahan ke <[email protected]>.\n"
 
-#: g10/g10.c:431
+#: g10/g10.c:433
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: g10/g10.c:434
+#: g10/g10.c:436
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -681,7 +681,7 @@ msgstr ""
 "tandai, cek, enkripsi atau dekripsi\n"
 "operasi baku tergantung pada data input\n"
 
-#: g10/g10.c:441
+#: g10/g10.c:443
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -689,186 +689,186 @@ msgstr ""
 "\n"
 "Algoritma yang didukung:\n"
 
-#: g10/g10.c:520
+#: g10/g10.c:522
 msgid "usage: gpg [options] "
 msgstr "pemakaian: gpg [pilihan] "
 
-#: g10/g10.c:573
+#: g10/g10.c:575
 msgid "conflicting commands\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/g10.c:713
+#: g10/g10.c:725
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "CATATAN: tidak ada file pilihan baku `%s'\n"
 
-#: g10/g10.c:717
+#: g10/g10.c:729
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file pilihan `%s': %s\n"
 
-#: g10/g10.c:724
+#: g10/g10.c:736
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "membaca pilihan dari `%s'\n"
 
-#: g10/g10.c:925
+#: g10/g10.c:937
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/g10.c:994
+#: g10/g10.c:1008
 msgid "WARNING: program may create a core file!\n"
 msgstr "PERINGATAN: program mungkin membuat file core!\n"
 
-#: g10/g10.c:998 g10/g10.c:1007
+#: g10/g10.c:1012 g10/g10.c:1021
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "CATATAN: %s tidak untuk pemakaian normal!\n"
 
-#: g10/g10.c:1000
+#: g10/g10.c:1014
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s tidak dibolehkan dengan %s!\n"
 
-#: g10/g10.c:1003
+#: g10/g10.c:1017
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s tidak masuk akal dengan %s!\n"
 
-#: g10/g10.c:1023 g10/g10.c:1035
+#: g10/g10.c:1037 g10/g10.c:1049
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/g10.c:1029 g10/g10.c:1041
+#: g10/g10.c:1043 g10/g10.c:1055
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritma digest yang dipilih tidak valid\n"
 
-#: g10/g10.c:1045
+#: g10/g10.c:1059
 msgid "the given policy URL is invalid\n"
 msgstr "kebijakan URL yang diberikan tidak valid\n"
 
-#: g10/g10.c:1048
+#: g10/g10.c:1062
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "algoritma kompresi harus di antara %d..%d\n"
 
-#: g10/g10.c:1050
+#: g10/g10.c:1064
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed harus lebih dari 0\n"
 
-#: g10/g10.c:1052
+#: g10/g10.c:1066
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed harus lebih dari 1\n"
 
-#: g10/g10.c:1054
+#: g10/g10.c:1068
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth harus di antara 1 hingga 255\n"
 
-#: g10/g10.c:1057
+#: g10/g10.c:1071
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "CATATAN: mode S2K sederhana (0) tidak dianjurkan\n"
 
-#: g10/g10.c:1061
+#: g10/g10.c:1075
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mode S2K yang tidak valid; harus 0, 1 atau 3\n"
 
-#: g10/g10.c:1146
+#: g10/g10.c:1160
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: g10/g10.c:1152
+#: g10/g10.c:1166
 msgid "--store [filename]"
 msgstr "--store [namafile]"
 
-#: g10/g10.c:1159
+#: g10/g10.c:1173
 msgid "--symmetric [filename]"
 msgstr "--symmetric [namafile]"
 
-#: g10/g10.c:1167
+#: g10/g10.c:1181
 msgid "--encrypt [filename]"
 msgstr "--encrypt [namafile]"
 
-#: g10/g10.c:1180
+#: g10/g10.c:1194
 msgid "--sign [filename]"
 msgstr "--sign [namafile]"
 
-#: g10/g10.c:1193
+#: g10/g10.c:1207
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/g10.c:1207
+#: g10/g10.c:1221
 msgid "--clearsign [filename]"
 msgstr "--clearsign [namafile]"
 
-#: g10/g10.c:1224
+#: g10/g10.c:1238
 msgid "--decrypt [filename]"
 msgstr "--decrypt [namafile]"
 
-#: g10/g10.c:1232
+#: g10/g10.c:1246
 msgid "--sign-key user-id"
 msgstr "--sign-key id-user"
 
-#: g10/g10.c:1240
+#: g10/g10.c:1254
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-user"
 
-#: g10/g10.c:1248
+#: g10/g10.c:1262
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-user [perintah]"
 
-#: g10/g10.c:1264
+#: g10/g10.c:1278
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key id-user"
 
-#: g10/g10.c:1267
+#: g10/g10.c:1281
 msgid "--delete-key user-id"
 msgstr "--delete-key id-user"
 
-#: g10/encode.c:268 g10/g10.c:1304 g10/sign.c:393
+#: g10/encode.c:268 g10/g10.c:1318 g10/sign.c:393
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "tidak dapat membuka %s: %s\n"
 
-#: g10/g10.c:1319
+#: g10/g10.c:1333
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-user] [keyring]"
 
-#: g10/g10.c:1385
+#: g10/g10.c:1399
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "gagal dearmoring: %s\n"
 
-#: g10/g10.c:1393
+#: g10/g10.c:1407
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: g10/g10.c:1464
+#: g10/g10.c:1478
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritma hash tidak valid `%s'\n"
 
-#: g10/g10.c:1551
+#: g10/g10.c:1565
 msgid "[filename]"
 msgstr "[namafile]"
 
-#: g10/g10.c:1555
+#: g10/g10.c:1569
 msgid "Go ahead and type your message ...\n"
 msgstr "Teruskan dan ketikkan pesan anda ....\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1558 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:59 g10/g10.c:1572 g10/verify.c:94 g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "tidak dapat membuka `%s'\n"
 
-#: g10/g10.c:1767
+#: g10/g10.c:1781
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr "karakter pertama nama notasi harus huruf atau garis bawah\n"
 
-#: g10/g10.c:1773
+#: g10/g10.c:1787
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -876,11 +876,11 @@ msgstr ""
 "nama notasi hanya terdiri dari huruf, digit, titik atau garis bawah dan "
 "diakhiri dengan sebuah '='\n"
 
-#: g10/g10.c:1779
+#: g10/g10.c:1793
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr "titik dalam nama notasi harus diapit oleh karakter lain\n"
 
-#: g10/g10.c:1787
+#: g10/g10.c:1801
 msgid "a notation value must not use any control characters\n"
 msgstr "nilai notasi tidak boleh menggunakan karakter kendali\n"
 
@@ -1555,21 +1555,21 @@ msgstr "Keypair DSA akan memiliki 1024 bit.\n"
 msgid "Key generation canceled.\n"
 msgstr "Pembuatan kunci dibatalkan.\n"
 
-#: g10/keygen.c:1571
+#: g10/keygen.c:1572
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "menulis sertifikat publik ke `%s'\n"
 
-#: g10/keygen.c:1572
+#: g10/keygen.c:1573
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "menulis sertifikat rahasia ke `%s'\n"
 
-#: g10/keygen.c:1668
+#: g10/keygen.c:1670
 msgid "public and secret key created and signed.\n"
 msgstr "kunci publik dan rahasia dibuat dan ditandai.\n"
 
-#: g10/keygen.c:1673
+#: g10/keygen.c:1675
 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"
@@ -1578,26 +1578,26 @@ msgstr ""
 "mungkin ingin menggunakan perintah \"--edit-key\" untuk membuat kunci kedua "
 "untuk tujuan ini.\n"
 
-#: g10/keygen.c:1690 g10/keygen.c:1791
+#: g10/keygen.c:1692 g10/keygen.c:1798
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Pembuatan kunci gagal: %s\n"
 
-#: g10/keygen.c:1734 g10/sig-check.c:315 g10/sign.c:112
+#: g10/keygen.c:1739 g10/sig-check.c:315 g10/sign.c:112
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr ""
 "kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n"
 
-#: g10/keygen.c:1736 g10/sig-check.c:317 g10/sign.c:114
+#: g10/keygen.c:1741 g10/sig-check.c:317 g10/sign.c:114
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr ""
 "kunci telah diciptakan dalam %lu detik mendatang (masalah waktu atau jam)\n"
 
-#: g10/keygen.c:1769
+#: g10/keygen.c:1774
 msgid "Really create? "
 msgstr "Ingin diciptakan? "
 
@@ -2549,7 +2549,7 @@ msgid "revoked"
 msgstr "revkey"
 
 #. of subkey
-#: g10/keylist.c:400 g10/mainproc.c:834
+#: g10/keylist.c:404 g10/mainproc.c:834
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "Kunci berakhir pada %s\n"
@@ -2699,7 +2699,7 @@ msgstr ""
 msgid "can't connect to `%s': %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:557
+#: g10/passphrase.c:313 g10/passphrase.c:574
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (ID kunci utama %08lX)"
@@ -2742,7 +2742,7 @@ msgstr ""
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
 
-#: g10/passphrase.c:543
+#: g10/passphrase.c:560
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2752,20 +2752,20 @@ msgstr ""
 "Anda perlu passphrase untuk membuka kunci rahasia untuk\n"
 "pemakai: \""
 
-#: g10/passphrase.c:552
+#: g10/passphrase.c:569
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "%u-bit kunci %s, ID %08lX, tercipta %s"
 
-#: g10/passphrase.c:590
+#: g10/passphrase.c:607
 msgid "can't query password in batchmode\n"
 msgstr "tidak dapat meminta password dalam mode batch\n"
 
-#: g10/passphrase.c:594
+#: g10/passphrase.c:611
 msgid "Enter passphrase: "
 msgstr "Masukkan passphrase: "
 
-#: g10/passphrase.c:598
+#: g10/passphrase.c:615
 msgid "Repeat passphrase: "
 msgstr "Ulangi passphrase: "
 
@@ -2896,12 +2896,12 @@ msgstr "kunci publik adalah %lu detik lebih baru daripada signature\n"
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "kunci publik adalah %lu detik lebih baru daripada signature\n"
 
-#: g10/sig-check.c:324
-#, c-format
-msgid "NOTE: signature key expired %s\n"
+#: g10/sig-check.c:328
+#, fuzzy, c-format
+msgid "NOTE: signature key %08lX expired %s\n"
 msgstr "CATATAN: kunci signature berakhir %s\n"
 
-#: g10/sig-check.c:393
+#: g10/sig-check.c:398
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "mengasumsikan signature buruk karena ada bit kritik tidak dikenal\n"
 
diff --git a/po/it.po b/po/it.po
index d75a02944..39f135e71 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.0.0h\n"
-"POT-Creation-Date: 2000-12-19 11:58+0100\n"
+"POT-Creation-Date: 2001-01-11 13:11+0100\n"
 "PO-Revision-Date: 1999-12-08 15:51+02:00\n"
 "Last-Translator: Marco d'Itri <[email protected]>\n"
 "Language-Team: Italian <[email protected]>\n"
@@ -339,7 +339,7 @@ msgstr ""
 "altra cosa per dare all'OS la possibilit� di raccogliere altra entropia!\n"
 "(Servono altri %d byte)\n"
 
-#: g10/g10.c:210
+#: g10/g10.c:211
 msgid ""
 "@Commands:\n"
 " "
@@ -347,139 +347,139 @@ msgstr ""
 "@Comandi:\n"
 " "
 
-#: g10/g10.c:212
+#: g10/g10.c:213
 msgid "|[file]|make a signature"
 msgstr "|[file]|fai una firma"
 
-#: g10/g10.c:213
+#: g10/g10.c:214
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|fai una firma mantenendo il testo in chiaro"
 
-#: g10/g10.c:214
+#: g10/g10.c:215
 msgid "make a detached signature"
 msgstr "fai una firma separata"
 
-#: g10/g10.c:215
+#: g10/g10.c:216
 msgid "encrypt data"
 msgstr "cifra dati"
 
-#: g10/g10.c:216
+#: g10/g10.c:217
 msgid "encryption only with symmetric cipher"
 msgstr "cifra solo con un cifrario simmetrico"
 
-#: g10/g10.c:217
+#: g10/g10.c:218
 msgid "store only"
 msgstr "immagazzina soltanto"
 
-#: g10/g10.c:218
+#: g10/g10.c:219
 msgid "decrypt data (default)"
 msgstr "decifra dati (predefinito)"
 
-#: g10/g10.c:219
+#: g10/g10.c:220
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/g10.c:221
+#: g10/g10.c:222
 msgid "list keys"
 msgstr "elenca le chiavi"
 
-#: g10/g10.c:223
+#: g10/g10.c:224
 msgid "list keys and signatures"
 msgstr "elenca le chiavi e le firme"
 
-#: g10/g10.c:224
+#: g10/g10.c:225
 msgid "check key signatures"
 msgstr "controlla le firme delle chiavi"
 
-#: g10/g10.c:225
+#: g10/g10.c:226
 msgid "list keys and fingerprints"
 msgstr "elenca le chiavi e le impronte digitali"
 
-#: g10/g10.c:226
+#: g10/g10.c:227
 msgid "list secret keys"
 msgstr "elenca le chiavi segrete"
 
-#: g10/g10.c:227
+#: g10/g10.c:228
 msgid "generate a new key pair"
 msgstr "genera una nuova coppia di chiavi"
 
-#: g10/g10.c:228
+#: g10/g10.c:229
 msgid "remove key from the public keyring"
 msgstr "rimuove una chiave dal portachiavi pubblico"
 
-#: g10/g10.c:230
+#: g10/g10.c:231
 msgid "remove key from the secret keyring"
 msgstr "rimuove una chiave dal portachiavi privato"
 
-#: g10/g10.c:231
+#: g10/g10.c:232
 msgid "sign a key"
 msgstr "firma una chiave"
 
-#: g10/g10.c:232
+#: g10/g10.c:233
 msgid "sign a key locally"
 msgstr "firma localmente una chiave"
 
-#: g10/g10.c:233
+#: g10/g10.c:234
 msgid "sign or edit a key"
 msgstr "firma o modifica una chiave"
 
-#: g10/g10.c:234
+#: g10/g10.c:235
 msgid "generate a revocation certificate"
 msgstr "genera un certificato di revoca"
 
-#: g10/g10.c:235
+#: g10/g10.c:236
 msgid "export keys"
 msgstr "esporta delle chiavi"
 
-#: g10/g10.c:236
+#: g10/g10.c:237
 msgid "export keys to a key server"
 msgstr "esporta le chiavi a un key server"
 
-#: g10/g10.c:237
+#: g10/g10.c:238
 msgid "import keys from a key server"
 msgstr "importa le chiavi da un key server"
 
-#: g10/g10.c:241
+#: g10/g10.c:242
 msgid "import/merge keys"
 msgstr "importa/aggiungi delle chiavi"
 
-#: g10/g10.c:243
+#: g10/g10.c:244
 msgid "list only the sequence of packets"
 msgstr "elenca solo la sequenza dei pacchetti"
 
-#: g10/g10.c:245
+#: g10/g10.c:246
 msgid "export the ownertrust values"
 msgstr "esporta i valori di fiducia"
 
-#: g10/g10.c:247
+#: g10/g10.c:248
 msgid "import ownertrust values"
 msgstr "importa i valori di fiducia"
 
-#: g10/g10.c:249
+#: g10/g10.c:250
 msgid "update the trust database"
 msgstr "aggiorna il database della fiducia"
 
-#: g10/g10.c:251
+#: g10/g10.c:252
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMI]|controlla il database della fiducia"
 
-#: g10/g10.c:252
+#: g10/g10.c:253
 msgid "fix a corrupted trust database"
 msgstr "ripara un database della fiducia rovinato"
 
-#: g10/g10.c:253
+#: g10/g10.c:254
 msgid "De-Armor a file or stdin"
 msgstr "rimuovi l'armatura a un file o a stdin"
 
-#: g10/g10.c:255
+#: g10/g10.c:256
 msgid "En-Armor a file or stdin"
 msgstr "crea l'armatura a un file o a stdin"
 
-#: g10/g10.c:257
+#: g10/g10.c:258
 msgid "|algo [files]|print message digests"
 msgstr "|algo [files]|stampa tutti i message digests"
 
-#: g10/g10.c:261
+#: g10/g10.c:262
 msgid ""
 "@\n"
 "Options:\n"
@@ -489,164 +489,164 @@ msgstr ""
 "Opzioni:\n"
 " "
 
-#: g10/g10.c:263
+#: g10/g10.c:264
 msgid "create ascii armored output"
 msgstr "crea un output ascii con armatura"
 
-#: g10/g10.c:265
+#: g10/g10.c:266
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifra per NOME"
 
-#: g10/g10.c:268
+#: g10/g10.c:269
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|usa NOME come destinatario predefinito"
 
-#: g10/g10.c:270
+#: g10/g10.c:271
 msgid "use the default key as default recipient"
 msgstr "usa la chiave predefinita come destinatario predefinito"
 
-#: g10/g10.c:274
+#: g10/g10.c:275
 msgid "use this user-id to sign or decrypt"
 msgstr "usa questo user-id per firmare o decifrare"
 
-#: g10/g10.c:275
+#: g10/g10.c:276
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|imposta il livello di compressione (0 disab.)"
 
-#: g10/g10.c:277
+#: g10/g10.c:278
 msgid "use canonical text mode"
 msgstr "usa il modo testo canonico"
 
-#: g10/g10.c:278
+#: g10/g10.c:279
 msgid "use as output file"
 msgstr "usa come file di output"
 
-#: g10/g10.c:279
+#: g10/g10.c:280
 msgid "verbose"
 msgstr "prolisso"
 
-#: g10/g10.c:280
+#: g10/g10.c:281
 msgid "be somewhat more quiet"
 msgstr "meno prolisso"
 
-#: g10/g10.c:281
+#: g10/g10.c:282
 msgid "don't use the terminal at all"
 msgstr "non usa per niente il terminale"
 
-#: g10/g10.c:282
+#: g10/g10.c:283
 msgid "force v3 signatures"
 msgstr "forza l'uso di firme v3"
 
-#: g10/g10.c:283
+#: g10/g10.c:284
 msgid "always use a MDC for encryption"
 msgstr "usa sempre un MDC per cifrare"
 
-#: g10/g10.c:284
+#: g10/g10.c:285
 msgid "do not make any changes"
 msgstr "non fa cambiamenti"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:286
+#: g10/g10.c:287
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/g10.c:287
+#: g10/g10.c:288
 msgid "batch mode: never ask"
 msgstr "modo batch: non fa domande"
 
-#: g10/g10.c:288
+#: g10/g10.c:289
 msgid "assume yes on most questions"
 msgstr "assumi \"s�\" per quasi tutte le domande"
 
-#: g10/g10.c:289
+#: g10/g10.c:290
 msgid "assume no on most questions"
 msgstr "assumi \"no\" per quasi tutte le domande"
 
-#: g10/g10.c:290
+#: g10/g10.c:291
 msgid "add this keyring to the list of keyrings"
 msgstr "aggiungi questo portachiavi alla lista"
 
-#: g10/g10.c:291
+#: g10/g10.c:292
 msgid "add this secret keyring to the list"
 msgstr "aggiungi questo portachiavi segreto alla lista"
 
-#: g10/g10.c:292
+#: g10/g10.c:293
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usa NOME come chiave segreta predefinita"
 
-#: g10/g10.c:293
+#: g10/g10.c:294
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|cerca le chiavi in questo keyserver"
 
-#: g10/g10.c:294
+#: g10/g10.c:295
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOME|imposta il set di caratteri del terminale NOME"
 
-#: g10/g10.c:295
+#: g10/g10.c:296
 msgid "read options from file"
 msgstr "leggi le opzioni dal file"
 
-#: g10/g10.c:299
+#: g10/g10.c:300
 msgid "|FD|write status info to this FD"
 msgstr "|FD|scrivi le informazioni di stato su questo FD"
 
-#: g10/g10.c:304
+#: g10/g10.c:305
 msgid "|KEYID|ulimately trust this key"
 msgstr ""
 
-#: g10/g10.c:305
+#: g10/g10.c:306
 msgid "|FILE|load extension module FILE"
 msgstr "|FILE|carica il modulo di estensione FILE"
 
-#: g10/g10.c:306
+#: g10/g10.c:307
 msgid "emulate the mode described in RFC1991"
 msgstr "emula il modo descritto in RFC 1991"
 
-#: g10/g10.c:307
+#: g10/g10.c:308
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 "imposta tutte le opzioni di pacchetto,\n"
 "cifrario e digest per OpenPGP"
 
-#: g10/g10.c:308
+#: g10/g10.c:309
 msgid "|N|use passphrase mode N"
 msgstr "|N|usa il modo N per la passphrase"
 
-#: g10/g10.c:310
+#: g10/g10.c:311
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NOME|usa l'algoritmo di message digest NOME per le passphrase"
 
-#: g10/g10.c:312
+#: g10/g10.c:313
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NOME|usa l'alg. di cifratura NOME per le passphrase"
 
-#: g10/g10.c:313
+#: g10/g10.c:314
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usa l'algoritmo di cifratura NOME"
 
-#: g10/g10.c:314
+#: g10/g10.c:315
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usa l'algoritmo di message digest NOME"
 
-#: g10/g10.c:315
+#: g10/g10.c:316
 msgid "|N|use compress algorithm N"
 msgstr "|N|usa l'algoritmo di compressione N"
 
-#: g10/g10.c:316
+#: g10/g10.c:317
 msgid "throw keyid field of encrypted packets"
 msgstr "elimina il campo keyid dei pacchetti cifrati"
 
-#: g10/g10.c:317
+#: g10/g10.c:318
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOME=VALORE|usa questi dati per una nota"
 
-#: g10/g10.c:320
+#: g10/g10.c:321
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:323
+#: g10/g10.c:324
 msgid ""
 "@\n"
 "Examples:\n"
@@ -666,15 +666,15 @@ msgstr ""
 " --list-keys [nomi]         mostra le chiavi\n"
 " --fingerprint [nomi]       mostra le impronte digitali\n"
 
-#: g10/g10.c:427
+#: g10/g10.c:429
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Per favore segnala i bug a <[email protected]>.\n"
 
-#: g10/g10.c:431
+#: g10/g10.c:433
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: g10/g10.c:434
+#: g10/g10.c:436
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -684,7 +684,7 @@ msgstr ""
 "firma, controlla, cifra o decifra\n"
 "l'operazione predefinita dipende dai dati di input\n"
 
-#: g10/g10.c:441
+#: g10/g10.c:443
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -692,188 +692,188 @@ msgstr ""
 "\n"
 "Algoritmi gestiti:\n"
 
-#: g10/g10.c:520
+#: g10/g10.c:522
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opzioni] "
 
-#: g10/g10.c:573
+#: g10/g10.c:575
 msgid "conflicting commands\n"
 msgstr "comandi in conflitto\n"
 
-#: g10/g10.c:713
+#: g10/g10.c:725
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: manca il file `%s' con le opzioni predefinite\n"
 
-#: g10/g10.c:717
+#: g10/g10.c:729
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file con le opzioni `%s': %s\n"
 
-#: g10/g10.c:724
+#: g10/g10.c:736
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lettura delle opzioni da `%s'\n"
 
-#: g10/g10.c:925
+#: g10/g10.c:937
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/g10.c:994
+#: g10/g10.c:1008
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENZIONE: il programma potrebbe creare un file core!\n"
 
-#: g10/g10.c:998 g10/g10.c:1007
+#: g10/g10.c:1012 g10/g10.c:1021
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s normalmente non deve essere usato!\n"
 
-#: g10/g10.c:1000
+#: g10/g10.c:1014
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Non � permesso usare %s con %s!\n"
 
-#: g10/g10.c:1003
+#: g10/g10.c:1017
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "Non ha senso usare %s con %s!\n"
 
-#: g10/g10.c:1023 g10/g10.c:1035
+#: g10/g10.c:1037 g10/g10.c:1049
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non � valido\n"
 
-#: g10/g10.c:1029 g10/g10.c:1041
+#: g10/g10.c:1043 g10/g10.c:1055
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non � valido\n"
 
-#: g10/g10.c:1045
+#: g10/g10.c:1059
 msgid "the given policy URL is invalid\n"
 msgstr "L'URL della policy indicato non � valido\n"
 
-#: g10/g10.c:1048
+#: g10/g10.c:1062
 #, 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:1050
+#: g10/g10.c:1064
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve essere maggiore di 0\n"
 
-#: g10/g10.c:1052
+#: g10/g10.c:1066
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve essere maggiore di 1\n"
 
-#: g10/g10.c:1054
+#: g10/g10.c:1068
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth deve essere tra 1 e 255\n"
 
-#: g10/g10.c:1057
+#: g10/g10.c:1071
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: l'uso del modo S2K semplice (0) � fortemente scoraggiato\n"
 
-#: g10/g10.c:1061
+#: g10/g10.c:1075
 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:1146
+#: g10/g10.c:1160
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: g10/g10.c:1152
+#: g10/g10.c:1166
 msgid "--store [filename]"
 msgstr "--store [nomefile]"
 
-#: g10/g10.c:1159
+#: g10/g10.c:1173
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nomefile]"
 
-#: g10/g10.c:1167
+#: g10/g10.c:1181
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nomefile]"
 
-#: g10/g10.c:1180
+#: g10/g10.c:1194
 msgid "--sign [filename]"
 msgstr "--sign [nomefile]"
 
-#: g10/g10.c:1193
+#: g10/g10.c:1207
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/g10.c:1207
+#: g10/g10.c:1221
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nomefile]"
 
-#: g10/g10.c:1224
+#: g10/g10.c:1238
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nomefile]"
 
-#: g10/g10.c:1232
+#: g10/g10.c:1246
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/g10.c:1240
+#: g10/g10.c:1254
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/g10.c:1248
+#: g10/g10.c:1262
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [comandi]"
 
-#: g10/g10.c:1264
+#: g10/g10.c:1278
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key user-id"
 
-#: g10/g10.c:1267
+#: g10/g10.c:1281
 msgid "--delete-key user-id"
 msgstr "--delete-key user-id"
 
-#: g10/encode.c:268 g10/g10.c:1304 g10/sign.c:393
+#: g10/encode.c:268 g10/g10.c:1318 g10/sign.c:393
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "impossibile aprire `%s': %s\n"
 
-#: g10/g10.c:1319
+#: g10/g10.c:1333
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [portachiavi]"
 
-#: g10/g10.c:1385
+#: g10/g10.c:1399
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "rimozione dell'armatura fallita: %s\n"
 
-#: g10/g10.c:1393
+#: g10/g10.c:1407
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creazione dell'armatura fallita: %s\n"
 
-#: g10/g10.c:1464
+#: g10/g10.c:1478
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo di hash non valido `%s'\n"
 
-#: g10/g10.c:1551
+#: g10/g10.c:1565
 msgid "[filename]"
 msgstr "[nomefile]"
 
-#: g10/g10.c:1555
+#: g10/g10.c:1569
 msgid "Go ahead and type your message ...\n"
 msgstr "Vai avanti e scrivi il messaggio...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1558 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:59 g10/g10.c:1572 g10/verify.c:94 g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossibile aprire `%s'\n"
 
-#: g10/g10.c:1767
+#: g10/g10.c:1781
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr ""
 "il primo carattere del nome di una nota deve essere una lettera o un\n"
 "underscore\n"
 
-#: g10/g10.c:1773
+#: g10/g10.c:1787
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -881,11 +881,11 @@ msgstr ""
 "il nome di una nota deve essere formato solo da lettere, numeri, punti o\n"
 "underscore e deve finire con `='\n"
 
-#: g10/g10.c:1779
+#: g10/g10.c:1793
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr "nel nome di una nota i punti devono avere altri caratteri intorno\n"
 
-#: g10/g10.c:1787
+#: g10/g10.c:1801
 msgid "a notation value must not use any control characters\n"
 msgstr "il valore di una nota non deve usare caratteri di controllo\n"
 
@@ -1567,21 +1567,21 @@ msgstr "La coppia DSA avr� 1024 bit.\n"
 msgid "Key generation canceled.\n"
 msgstr "Generazione della chiave annullata.\n"
 
-#: g10/keygen.c:1571
+#: g10/keygen.c:1572
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "scrittura del certificato pubblico in `%s'\n"
 
-#: g10/keygen.c:1572
+#: g10/keygen.c:1573
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "scrittura del certificato segreto in `%s'\n"
 
-#: g10/keygen.c:1668
+#: g10/keygen.c:1670
 msgid "public and secret key created and signed.\n"
 msgstr "chiavi pubbliche e segrete create e firmate.\n"
 
-#: g10/keygen.c:1673
+#: g10/keygen.c:1675
 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"
@@ -1590,12 +1590,12 @@ msgstr ""
 "il comando \"--edit-key\" per generare una chiave secondaria per questo "
 "scopo.\n"
 
-#: g10/keygen.c:1690 g10/keygen.c:1791
+#: g10/keygen.c:1692 g10/keygen.c:1798
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generazione della chiave fallita: %s\n"
 
-#: g10/keygen.c:1734 g10/sig-check.c:315 g10/sign.c:112
+#: g10/keygen.c:1739 g10/sig-check.c:315 g10/sign.c:112
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1603,7 +1603,7 @@ msgstr ""
 "la chiave � stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/keygen.c:1736 g10/sig-check.c:317 g10/sign.c:114
+#: g10/keygen.c:1741 g10/sig-check.c:317 g10/sign.c:114
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1611,7 +1611,7 @@ msgstr ""
 "la chiave � stata creata %lu secondi nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/keygen.c:1769
+#: g10/keygen.c:1774
 msgid "Really create? "
 msgstr "Crea davvero? "
 
@@ -2566,7 +2566,7 @@ msgid "revoked"
 msgstr "revkey"
 
 #. of subkey
-#: g10/keylist.c:400 g10/mainproc.c:834
+#: g10/keylist.c:404 g10/mainproc.c:834
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "La chiave scadr� il %s\n"
@@ -2715,7 +2715,7 @@ msgstr ""
 msgid "can't connect to `%s': %s\n"
 msgstr "impossibile aprire `%s': %s\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:557
+#: g10/passphrase.c:313 g10/passphrase.c:574
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (key ID principale %08lX)"
@@ -2758,7 +2758,7 @@ msgstr ""
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
 
-#: g10/passphrase.c:543
+#: g10/passphrase.c:560
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2768,20 +2768,20 @@ msgstr ""
 "Ti serve una passphrase per sbloccare la chiave segreta\n"
 "dell'utente: \""
 
-#: g10/passphrase.c:552
+#: g10/passphrase.c:569
 #, 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"
 
-#: g10/passphrase.c:590
+#: g10/passphrase.c:607
 msgid "can't query password in batchmode\n"
 msgstr "impossibile chiedere la password in modo batch\n"
 
-#: g10/passphrase.c:594
+#: g10/passphrase.c:611
 msgid "Enter passphrase: "
 msgstr "Inserisci la passphrase: "
 
-#: g10/passphrase.c:598
+#: g10/passphrase.c:615
 msgid "Repeat passphrase: "
 msgstr "Ripeti la passphrase: "
 
@@ -2915,12 +2915,12 @@ msgstr "la chiave pubblica � %lu secondo pi� recente della firma\n"
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "la chiave pubblica � %lu secondi pi� recente della firma\n"
 
-#: g10/sig-check.c:324
-#, c-format
-msgid "NOTE: signature key expired %s\n"
+#: g10/sig-check.c:328
+#, fuzzy, c-format
+msgid "NOTE: signature key %08lX expired %s\n"
 msgstr "NOTA: chiave per firmare scaduta il %s\n"
 
-#: g10/sig-check.c:393
+#: g10/sig-check.c:398
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 "si suppone una firma non valida a causa di un bit critico sconosciuto\n"
diff --git a/po/ja.po b/po/ja.po
index ecca476b4..79eea8397 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.4\n"
-"POT-Creation-Date: 2000-12-19 11:58+0100\n"
+"POT-Creation-Date: 2001-01-11 13:11+0100\n"
 "PO-Revision-Date: 2000-10-19 23:08+09:00\n"
 "Last-Translator: IIDA Yosiaki <[email protected]>\n"
 "Language-Team: Japanese <[email protected]>\n"
@@ -338,7 +338,7 @@ msgstr ""
 "��ʬ��Ĺ��������������ޤ���OS����ä��𻨤������\n"
 "�Ǥ���褦���������Ƥ�������! (����%d�Х��Ȥ���ޤ�)\n"
 
-#: g10/g10.c:210
+#: g10/g10.c:211
 msgid ""
 "@Commands:\n"
 " "
@@ -346,141 +346,141 @@ msgstr ""
 "@���ޥ��:\n"
 " "
 
-#: g10/g10.c:212
+#: g10/g10.c:213
 msgid "|[file]|make a signature"
 msgstr "|[�ե�����]|��̾�����"
 
-#: g10/g10.c:213
+#: g10/g10.c:214
 msgid "|[file]|make a clear text signature"
 msgstr "|[�ե�����]|���ꥢ��̾�����"
 
-#: g10/g10.c:214
+#: g10/g10.c:215
 msgid "make a detached signature"
 msgstr "ʬΥ��̾�����"
 
-#: g10/g10.c:215
+#: g10/g10.c:216
 msgid "encrypt data"
 msgstr "�ǡ�����Ź沽"
 
-#: g10/g10.c:216
+#: g10/g10.c:217
 msgid "encryption only with symmetric cipher"
 msgstr "�Ź沽�ˤ��оΰŹ�ˡ�Τߤ����"
 
-#: g10/g10.c:217
+#: g10/g10.c:218
 msgid "store only"
 msgstr "��¸�Τ�"
 
-#: g10/g10.c:218
+#: g10/g10.c:219
 msgid "decrypt data (default)"
 msgstr "�ǡ��������� (����)"
 
-#: g10/g10.c:219
+#: g10/g10.c:220
 msgid "verify a signature"
 msgstr "��̾�򸡾�"
 
-#: g10/g10.c:221
+#: g10/g10.c:222
 msgid "list keys"
 msgstr "�����"
 
-#: g10/g10.c:223
+#: g10/g10.c:224
 msgid "list keys and signatures"
 msgstr "���Ƚ�̾�ΰ���"
 
-#: g10/g10.c:224
+#: g10/g10.c:225
 msgid "check key signatures"
 msgstr "���ν�̾�򸡾�"
 
-#: g10/g10.c:225
+#: g10/g10.c:226
 msgid "list keys and fingerprints"
 msgstr "���Ȼ���ΰ���"
 
-#: g10/g10.c:226
+#: g10/g10.c:227
 msgid "list secret keys"
 msgstr "��̩���ΰ���"
 
-#: g10/g10.c:227
+#: g10/g10.c:228
 msgid "generate a new key pair"
 msgstr "��������������"
 
-#: g10/g10.c:228
+#: g10/g10.c:229
 msgid "remove key from the public keyring"
 msgstr "�������ؤ��鸰����"
 
-#: g10/g10.c:230
+#: g10/g10.c:231
 msgid "remove key from the secret keyring"
 msgstr "��̩���ؤ��鸰����"
 
-#: g10/g10.c:231
+#: g10/g10.c:232
 msgid "sign a key"
 msgstr "���˽�̾"
 
-#: g10/g10.c:232
+#: g10/g10.c:233
 msgid "sign a key locally"
 msgstr "��������Ū�˽�̾"
 
-#: g10/g10.c:233
+#: g10/g10.c:234
 msgid "sign or edit a key"
 msgstr "���ؤν�̾���Խ�"
 
-#: g10/g10.c:234
+#: g10/g10.c:235
 msgid "generate a revocation certificate"
 msgstr "�˴������������"
 
-#: g10/g10.c:235
+#: g10/g10.c:236
 msgid "export keys"
 msgstr "����񤭽Ф�"
 
-#: g10/g10.c:236
+#: g10/g10.c:237
 msgid "export keys to a key server"
 msgstr "�������С��˸���񤭽Ф�"
 
-#: g10/g10.c:237
+#: g10/g10.c:238
 msgid "import keys from a key server"
 msgstr "�������С����鸰���ɤ߹���"
 
-#: g10/g10.c:241
+#: g10/g10.c:242
 msgid "import/merge keys"
 msgstr "�����ɹ���/ʻ��"
 
-#: g10/g10.c:243
+#: g10/g10.c:244
 msgid "list only the sequence of packets"
 msgstr "�ѥ��å���Τߤΰ���"
 
-#: g10/g10.c:245
+#: g10/g10.c:246
 msgid "export the ownertrust values"
 msgstr "��ͭ�Ԥ��Ѥ����ͤ�񤭽Ф�"
 
-#: g10/g10.c:247
+#: g10/g10.c:248
 msgid "import ownertrust values"
 msgstr "��ͭ�Ԥ��Ѥ����ͤ��ɤ߹���"
 
-#: g10/g10.c:249
+#: g10/g10.c:250
 msgid "update the trust database"
 msgstr "���ѥǡ����١����򹹿�"
 
-#: g10/g10.c:251
+#: g10/g10.c:252
 msgid "|[NAMES]|check the trust database"
 msgstr "|[̾��]|���ѥǡ����١���������å�"
 
-#: g10/g10.c:252
+#: g10/g10.c:253
 msgid "fix a corrupted trust database"
 msgstr "���줿���ѥǡ����١�������"
 
-#: g10/g10.c:253
+#: g10/g10.c:254
 msgid "De-Armor a file or stdin"
 msgstr ""
 "�ե�����ޤ���ɸ�����Ϥ�\n"
 "��������"
 
-#: g10/g10.c:255
+#: g10/g10.c:256
 msgid "En-Armor a file or stdin"
 msgstr "�ե�����ޤ���ɸ�����Ϥ�������"
 
-#: g10/g10.c:257
+#: g10/g10.c:258
 msgid "|algo [files]|print message digests"
 msgstr "|���르�ꥺ�� [�ե�����]|��å�������������"
 
-#: g10/g10.c:261
+#: g10/g10.c:262
 msgid ""
 "@\n"
 "Options:\n"
@@ -490,192 +490,192 @@ msgstr ""
 "���ץ����:\n"
 " "
 
-#: g10/g10.c:263
+#: g10/g10.c:264
 msgid "create ascii armored output"
 msgstr "ASCII���������������"
 
-#: g10/g10.c:265
+#: g10/g10.c:266
 msgid "|NAME|encrypt for NAME"
 msgstr "|̾��|��̾�����Ѥ˰Ź沽"
 
-#: g10/g10.c:268
+#: g10/g10.c:269
 msgid "|NAME|use NAME as default recipient"
 msgstr ""
 "|̾��|����μ����ԤȤ���\n"
 "��̾���פ����"
 
-#: g10/g10.c:270
+#: g10/g10.c:271
 msgid "use the default key as default recipient"
 msgstr "����μ����Ԥ˴���θ������"
 
-#: g10/g10.c:274
+#: g10/g10.c:275
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "��̾������ˤ��Υ桼����id\n"
 "�����"
 
-#: g10/g10.c:275
+#: g10/g10.c:276
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|���̥�٥��N������\n"
 "(0���󰵽�)"
 
-#: g10/g10.c:277
+#: g10/g10.c:278
 msgid "use canonical text mode"
 msgstr "����ƥ����ȡ��⡼�ɤ����"
 
-#: g10/g10.c:278
+#: g10/g10.c:279
 msgid "use as output file"
 msgstr "���ϥե�����Ȥ��ƻ���"
 
-#: g10/g10.c:279
+#: g10/g10.c:280
 msgid "verbose"
 msgstr "��Ĺ"
 
-#: g10/g10.c:280
+#: g10/g10.c:281
 msgid "be somewhat more quiet"
 msgstr "����Ť�"
 
-#: g10/g10.c:281
+#: g10/g10.c:282
 msgid "don't use the terminal at all"
 msgstr "ü�����Ի���"
 
-#: g10/g10.c:282
+#: g10/g10.c:283
 msgid "force v3 signatures"
 msgstr "����Ū��v3��̾"
 
-#: g10/g10.c:283
+#: g10/g10.c:284
 msgid "always use a MDC for encryption"
 msgstr "�Ź沽�ˤϾ��MDC�����"
 
-#: g10/g10.c:284
+#: g10/g10.c:285
 msgid "do not make any changes"
 msgstr "̵�ѹ�"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:286
+#: g10/g10.c:287
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/g10.c:287
+#: g10/g10.c:288
 msgid "batch mode: never ask"
 msgstr "�Хå����⡼��: ��ǧ��ά"
 
-#: g10/g10.c:288
+#: g10/g10.c:289
 msgid "assume yes on most questions"
 msgstr ""
 "�����Ƥ��μ����������yes\n"
 "�Ȥߤʤ�"
 
-#: g10/g10.c:289
+#: g10/g10.c:290
 msgid "assume no on most questions"
 msgstr ""
 "�����Ƥ��μ����������no\n"
 "�Ȥߤʤ�"
 
-#: g10/g10.c:290
+#: g10/g10.c:291
 msgid "add this keyring to the list of keyrings"
 msgstr "���ؤΰ����ˤ��θ��ؤ��ɲ�"
 
-#: g10/g10.c:291
+#: g10/g10.c:292
 msgid "add this secret keyring to the list"
 msgstr "�����ˤ�����̩���ؤ��ɲ�"
 
-#: g10/g10.c:292
+#: g10/g10.c:293
 msgid "|NAME|use NAME as default secret key"
 msgstr ""
 "|̾��|�������̩���Ȥ���\n"
 "��̾���פ����"
 
-#: g10/g10.c:293
+#: g10/g10.c:294
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|�ۥ���|���θ����ˤ��θ������С������"
 
-#: g10/g10.c:294
+#: g10/g10.c:295
 msgid "|NAME|set terminal charset to NAME"
 msgstr ""
 "|CHARSET̾|ü����charset���CHARSET̾��\n"
 "������"
 
-#: g10/g10.c:295
+#: g10/g10.c:296
 msgid "read options from file"
 msgstr ""
 "�ե����뤫�饪�ץ�����\n"
 "�ɤ߹���"
 
-#: g10/g10.c:299
+#: g10/g10.c:300
 msgid "|FD|write status info to this FD"
 msgstr ""
 "|�ե����뵭�һ�|���Υե����뵭�һҤ˾��֤�\n"
 "�񤭽Ф�"
 
-#: g10/g10.c:304
+#: g10/g10.c:305
 msgid "|KEYID|ulimately trust this key"
 msgstr "|��ID|���Ρָ��פ���Ū�˿��Ѥ���"
 
-#: g10/g10.c:305
+#: g10/g10.c:306
 msgid "|FILE|load extension module FILE"
 msgstr ""
 "|�ե�����|��ĥ�⥸�塼��Υե������\n"
 "�ɤ߹���"
 
-#: g10/g10.c:306
+#: g10/g10.c:307
 msgid "emulate the mode described in RFC1991"
 msgstr ""
 "RFC1991�˵��Ҥ��줿�⡼�ɤ�\n"
 "����"
 
-#: g10/g10.c:307
+#: g10/g10.c:308
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 "�ѥ��åȤȰŹ�Ƚ�̾�Υ��ץ���\n"
 "�������OpenPGP��������"
 
-#: g10/g10.c:308
+#: g10/g10.c:309
 msgid "|N|use passphrase mode N"
 msgstr "|N|�ѥ��ե졼�����⡼��N�����"
 
-#: g10/g10.c:310
+#: g10/g10.c:311
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr ""
 "|̾��|�ѥ��ե졼���ˡ�̾���פΥ��\n"
 "���������󥢥르�ꥺ������"
 
-#: g10/g10.c:312
+#: g10/g10.c:313
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr ""
 "|̾��|�ѥ��ե졼���ˡ�̾���פΰŹ�\n"
 "���르�ꥺ������"
 
-#: g10/g10.c:313
+#: g10/g10.c:314
 msgid "|NAME|use cipher algorithm NAME"
 msgstr ""
 "|̾��|��̾���פΰŹ楢�르�ꥺ���\n"
 "����"
 
-#: g10/g10.c:314
+#: g10/g10.c:315
 msgid "|NAME|use message digest algorithm NAME"
 msgstr ""
 "|̾��|��̾���פΥ�å���������\n"
 "���르�ꥺ������"
 
-#: g10/g10.c:315
+#: g10/g10.c:316
 msgid "|N|use compress algorithm N"
 msgstr ""
 "|̾��|��̾���פΰ��̥��르�ꥺ���\n"
 "����"
 
-#: g10/g10.c:316
+#: g10/g10.c:317
 msgid "throw keyid field of encrypted packets"
 msgstr ""
 "�Ź�ѥ��åȤθ�ID�ե������\n"
 "������"
 
-#: g10/g10.c:317
+#: g10/g10.c:318
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|̾��=��|��������ǡ��������"
 
-#: g10/g10.c:320
+#: g10/g10.c:321
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -684,7 +684,7 @@ msgstr ""
 "(���ޥ�ɤȥ��ץ���������ΰ����ϡ�\n"
 "�ޥ˥奢�롦�ڡ���������������)\n"
 
-#: g10/g10.c:323
+#: g10/g10.c:324
 msgid ""
 "@\n"
 "Examples:\n"
@@ -704,15 +704,15 @@ msgstr ""
 " --list-keys [̾��]         ����ɽ��\n"
 " --fingerprint [̾��]       �����ɽ��\n"
 
-#: g10/g10.c:427
+#: g10/g10.c:429
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "�Х��򸫤Ĥ����� <[email protected]> �ޤǤ���𤯤�������\n"
 
-#: g10/g10.c:431
+#: g10/g10.c:433
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: g10/g10.c:434
+#: g10/g10.c:436
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -722,7 +722,7 @@ msgstr ""
 "��̾�����ڡ��Ź沽������\n"
 "�����ư��ϡ����ϥǡ����˰�¸\n"
 
-#: g10/g10.c:441
+#: g10/g10.c:443
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -730,186 +730,186 @@ msgstr ""
 "\n"
 "���ݡ��Ȥ��Ƥ��륢�르�ꥺ��:\n"
 
-#: g10/g10.c:520
+#: g10/g10.c:522
 msgid "usage: gpg [options] "
 msgstr "�Ȥ���: gpg [���ץ����] "
 
-#: g10/g10.c:573
+#: g10/g10.c:575
 msgid "conflicting commands\n"
 msgstr "���ޥ�ɤξ���\n"
 
-#: g10/g10.c:713
+#: g10/g10.c:725
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "����: ����Υ��ץ���󡦥ե�����`%s'������ޤ���\n"
 
-#: g10/g10.c:717
+#: g10/g10.c:729
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "���ץ���󡦥ե�����`%s': %s\n"
 
-#: g10/g10.c:724
+#: g10/g10.c:736
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "`%s'���饪�ץ������ɤ߹��ߤޤ�\n"
 
-#: g10/g10.c:925
+#: g10/g10.c:937
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s��������ʸ������ǤϤ���ޤ���\n"
 
-#: g10/g10.c:994
+#: g10/g10.c:1008
 msgid "WARNING: program may create a core file!\n"
 msgstr "�ٹ�: �ץ������Υ������ե����뤬�Ǥ��뤳�Ȥ�����ޤ�!\n"
 
-#: g10/g10.c:998 g10/g10.c:1007
+#: g10/g10.c:1012 g10/g10.c:1021
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "����: ����%s���Ѥ��ޤ���!\n"
 
-#: g10/g10.c:1000
+#: g10/g10.c:1014
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s��%s�ȤȤ���Ѥ��뤳�ȤϤǤ��ޤ���!\n"
 
-#: g10/g10.c:1003
+#: g10/g10.c:1017
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s��%s�ȤȤ���Ѥ��Ƥ�̵��̣�Ǥ�!\n"
 
-#: g10/g10.c:1023 g10/g10.c:1035
+#: g10/g10.c:1037 g10/g10.c:1049
 msgid "selected cipher algorithm is invalid\n"
 msgstr "���򤵤줿�Ź楢�르�ꥺ���̵���Ǥ�\n"
 
-#: g10/g10.c:1029 g10/g10.c:1041
+#: g10/g10.c:1043 g10/g10.c:1055
 msgid "selected digest algorithm is invalid\n"
 msgstr "���򤵤줿���󥢥르�ꥺ���̵���Ǥ�\n"
 
-#: g10/g10.c:1045
+#: g10/g10.c:1059
 msgid "the given policy URL is invalid\n"
 msgstr "��������줿�ݥꥷ��URL��̵���Ǥ�\n"
 
-#: g10/g10.c:1048
+#: g10/g10.c:1062
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "���̥��르�ꥺ���%d..%d���ϰϤǤʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:1050
+#: g10/g10.c:1064
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed�������ͤ�ɬ�פǤ�\n"
 
-#: g10/g10.c:1052
+#: g10/g10.c:1066
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed��1����礭���ͤ�ɬ�פǤ�\n"
 
-#: g10/g10.c:1054
+#: g10/g10.c:1068
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth��1����255���ϰϤǤʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:1057
+#: g10/g10.c:1071
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "����: ñ���S2K�⡼��(0)�λ��Ѥˤ϶���ȿ�Ф��ޤ�\n"
 
-#: g10/g10.c:1061
+#: g10/g10.c:1075
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "̵����S2K�⡼�ɡ�0��1��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:1146
+#: g10/g10.c:1160
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "���ѥǡ����١����ν�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:1152
+#: g10/g10.c:1166
 msgid "--store [filename]"
 msgstr "--store [�ե�����̾]"
 
-#: g10/g10.c:1159
+#: g10/g10.c:1173
 msgid "--symmetric [filename]"
 msgstr "--symmetric [�ե�����̾]"
 
-#: g10/g10.c:1167
+#: g10/g10.c:1181
 msgid "--encrypt [filename]"
 msgstr "--encrypt [�ե�����̾]"
 
-#: g10/g10.c:1180
+#: g10/g10.c:1194
 msgid "--sign [filename]"
 msgstr "--sign [�ե�����̾]"
 
-#: g10/g10.c:1193
+#: g10/g10.c:1207
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [�ե�����̾]"
 
-#: g10/g10.c:1207
+#: g10/g10.c:1221
 msgid "--clearsign [filename]"
 msgstr "--clearsign [�ե�����̾]"
 
-#: g10/g10.c:1224
+#: g10/g10.c:1238
 msgid "--decrypt [filename]"
 msgstr "--decrypt [�ե�����̾]"
 
-#: g10/g10.c:1232
+#: g10/g10.c:1246
 msgid "--sign-key user-id"
 msgstr "--sign-key �桼����id"
 
-#: g10/g10.c:1240
+#: g10/g10.c:1254
 msgid "--lsign-key user-id"
 msgstr "--lsign-key �桼����id"
 
-#: g10/g10.c:1248
+#: g10/g10.c:1262
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key �桼����id [���ޥ��]"
 
-#: g10/g10.c:1264
+#: g10/g10.c:1278
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key �桼����id"
 
-#: g10/g10.c:1267
+#: g10/g10.c:1281
 msgid "--delete-key user-id"
 msgstr "--delete-key �桼����id"
 
-#: g10/encode.c:268 g10/g10.c:1304 g10/sign.c:393
+#: g10/encode.c:268 g10/g10.c:1318 g10/sign.c:393
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "%s�������ޤ���: %s\n"
 
-#: g10/g10.c:1319
+#: g10/g10.c:1333
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [�桼����id] [����]"
 
-#: g10/g10.c:1385
+#: g10/g10.c:1399
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "��������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:1393
+#: g10/g10.c:1407
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/g10.c:1464
+#: g10/g10.c:1478
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "̵���ʥϥå��塦���르�ꥺ��`%s'�Ǥ�\n"
 
-#: g10/g10.c:1551
+#: g10/g10.c:1565
 msgid "[filename]"
 msgstr "[�ե�����̾]"
 
-#: g10/g10.c:1555
+#: g10/g10.c:1569
 msgid "Go ahead and type your message ...\n"
 msgstr "���Ϥ��ޤ�����å������򥿥��פ��Ƥ������� ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1558 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:59 g10/g10.c:1572 g10/verify.c:94 g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "`%s'�������ޤ���\n"
 
-#: g10/g10.c:1767
+#: g10/g10.c:1781
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr "����̾����Ƭ��ʸ�����������������(_)�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:1773
+#: g10/g10.c:1787
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -917,11 +917,11 @@ msgstr ""
 "����̾�ˤ�ʸ�����������ɥåȡ���������������Τߤ��Ѥ���\n"
 "'='�ǽ����ʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:1779
+#: g10/g10.c:1793
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr "����̾�ΥɥåȤ�¾��ʸ���ǰϤޤʤ���Фʤ�ޤ���\n"
 
-#: g10/g10.c:1787
+#: g10/g10.c:1801
 msgid "a notation value must not use any control characters\n"
 msgstr "����̾���ͤ�����ʸ�����Ѥ��ƤϤ����ޤ���\n"
 
@@ -1596,21 +1596,21 @@ msgstr "DSA���Ф�1024�ӥåȤˤʤ�ޤ���\n"
 msgid "Key generation canceled.\n"
 msgstr "������������ߤ���ޤ�����\n"
 
-#: g10/keygen.c:1571
+#: g10/keygen.c:1572
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "`%s'�ظ�������񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:1572
+#: g10/keygen.c:1573
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "`%s'����̩����񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:1668
+#: g10/keygen.c:1670
 msgid "public and secret key created and signed.\n"
 msgstr "����������̩�����ꡢ��̾���ޤ�����\n"
 
-#: g10/keygen.c:1673
+#: g10/keygen.c:1675
 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"
@@ -1618,24 +1618,24 @@ msgstr ""
 "���θ��ϰŹ沽�ˤϻ��ѤǤ��ʤ����Ȥ����դ��Ƥ����������Ź沽��Ԥ��ˤϡ�\n"
 "��--edit-key�ץ��ޥ�ɤ��Ѥ����������������Ƥ���������\n"
 
-#: g10/keygen.c:1690 g10/keygen.c:1791
+#: g10/keygen.c:1692 g10/keygen.c:1798
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "���������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keygen.c:1734 g10/sig-check.c:315 g10/sign.c:112
+#: g10/keygen.c:1739 g10/sig-check.c:315 g10/sign.c:112
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "����%lu��̤��ˤǤ��ޤ��� (����ι�Ԥ����פΤ��뤤�Ǥ��礦)\n"
 
-#: g10/keygen.c:1736 g10/sig-check.c:317 g10/sign.c:114
+#: g10/keygen.c:1741 g10/sig-check.c:317 g10/sign.c:114
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "����%lu��̤��ˤǤ��ޤ��� (����ι�Ԥ����פΤ��뤤�Ǥ��礦)\n"
 
-#: g10/keygen.c:1769
+#: g10/keygen.c:1774
 msgid "Really create? "
 msgstr "�����˺��ޤ���? "
 
@@ -2581,7 +2581,7 @@ msgid "revoked"
 msgstr "�˴��Ѥ�"
 
 #. of subkey
-#: g10/keylist.c:400 g10/mainproc.c:834
+#: g10/keylist.c:404 g10/mainproc.c:834
 #, c-format
 msgid " [expires: %s]"
 msgstr " [ͭ������: %s]"
@@ -2732,7 +2732,7 @@ msgstr ""
 msgid "can't connect to `%s': %s\n"
 msgstr "`%s'����³�Ǥ��ޤ���: %s\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:557
+#: g10/passphrase.c:313 g10/passphrase.c:574
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (�縰ID %08lX)"
@@ -2775,7 +2775,7 @@ msgstr ""
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
 
-#: g10/passphrase.c:543
+#: g10/passphrase.c:560
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2785,20 +2785,20 @@ msgstr ""
 "���Υ桼��������̩���Υ��å���������ˤ�\n"
 "�ѥ��ե졼��������ޤ�: \""
 
-#: g10/passphrase.c:552
+#: g10/passphrase.c:569
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "%u�ӥå�%s��, ID %08lX�������դ�%s"
 
-#: g10/passphrase.c:590
+#: g10/passphrase.c:607
 msgid "can't query password in batchmode\n"
 msgstr "�Хå��⡼�ɤǤϥѥ���ɤ���礻���Ǥ��ޤ���\n"
 
-#: g10/passphrase.c:594
+#: g10/passphrase.c:611
 msgid "Enter passphrase: "
 msgstr "�ѥ��ե졼��������: "
 
-#: g10/passphrase.c:598
+#: g10/passphrase.c:615
 msgid "Repeat passphrase: "
 msgstr "�ѥ��ե졼���������: "
 
@@ -2930,12 +2930,12 @@ msgstr "�������Ͻ�̾����%lu�ø�˺�������Ƥ��ޤ�\n"
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "�������Ͻ�̾����%lu�ø�˺�������Ƥ��ޤ�\n"
 
-#: g10/sig-check.c:324
-#, c-format
-msgid "NOTE: signature key expired %s\n"
+#: g10/sig-check.c:328
+#, fuzzy, c-format
+msgid "NOTE: signature key %08lX expired %s\n"
 msgstr "����: ��̾�θ��ϴ����ڤ�Ǥ�%s\n"
 
-#: g10/sig-check.c:393
+#: g10/sig-check.c:398
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "̤�ΤΥ���ƥ����롦�ӥåȤ����ä��Τǡ���̾���������Ȥߤʤ��ޤ�\n"
 
diff --git a/po/nl.po b/po/nl.po
index cc76d86ee..844a84b14 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.0h\n"
-"POT-Creation-Date: 2000-12-19 11:58+0100\n"
+"POT-Creation-Date: 2001-01-11 13:11+0100\n"
 "PO-Revision-Date: 2000-02-20 21:30+01:00\n"
 "Last-Translator: Ivo Timmermans <[email protected]>\n"
 "Language-Team: Dutch <[email protected]>\n"
@@ -337,7 +337,7 @@ msgstr ""
 "om het besturingssysteem de kans te geven om meer entropie te\n"
 "verzamelen! (Nog %d bytes nodig)\n"
 
-#: g10/g10.c:210
+#: g10/g10.c:211
 msgid ""
 "@Commands:\n"
 " "
@@ -345,139 +345,139 @@ msgstr ""
 "@Opdrachten:\n"
 " "
 
-#: g10/g10.c:212
+#: g10/g10.c:213
 msgid "|[file]|make a signature"
 msgstr "|[bestand]|maak een ondertekening"
 
-#: g10/g10.c:213
+#: g10/g10.c:214
 msgid "|[file]|make a clear text signature"
 msgstr "|[bestand]|maak een niet versleutelde ondertekening"
 
-#: g10/g10.c:214
+#: g10/g10.c:215
 msgid "make a detached signature"
 msgstr "maak een losstaande ondertekening"
 
-#: g10/g10.c:215
+#: g10/g10.c:216
 msgid "encrypt data"
 msgstr "versleutel gegevens"
 
-#: g10/g10.c:216
+#: g10/g10.c:217
 msgid "encryption only with symmetric cipher"
 msgstr "versleutel slechts met een symmetrische versleutelmethode"
 
-#: g10/g10.c:217
+#: g10/g10.c:218
 msgid "store only"
 msgstr "alleen bewaren"
 
-#: g10/g10.c:218
+#: g10/g10.c:219
 msgid "decrypt data (default)"
 msgstr "gegevens decoderen (standaard)"
 
-#: g10/g10.c:219
+#: g10/g10.c:220
 msgid "verify a signature"
 msgstr "ondertekening controleren"
 
-#: g10/g10.c:221
+#: g10/g10.c:222
 msgid "list keys"
 msgstr "lijst van sleutels genereren"
 
-#: g10/g10.c:223
+#: g10/g10.c:224
 msgid "list keys and signatures"
 msgstr "sleutels en ondertekeningen opnoemen"
 
-#: g10/g10.c:224
+#: g10/g10.c:225
 msgid "check key signatures"
 msgstr "sleutelverificaties controleren"
 
-#: g10/g10.c:225
+#: g10/g10.c:226
 msgid "list keys and fingerprints"
 msgstr "sleutels en vingerafdrukken opnoemen"
 
-#: g10/g10.c:226
+#: g10/g10.c:227
 msgid "list secret keys"
 msgstr "geheime sleutels opnoemen"
 
-#: g10/g10.c:227
+#: g10/g10.c:228
 msgid "generate a new key pair"
 msgstr "nieuw sleutelpaar genereren"
 
-#: g10/g10.c:228
+#: g10/g10.c:229
 msgid "remove key from the public keyring"
 msgstr "sleutel weghalen uit de publieke sleutelbos"
 
-#: g10/g10.c:230
+#: g10/g10.c:231
 msgid "remove key from the secret keyring"
 msgstr "sleutel weghalen uit de geheime sleutelbos"
 
-#: g10/g10.c:231
+#: g10/g10.c:232
 msgid "sign a key"
 msgstr "onderteken een sleutel"
 
-#: g10/g10.c:232
+#: g10/g10.c:233
 msgid "sign a key locally"
 msgstr "onderteken een sleutel lokaal"
 
-#: g10/g10.c:233
+#: g10/g10.c:234
 msgid "sign or edit a key"
 msgstr "onderteken of bewerk een sleutel"
 
-#: g10/g10.c:234
+#: g10/g10.c:235
 msgid "generate a revocation certificate"
 msgstr "genereer een terugtrekkings-certificaat"
 
-#: g10/g10.c:235
+#: g10/g10.c:236
 msgid "export keys"
 msgstr "exporteer sleutels"
 
-#: g10/g10.c:236
+#: g10/g10.c:237
 msgid "export keys to a key server"
 msgstr "exporteer sleutels naar een sleutelserver"
 
-#: g10/g10.c:237
+#: g10/g10.c:238
 msgid "import keys from a key server"
 msgstr "importeer sleutels van een sleutelserver"
 
-#: g10/g10.c:241
+#: g10/g10.c:242
 msgid "import/merge keys"
 msgstr "sleutels importeren/samenvoegen"
 
-#: g10/g10.c:243
+#: g10/g10.c:244
 msgid "list only the sequence of packets"
 msgstr "noem alleen de volgorde van pakketten"
 
-#: g10/g10.c:245
+#: g10/g10.c:246
 msgid "export the ownertrust values"
 msgstr "exporteer het vertrouwen in de eigenaars"
 
-#: g10/g10.c:247
+#: g10/g10.c:248
 msgid "import ownertrust values"
 msgstr "importeer het vertrouwen in de eigenaars"
 
-#: g10/g10.c:249
+#: g10/g10.c:250
 msgid "update the trust database"
 msgstr "werk de vertrouwensdatabase bij"
 
-#: g10/g10.c:251
+#: g10/g10.c:252
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NAMEN]|controleer de vertrouwensdatabase"
 
-#: g10/g10.c:252
+#: g10/g10.c:253
 msgid "fix a corrupted trust database"
 msgstr "repareer een beschadigde vertrouwensdatabase"
 
-#: g10/g10.c:253
+#: g10/g10.c:254
 msgid "De-Armor a file or stdin"
 msgstr "Verwijder de beveiliging op bestand of standaard invoer"
 
-#: g10/g10.c:255
+#: g10/g10.c:256
 msgid "En-Armor a file or stdin"
 msgstr "Voeg beveiliging toe aan bestad of standaard invoer"
 
-#: g10/g10.c:257
+#: g10/g10.c:258
 msgid "|algo [files]|print message digests"
 msgstr "|algo [bestanden]|geef controlegetal van berichten weer"
 
-#: g10/g10.c:261
+#: g10/g10.c:262
 msgid ""
 "@\n"
 "Options:\n"
@@ -487,163 +487,163 @@ msgstr ""
 "Opties:\n"
 " "
 
-#: g10/g10.c:263
+#: g10/g10.c:264
 msgid "create ascii armored output"
 msgstr "genereer beveiliging in ASCII"
 
-#: g10/g10.c:265
+#: g10/g10.c:266
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAAM|versleutel voor NAAM"
 
-#: g10/g10.c:268
+#: g10/g10.c:269
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAAM|gebruik NAAM als standaard ontvanger"
 
-#: g10/g10.c:270
+#: g10/g10.c:271
 msgid "use the default key as default recipient"
 msgstr "gebruik de standaard sleutel als standaard ontvanger"
 
-#: g10/g10.c:274
+#: g10/g10.c:275
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "gebruik deze gebruikersidentificatie om te ondertekenen of te decoderen"
 
-#: g10/g10.c:275
+#: g10/g10.c:276
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|stel compressieniveau in op N (uitzetten met 0)"
 
-#: g10/g10.c:277
+#: g10/g10.c:278
 msgid "use canonical text mode"
 msgstr "gebruik de verkorte tekstmodus"
 
-#: g10/g10.c:278
+#: g10/g10.c:279
 msgid "use as output file"
 msgstr "gebruik als uitvoerbestand"
 
-#: g10/g10.c:279
+#: g10/g10.c:280
 msgid "verbose"
 msgstr "geef meer informatie"
 
-#: g10/g10.c:280
+#: g10/g10.c:281
 msgid "be somewhat more quiet"
 msgstr "wees iets stiller"
 
-#: g10/g10.c:281
+#: g10/g10.c:282
 msgid "don't use the terminal at all"
 msgstr "gebruik de terminal helemaal niet"
 
-#: g10/g10.c:282
+#: g10/g10.c:283
 msgid "force v3 signatures"
 msgstr "forcees v3 ondertekening"
 
-#: g10/g10.c:283
+#: g10/g10.c:284
 msgid "always use a MDC for encryption"
 msgstr "gebruik altijd een MDC voor versleuteling"
 
-#: g10/g10.c:284
+#: g10/g10.c:285
 msgid "do not make any changes"
 msgstr "maak geen enkele verandering"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:286
+#: g10/g10.c:287
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/g10.c:287
+#: g10/g10.c:288
 msgid "batch mode: never ask"
 msgstr "doorlopende modus: vraag nooit"
 
-#: g10/g10.c:288
+#: g10/g10.c:289
 msgid "assume yes on most questions"
 msgstr "veronderstel ja als antwoord op de meeste vragen"
 
-#: g10/g10.c:289
+#: g10/g10.c:290
 msgid "assume no on most questions"
 msgstr "veronderstel nee als antwoord op de meeste vragen"
 
-#: g10/g10.c:290
+#: g10/g10.c:291
 msgid "add this keyring to the list of keyrings"
 msgstr "voeg deze sleutelbos toe aan de lijst van sleutelbossen"
 
-#: g10/g10.c:291
+#: g10/g10.c:292
 msgid "add this secret keyring to the list"
 msgstr "voeg deze geheime sleutelbos toe aan de lijst"
 
-#: g10/g10.c:292
+#: g10/g10.c:293
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAAM|gebruik NAAM als standaard geheime sleutel"
 
-#: g10/g10.c:293
+#: g10/g10.c:294
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|SERVER|gebruik deze sleutelserver om sleutels op te zoeken"
 
-#: g10/g10.c:294
+#: g10/g10.c:295
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAAM|zet tekenverzameling van terminal op NAAM"
 
-#: g10/g10.c:295
+#: g10/g10.c:296
 msgid "read options from file"
 msgstr "lees opties uit bestand"
 
-#: g10/g10.c:299
+#: g10/g10.c:300
 msgid "|FD|write status info to this FD"
 msgstr "|BB|schrijf status naar deze bestandsbeschrijver"
 
-#: g10/g10.c:304
+#: g10/g10.c:305
 msgid "|KEYID|ulimately trust this key"
 msgstr ""
 
-#: g10/g10.c:305
+#: g10/g10.c:306
 msgid "|FILE|load extension module FILE"
 msgstr "|BESTAND|laad extensiemodule BESTAND"
 
-#: g10/g10.c:306
+#: g10/g10.c:307
 msgid "emulate the mode described in RFC1991"
 msgstr "doe als RFC1991 voorschrijft"
 
-#: g10/g10.c:307
+#: g10/g10.c:308
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "zet alle pakket-, versleutel- en controle-opties naar OpenPGP gedrag"
 
-#: g10/g10.c:308
+#: g10/g10.c:309
 msgid "|N|use passphrase mode N"
 msgstr "|N|gebruik sleuteltekst modus N"
 
-#: g10/g10.c:310
+#: g10/g10.c:311
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAAM|gebruik berichtsamenvattingsalgoritme NAAM voor sleutelteksten"
 
-#: g10/g10.c:312
+#: g10/g10.c:313
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAAM|gebruik versleutelalgoritme NAAM voor sleutelteksten"
 
-#: g10/g10.c:313
+#: g10/g10.c:314
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAAM|gebruik versleutelalgoritme NAAM"
 
-#: g10/g10.c:314
+#: g10/g10.c:315
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAAM|gebruik berichtsamenvattingsalgoritme NAAM"
 
-#: g10/g10.c:315
+#: g10/g10.c:316
 msgid "|N|use compress algorithm N"
 msgstr "|N|gebruik compressiealgoritme N"
 
-#: g10/g10.c:316
+#: g10/g10.c:317
 msgid "throw keyid field of encrypted packets"
 msgstr "plaats geen sleutelidentificatieveld in versleutelde pakketten"
 
-#: g10/g10.c:317
+#: g10/g10.c:318
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NAAM=WAARDE|gebruik deze notitiegegevens"
 
-#: g10/g10.c:320
+#: g10/g10.c:321
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:323
+#: g10/g10.c:324
 msgid ""
 "@\n"
 "Examples:\n"
@@ -663,17 +663,17 @@ msgstr ""
 " --list-keys [namen]         toon sleutels\n"
 " --fingerprints [namen]      toon vingerafdrukken\n"
 
-#: g10/g10.c:427
+#: g10/g10.c:429
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Meld fouten in het programma a.u.b. aan <[email protected]>;\n"
 "fouten in de vertaling aan <[email protected]>.\n"
 
-#: g10/g10.c:431
+#: g10/g10.c:433
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Gebruik: gpg [opties] [bestanden] (-h voor hulp)"
 
-#: g10/g10.c:434
+#: g10/g10.c:436
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -683,7 +683,7 @@ msgstr ""
 "onderteken, controleer, versleutel of decodeer de ingevoerde gegevens\n"
 "standaardactie hangt af van de gegevens\n"
 
-#: g10/g10.c:441
+#: g10/g10.c:443
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -691,188 +691,188 @@ msgstr ""
 "\n"
 "Ondersteunde algoritmes:\n"
 
-#: g10/g10.c:520
+#: g10/g10.c:522
 msgid "usage: gpg [options] "
 msgstr "gebruik: gpg [opties] "
 
-#: g10/g10.c:573
+#: g10/g10.c:575
 msgid "conflicting commands\n"
 msgstr "tegenstrijdige commando's\n"
 
-#: g10/g10.c:713
+#: g10/g10.c:725
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "LET OP: geen bestand `%s' met standaardopties\n"
 
-#: g10/g10.c:717
+#: g10/g10.c:729
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "optiebestand `%s': %s\n"
 
-#: g10/g10.c:724
+#: g10/g10.c:736
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "opties inlezen van `%s'\n"
 
-#: g10/g10.c:925
+#: g10/g10.c:937
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s is een onbekende tekenverzameling\n"
 
-#: g10/g10.c:994
+#: g10/g10.c:1008
 msgid "WARNING: program may create a core file!\n"
 msgstr "LET OP: programma zou een geheugendump kunnen maken!\n"
 
-#: g10/g10.c:998 g10/g10.c:1007
+#: g10/g10.c:1012 g10/g10.c:1021
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "LET OP: %s is niet voor gewoon gebruik!\n"
 
-#: g10/g10.c:1000
+#: g10/g10.c:1014
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s is niet toegestaan met deze %s!\n"
 
-#: g10/g10.c:1003
+#: g10/g10.c:1017
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s heeft geen betekenis met %s!\n"
 
-#: g10/g10.c:1023 g10/g10.c:1035
+#: g10/g10.c:1037 g10/g10.c:1049
 msgid "selected cipher algorithm is invalid\n"
 msgstr "geselecteerd versleutelalgoritme is ongeldig\n"
 
-#: g10/g10.c:1029 g10/g10.c:1041
+#: g10/g10.c:1043 g10/g10.c:1055
 msgid "selected digest algorithm is invalid\n"
 msgstr "geselecteerd controle-algoritme is ongeldig\n"
 
-#: g10/g10.c:1045
+#: g10/g10.c:1059
 msgid "the given policy URL is invalid\n"
 msgstr "de gegeven beleids-URL is ongeldig\n"
 
-#: g10/g10.c:1048
+#: g10/g10.c:1062
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "compressie-algoritme moet in het bereik %d..%d liggen\n"
 
-#: g10/g10.c:1050
+#: g10/g10.c:1064
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed(?) moet groter zijn dan 0\n"
 
-#: g10/g10.c:1052
+#: g10/g10.c:1066
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed(?) moet groter zijn dan 1\n"
 
-#: g10/g10.c:1054
+#: g10/g10.c:1068
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth moet tussen de 1 en de 255 (inclusief) liggen\n"
 
-#: g10/g10.c:1057
+#: g10/g10.c:1071
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "LET OP: simpele S2K mode (0) wordt met klem afgeraden\n"
 
-#: g10/g10.c:1061
+#: g10/g10.c:1075
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ongeldige S2K modus; moet 0, 1 of 3 zijn\n"
 
-#: g10/g10.c:1146
+#: g10/g10.c:1160
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "fout bij het initialiseren van de vertrouwensdatabase: %s\n"
 
-#: g10/g10.c:1152
+#: g10/g10.c:1166
 msgid "--store [filename]"
 msgstr "--store [bestandsnaam]"
 
-#: g10/g10.c:1159
+#: g10/g10.c:1173
 msgid "--symmetric [filename]"
 msgstr "--symmetric [bestandsnaam]"
 
-#: g10/g10.c:1167
+#: g10/g10.c:1181
 msgid "--encrypt [filename]"
 msgstr "--encrypt [bestandsnaam]"
 
-#: g10/g10.c:1180
+#: g10/g10.c:1194
 msgid "--sign [filename]"
 msgstr "--sign [bestandsnaam]"
 
-#: g10/g10.c:1193
+#: g10/g10.c:1207
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [bestandsnaam]"
 
-#: g10/g10.c:1207
+#: g10/g10.c:1221
 msgid "--clearsign [filename]"
 msgstr "--clearsign [bestandsnaam]"
 
-#: g10/g10.c:1224
+#: g10/g10.c:1238
 msgid "--decrypt [filename]"
 msgstr "--decrypt [bestandsnaam]"
 
-#: g10/g10.c:1232
+#: g10/g10.c:1246
 msgid "--sign-key user-id"
 msgstr "--sign-key gebruikersidentificatie"
 
-#: g10/g10.c:1240
+#: g10/g10.c:1254
 msgid "--lsign-key user-id"
 msgstr "--lsign-key gebruikers-identificatie"
 
-#: g10/g10.c:1248
+#: g10/g10.c:1262
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key gebruikersidentificatie [opdrachten]"
 
-#: g10/g10.c:1264
+#: g10/g10.c:1278
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key gebruikersidentificatie"
 
-#: g10/g10.c:1267
+#: g10/g10.c:1281
 msgid "--delete-key user-id"
 msgstr "--delete-key gebruikersidentificatie"
 
-#: g10/encode.c:268 g10/g10.c:1304 g10/sign.c:393
+#: g10/encode.c:268 g10/g10.c:1318 g10/sign.c:393
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "kan %s niet openen: %s\n"
 
-#: g10/g10.c:1319
+#: g10/g10.c:1333
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [gebruikersidentificatie] [sleutelbos]"
 
-#: g10/g10.c:1385
+#: g10/g10.c:1399
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "opheffen van beveiliging mislukt: %s\n"
 
-#: g10/g10.c:1393
+#: g10/g10.c:1407
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "beveiligen mislukt: %s\n"
 
-#: g10/g10.c:1464
+#: g10/g10.c:1478
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ongeldig frommelalgoritme `%s'\n"
 
-#: g10/g10.c:1551
+#: g10/g10.c:1565
 msgid "[filename]"
 msgstr "[bestandsnaam]"
 
-#: g10/g10.c:1555
+#: g10/g10.c:1569
 msgid "Go ahead and type your message ...\n"
 msgstr "Gaat uw gang, type het bericht ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1558 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:59 g10/g10.c:1572 g10/verify.c:94 g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan `%s' niet openen\n"
 
-#: g10/g10.c:1767
+#: g10/g10.c:1781
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr ""
 "het eerste teken van een notitienaam moet een letter of laag liggend steepje "
 "zijn\n"
 
-#: g10/g10.c:1773
+#: g10/g10.c:1787
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -880,11 +880,11 @@ msgstr ""
 "een notitienaam mag alleen letters, cijfers, punten of underscores bevatten "
 "en eindig met een =\n"
 
-#: g10/g10.c:1779
+#: g10/g10.c:1793
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr "punten in notitienamen moeten omgeven zijn door andere tekens\n"
 
-#: g10/g10.c:1787
+#: g10/g10.c:1801
 msgid "a notation value must not use any control characters\n"
 msgstr "een notitienaam mag geen controletekens bevatten\n"
 
@@ -1579,21 +1579,21 @@ msgstr "DSA sleutelpaar zal 1024 bits lang zijn.\n"
 msgid "Key generation canceled.\n"
 msgstr "Sleutelgeneratie afgebroken.\n"
 
-#: g10/keygen.c:1571
+#: g10/keygen.c:1572
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "Openbaar certificaat wordt geschreven naar `%s'\n"
 
-#: g10/keygen.c:1572
+#: g10/keygen.c:1573
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "Geheim certificaat wordt weggeschreven naar `%s'\n"
 
-#: g10/keygen.c:1668
+#: g10/keygen.c:1670
 msgid "public and secret key created and signed.\n"
 msgstr "openbare en geheime sleutels zijn gemaakt en getekend.\n"
 
-#: g10/keygen.c:1673
+#: g10/keygen.c:1675
 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"
@@ -1602,12 +1602,12 @@ msgstr ""
 "U wilt misschien het commando \"--edit-key\" gebruiken om een tweede\n"
 "sleutel te maken hiervoor.\n"
 
-#: g10/keygen.c:1690 g10/keygen.c:1791
+#: g10/keygen.c:1692 g10/keygen.c:1798
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Sleutelgeneratie is mislukt: %s\n"
 
-#: g10/keygen.c:1734 g10/sig-check.c:315 g10/sign.c:112
+#: g10/keygen.c:1739 g10/sig-check.c:315 g10/sign.c:112
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1615,7 +1615,7 @@ msgstr ""
 "Sleutel is %lu seconden in de toekomst gemaakt (tijdsverschuiving of\n"
 "klokprobleem)\n"
 
-#: g10/keygen.c:1736 g10/sig-check.c:317 g10/sign.c:114
+#: g10/keygen.c:1741 g10/sig-check.c:317 g10/sign.c:114
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1623,7 +1623,7 @@ msgstr ""
 "sleutel is %lu seconden in de toekomst gemaakt (tijdsverschuiving of\n"
 "klokprobleem)\n"
 
-#: g10/keygen.c:1769
+#: g10/keygen.c:1774
 msgid "Really create? "
 msgstr "Echt maken? "
 
@@ -2585,7 +2585,7 @@ msgid "revoked"
 msgstr "revkey"
 
 #. of subkey
-#: g10/keylist.c:400 g10/mainproc.c:834
+#: g10/keylist.c:404 g10/mainproc.c:834
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "Sleutel verloopt op %s\n"
@@ -2735,7 +2735,7 @@ msgstr ""
 msgid "can't connect to `%s': %s\n"
 msgstr "kan geen verbinding maken met `%s': %s\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:557
+#: g10/passphrase.c:313 g10/passphrase.c:574
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (hoofdsleutelnummer %08lX)"
@@ -2778,7 +2778,7 @@ msgstr ""
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
 
-#: g10/passphrase.c:543
+#: g10/passphrase.c:560
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2788,20 +2788,20 @@ msgstr ""
 "U heeft een sleuteltekst nodig om de beveiliging voor de geheime\n"
 "sleutel voor gebruiker op te heffen: \""
 
-#: g10/passphrase.c:552
+#: g10/passphrase.c:569
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "%u-bit %s sleutel, nummer %08lX, gemaakt op %s"
 
-#: g10/passphrase.c:590
+#: g10/passphrase.c:607
 msgid "can't query password in batchmode\n"
 msgstr "kan niet om wachtwoord vragen in lopende band-modus\n"
 
-#: g10/passphrase.c:594
+#: g10/passphrase.c:611
 msgid "Enter passphrase: "
 msgstr "Geef de sleuteltekst: "
 
-#: g10/passphrase.c:598
+#: g10/passphrase.c:615
 msgid "Repeat passphrase: "
 msgstr "Herhaal de sleuteltekst: "
 
@@ -2935,12 +2935,12 @@ msgstr "openbare sleutel is %lu seconde nieuwer dan de ondertekening\n"
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "openbare sleutel is %lu seconden nieuwer dan de ondertekening\n"
 
-#: g10/sig-check.c:324
-#, c-format
-msgid "NOTE: signature key expired %s\n"
+#: g10/sig-check.c:328
+#, fuzzy, c-format
+msgid "NOTE: signature key %08lX expired %s\n"
 msgstr "LET OP: sleutel voor ondertekening is vervallen op %s\n"
 
-#: g10/sig-check.c:393
+#: g10/sig-check.c:398
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "foutieve ondertekening aangenomen wegens een onbekende kritische bit\n"
 
diff --git a/po/pl.po b/po/pl.po
index ccc77932f..5034fab50 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.0.4\n"
-"POT-Creation-Date: 2000-12-19 11:58+0100\n"
+"POT-Creation-Date: 2001-01-11 13:11+0100\n"
 "PO-Revision-Date: 2000-10-18 22:54+02:00\n"
 "Last-Translator: Janusz A. Urbanowicz <[email protected]>\n"
 "Language-Team: Polish <[email protected]>\n"
@@ -350,7 +350,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:210
+#: g10/g10.c:211
 msgid ""
 "@Commands:\n"
 " "
@@ -358,139 +358,139 @@ msgstr ""
 "@Polecenia:\n"
 " "
 
-#: g10/g10.c:212
+#: g10/g10.c:213
 msgid "|[file]|make a signature"
 msgstr "|[plik]|z�o�enie podpisu"
 
-#: g10/g10.c:213
+#: g10/g10.c:214
 msgid "|[file]|make a clear text signature"
 msgstr "|[plik]|z�o�enie podpisu na czytelnym dokumencie"
 
-#: g10/g10.c:214
+#: g10/g10.c:215
 msgid "make a detached signature"
 msgstr "z�o�enie podpisu oddzielonego od dokumentu"
 
-#: g10/g10.c:215
+#: g10/g10.c:216
 msgid "encrypt data"
 msgstr "szyfrowanie danych"
 
-#: g10/g10.c:216
+#: g10/g10.c:217
 msgid "encryption only with symmetric cipher"
 msgstr "szyfrowanie tylko szyfrem symetrycznym"
 
-#: g10/g10.c:217
+#: g10/g10.c:218
 msgid "store only"
 msgstr "tylko zapis"
 
-#: g10/g10.c:218
+#: g10/g10.c:219
 msgid "decrypt data (default)"
 msgstr "odszyfrowywanie danych (domy�lnie)"
 
-#: g10/g10.c:219
+#: g10/g10.c:220
 msgid "verify a signature"
 msgstr "sprawdzenie podpisu"
 
-#: g10/g10.c:221
+#: g10/g10.c:222
 msgid "list keys"
 msgstr "lista kluczy"
 
-#: g10/g10.c:223
+#: g10/g10.c:224
 msgid "list keys and signatures"
 msgstr "lista kluczy i podpis�w"
 
-#: g10/g10.c:224
+#: g10/g10.c:225
 msgid "check key signatures"
 msgstr "sprawdzenie podpis�w kluczy"
 
-#: g10/g10.c:225
+#: g10/g10.c:226
 msgid "list keys and fingerprints"
 msgstr "lista kluczy i ich odcisk�w"
 
-#: g10/g10.c:226
+#: g10/g10.c:227
 msgid "list secret keys"
 msgstr "lista kluczy tajnych"
 
-#: g10/g10.c:227
+#: g10/g10.c:228
 msgid "generate a new key pair"
 msgstr "generacja nowej pary klucza"
 
-#: g10/g10.c:228
+#: g10/g10.c:229
 msgid "remove key from the public keyring"
 msgstr "usuni�cie klucza ze zbioru kluczy publicznych"
 
-#: g10/g10.c:230
+#: g10/g10.c:231
 msgid "remove key from the secret keyring"
 msgstr "usuni�cie klucza ze zbioru kluczy tajnych"
 
-#: g10/g10.c:231
+#: g10/g10.c:232
 msgid "sign a key"
 msgstr "z�o�enie podpisu na kluczu"
 
-#: g10/g10.c:232
+#: g10/g10.c:233
 msgid "sign a key locally"
 msgstr "z�o�enie lokalnego podpisu na kluczu"
 
-#: g10/g10.c:233
+#: g10/g10.c:234
 msgid "sign or edit a key"
 msgstr "podpisanie lub modyfikacja klucza"
 
-#: g10/g10.c:234
+#: g10/g10.c:235
 msgid "generate a revocation certificate"
 msgstr "generacja certyfikatu uniewa�nienia klucza"
 
-#: g10/g10.c:235
+#: g10/g10.c:236
 msgid "export keys"
 msgstr "eksport kluczy do pliku"
 
-#: g10/g10.c:236
+#: g10/g10.c:237
 msgid "export keys to a key server"
 msgstr "eksport kluczy do serwera kluczy"
 
-#: g10/g10.c:237
+#: g10/g10.c:238
 msgid "import keys from a key server"
 msgstr "import kluczy z serwera kluczy"
 
-#: g10/g10.c:241
+#: g10/g10.c:242
 msgid "import/merge keys"
 msgstr "import/do��czenie kluczy"
 
-#: g10/g10.c:243
+#: g10/g10.c:244
 msgid "list only the sequence of packets"
 msgstr "wypisane sekwencji pakiet�w"
 
-#: g10/g10.c:245
+#: g10/g10.c:246
 msgid "export the ownertrust values"
 msgstr "eksport warto�ci zaufania"
 
-#: g10/g10.c:247
+#: g10/g10.c:248
 msgid "import ownertrust values"
 msgstr "wczytanie warto��i zaufania"
 
-#: g10/g10.c:249
+#: g10/g10.c:250
 msgid "update the trust database"
 msgstr "uaktualnienie bazy zaufania"
 
-#: g10/g10.c:251
+#: g10/g10.c:252
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NAZWY]|sprawdzenie bazy zaufania"
 
-#: g10/g10.c:252
+#: g10/g10.c:253
 msgid "fix a corrupted trust database"
 msgstr "naprawa uszkodzonej bazy zaufania"
 
-#: g10/g10.c:253
+#: g10/g10.c:254
 msgid "De-Armor a file or stdin"
 msgstr "zdj�cie opakowania ASCII pliku lub potoku"
 
-#: g10/g10.c:255
+#: g10/g10.c:256
 msgid "En-Armor a file or stdin"
 msgstr "opakowanie ASCII pliku lub potoku"
 
-#: g10/g10.c:257
+#: g10/g10.c:258
 msgid "|algo [files]|print message digests"
 msgstr "|algo [pliki]|skr�ty wiadomo�ci"
 
-#: g10/g10.c:261
+#: g10/g10.c:262
 msgid ""
 "@\n"
 "Options:\n"
@@ -500,156 +500,156 @@ msgstr ""
 "Opcje:\n"
 " "
 
-#: g10/g10.c:263
+#: g10/g10.c:264
 msgid "create ascii armored output"
 msgstr "plik wynikowy w opakowaniu ASCII"
 
-#: g10/g10.c:265
+#: g10/g10.c:266
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAZWA|szyfrowanie dla odbiorcy NAZWA"
 
-#: g10/g10.c:268
+#: g10/g10.c:269
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAZWA|u�ycie NAZWA jako domy�lnego adresata"
 
-#: g10/g10.c:270
+#: g10/g10.c:271
 msgid "use the default key as default recipient"
 msgstr "domy�lny klucz jest domy�lnym adresatem"
 
-#: g10/g10.c:274
+#: g10/g10.c:275
 msgid "use this user-id to sign or decrypt"
 msgstr "identyfikator do podpisania lub odszyfrowania"
 
-#: g10/g10.c:275
+#: g10/g10.c:276
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|poziom kompresji N (0 - brak)"
 
-#: g10/g10.c:277
+#: g10/g10.c:278
 msgid "use canonical text mode"
 msgstr "kanoniczny format tekstowy"
 
-#: g10/g10.c:278
+#: g10/g10.c:279
 msgid "use as output file"
 msgstr "plik wyj�ciowy"
 
-#: g10/g10.c:279
+#: g10/g10.c:280
 msgid "verbose"
 msgstr "z informacjami dodatkowymi"
 
-#: g10/g10.c:280
+#: g10/g10.c:281
 msgid "be somewhat more quiet"
 msgstr "mniej komunikat�ww"
 
-#: g10/g10.c:281
+#: g10/g10.c:282
 msgid "don't use the terminal at all"
 msgstr "bez odwo�a� do terminala"
 
-#: g10/g10.c:282
+#: g10/g10.c:283
 msgid "force v3 signatures"
 msgstr "wymuszenie trzeciej wersji formatu podpis�w"
 
-#: g10/g10.c:283
+#: g10/g10.c:284
 msgid "always use a MDC for encryption"
 msgstr "do szyfrowania b�dzie u�ywany MDC"
 
-#: g10/g10.c:284
+#: g10/g10.c:285
 msgid "do not make any changes"
 msgstr "pozostawienie bez zmian"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:286
+#: g10/g10.c:287
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/g10.c:287
+#: g10/g10.c:288
 msgid "batch mode: never ask"
 msgstr "tryb wsadowy: �adnych pyta�"
 
-#: g10/g10.c:288
+#: g10/g10.c:289
 msgid "assume yes on most questions"
 msgstr "automatyczna odpowied� tak na wi�kszo�� pyta�"
 
-#: g10/g10.c:289
+#: g10/g10.c:290
 msgid "assume no on most questions"
 msgstr "automatyczna odpowied� nie na wi�kszo�� pyta�"
 
-#: g10/g10.c:290
+#: g10/g10.c:291
 msgid "add this keyring to the list of keyrings"
 msgstr "doda� zbi�r kluczy do listy u�ywanych"
 
-#: g10/g10.c:291
+#: g10/g10.c:292
 msgid "add this secret keyring to the list"
 msgstr "doda� zbi�r kluczy tajnych do listy"
 
-#: g10/g10.c:292
+#: g10/g10.c:293
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAZWA|u�ycie NAZWA jako domy�lnego klucza tajnego"
 
-#: g10/g10.c:293
+#: g10/g10.c:294
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|serwer kluczy w kt�rym b�d� poszukiwane"
 
-#: g10/g10.c:294
+#: g10/g10.c:295
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAZWA|zestaw znak�w terminala NAZWA"
 
-#: g10/g10.c:295
+#: g10/g10.c:296
 msgid "read options from file"
 msgstr "wczytanie opcji z pliku"
 
-#: g10/g10.c:299
+#: g10/g10.c:300
 msgid "|FD|write status info to this FD"
 msgstr "|FD|zapisa� opis stanu do FD"
 
-#: g10/g10.c:304
+#: g10/g10.c:305
 msgid "|KEYID|ulimately trust this key"
 msgstr "|KLUCZ|ca�kowite zaufanie dla tego klucza"
 
-#: g10/g10.c:305
+#: g10/g10.c:306
 msgid "|FILE|load extension module FILE"
 msgstr "|PLIK|�adowanie modu�u rozszerzenia z PLIK"
 
-#: g10/g10.c:306
+#: g10/g10.c:307
 msgid "emulate the mode described in RFC1991"
 msgstr "emulacja trybu opisanego w RFC1991"
 
-#: g10/g10.c:307
+#: g10/g10.c:308
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "zgodno�� ustawie� pakiet�w, szyfr�w i skr�t�w z OpenPGP"
 
-#: g10/g10.c:308
+#: g10/g10.c:309
 msgid "|N|use passphrase mode N"
 msgstr "|N|N-ty tryb wprowadzania wyra�enia przej�ciowego"
 
-#: g10/g10.c:310
+#: g10/g10.c:311
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|ALG|algorytm obliczania skr�t�w wiadomo�ci ALG"
 
-#: g10/g10.c:312
+#: g10/g10.c:313
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|ALG|algorytmu szyfruj�cy ALG dla has�a"
 
-#: g10/g10.c:313
+#: g10/g10.c:314
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAZWA|algorytm szyfruj�cy NAZWA"
 
-#: g10/g10.c:314
+#: g10/g10.c:315
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAZWA|algorytm obliczania skr�t�w wiadomo�ci NAZWA"
 
-#: g10/g10.c:315
+#: g10/g10.c:316
 msgid "|N|use compress algorithm N"
 msgstr "|N|algorytm kompresji N"
 
-#: g10/g10.c:316
+#: g10/g10.c:317
 msgid "throw keyid field of encrypted packets"
 msgstr "usuni�cie identyfikator�w kluczy z pakiet�w"
 
-#: g10/g10.c:317
+#: g10/g10.c:318
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NAZWA=WARTO��|adnotacje"
 
-#: g10/g10.c:320
+#: g10/g10.c:321
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -657,7 +657,7 @@ msgstr ""
 "@\n"
 "(Pe�n� list� polece� i opcji mo�na znale�� w podr�czniku systemowym.)\n"
 
-#: g10/g10.c:323
+#: g10/g10.c:324
 msgid ""
 "@\n"
 "Examples:\n"
@@ -678,15 +678,15 @@ msgstr ""
 " --list-keys [nazwy]        pokazuje klucze\n"
 " --fingerprint [nazwy]      pokazuje odciski kluczy\n"
 
-#: g10/g10.c:427
+#: g10/g10.c:429
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "B��dy prosimy zg�asza� na adres <[email protected]>.\n"
 
-#: g10/g10.c:431
+#: g10/g10.c:433
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Wywo�anie: gpg [opcje] [pliki] (-h podaje pomoc)"
 
-#: g10/g10.c:434
+#: g10/g10.c:436
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -696,7 +696,7 @@ msgstr ""
 "podpisywanie, sprawdzanie podpis�w, szyfrowanie, deszyfrowanie\n"
 "domy�lnie wykonywana operacja zale�y od danych wej�ciowych\n"
 
-#: g10/g10.c:441
+#: g10/g10.c:443
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -704,186 +704,186 @@ msgstr ""
 "\n"
 "Obs�ugiwane algorytmy:\n"
 
-#: g10/g10.c:520
+#: g10/g10.c:522
 msgid "usage: gpg [options] "
 msgstr "wywo�anie: gpg [opcje]"
 
-#: g10/g10.c:573
+#: g10/g10.c:575
 msgid "conflicting commands\n"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/g10.c:713
+#: g10/g10.c:725
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "UWAGA: brak domy�lnego pliku opcji '%s'\n"
 
-#: g10/g10.c:717
+#: g10/g10.c:729
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "plik opcji '%s': %s\n"
 
-#: g10/g10.c:724
+#: g10/g10.c:736
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "odczyt opcji z '%s'\n"
 
-#: g10/g10.c:925
+#: g10/g10.c:937
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
 
-#: g10/g10.c:994
+#: g10/g10.c:1008
 msgid "WARNING: program may create a core file!\n"
 msgstr "OSTRZE�ENIE: program mo�e stworzy� plik zrzutu pami�ci!\n"
 
-#: g10/g10.c:998 g10/g10.c:1007
+#: g10/g10.c:1012 g10/g10.c:1021
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "UWAGA: %s nie jest do normalnego u�ytku!\n"
 
-#: g10/g10.c:1000
+#: g10/g10.c:1014
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nie wolno u�ywa� %s z %s!\n"
 
-#: g10/g10.c:1003
+#: g10/g10.c:1017
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nie ma sensu z %s!\n"
 
-#: g10/g10.c:1023 g10/g10.c:1035
+#: g10/g10.c:1037 g10/g10.c:1049
 msgid "selected cipher algorithm is invalid\n"
 msgstr "wybrany algorytm szyfruj�cy jest niepoprawny\n"
 
-#: g10/g10.c:1029 g10/g10.c:1041
+#: g10/g10.c:1043 g10/g10.c:1055
 msgid "selected digest algorithm is invalid\n"
 msgstr "wybrany algorytm geenracji skr�t�w wiadomo�ci jest niepoprawny\n"
 
-#: g10/g10.c:1045
+#: g10/g10.c:1059
 msgid "the given policy URL is invalid\n"
 msgstr "podany URL regulaminu jest niepoprawny\n"
 
-#: g10/g10.c:1048
+#: g10/g10.c:1062
 #, 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:1050
+#: g10/g10.c:1064
 msgid "completes-needed must be greater than 0\n"
 msgstr "warto�� completes-needed musi by� wi�ksza od 0\n"
 
-#: g10/g10.c:1052
+#: g10/g10.c:1066
 msgid "marginals-needed must be greater than 1\n"
 msgstr "warto�� marginals-needed musi by� wi�ksza od 1\n"
 
-#: g10/g10.c:1054
+#: g10/g10.c:1068
 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:1057
+#: g10/g10.c:1071
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "UWAGA: prosty tryb S2K (0) jest stanowczo odradzany\n"
 
-#: g10/g10.c:1061
+#: g10/g10.c:1075
 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:1146
+#: g10/g10.c:1160
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
 
-#: g10/g10.c:1152
+#: g10/g10.c:1166
 msgid "--store [filename]"
 msgstr "--store [plik]"
 
-#: g10/g10.c:1159
+#: g10/g10.c:1173
 msgid "--symmetric [filename]"
 msgstr "--symmetric [plik]"
 
-#: g10/g10.c:1167
+#: g10/g10.c:1181
 msgid "--encrypt [filename]"
 msgstr "--encrypt [plik]"
 
-#: g10/g10.c:1180
+#: g10/g10.c:1194
 msgid "--sign [filename]"
 msgstr "--sign [plik]"
 
-#: g10/g10.c:1193
+#: g10/g10.c:1207
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/g10.c:1207
+#: g10/g10.c:1221
 msgid "--clearsign [filename]"
 msgstr "--clearsign [plik]\""
 
-#: g10/g10.c:1224
+#: g10/g10.c:1238
 msgid "--decrypt [filename]"
 msgstr "--decrypt [plik]"
 
-#: g10/g10.c:1232
+#: g10/g10.c:1246
 msgid "--sign-key user-id"
 msgstr "--sign-key nazwa u�ytkownika"
 
-#: g10/g10.c:1240
+#: g10/g10.c:1254
 msgid "--lsign-key user-id"
 msgstr "--lsign-key nazwa u�ytkownika"
 
-#: g10/g10.c:1248
+#: g10/g10.c:1262
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key nazwa u�ytkownika [polecenia]"
 
-#: g10/g10.c:1264
+#: g10/g10.c:1278
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key nazwa u�ytkownika"
 
-#: g10/g10.c:1267
+#: g10/g10.c:1281
 msgid "--delete-key user-id"
 msgstr "--delete-key nazwa u�ytkownika"
 
-#: g10/encode.c:268 g10/g10.c:1304 g10/sign.c:393
+#: g10/encode.c:268 g10/g10.c:1318 g10/sign.c:393
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "nie mo�na otworzy� %s: %s\n"
 
-#: g10/g10.c:1319
+#: g10/g10.c:1333
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [identyfikator] [zbi�r kluczy]"
 
-#: g10/g10.c:1385
+#: g10/g10.c:1399
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zdj�cie opakowania ASCII nie powiod�o si�: %s\n"
 
-#: g10/g10.c:1393
+#: g10/g10.c:1407
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "opakowywanie ASCII nie powiod�o si�: %s\n"
 
-#: g10/g10.c:1464
+#: g10/g10.c:1478
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "niew�a�ciwy algorytm skr�tu '%s'\n"
 
-#: g10/g10.c:1551
+#: g10/g10.c:1565
 msgid "[filename]"
 msgstr "[nazwa pliku]"
 
-#: g10/g10.c:1555
+#: g10/g10.c:1569
 msgid "Go ahead and type your message ...\n"
 msgstr "Wpisz tutaj swoj� wiadomo�� ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1558 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:59 g10/g10.c:1572 g10/verify.c:94 g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nie mo�na otworzy� '%s'\n"
 
-#: g10/g10.c:1767
+#: g10/g10.c:1781
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr "adnotacja musi zaczyna� si� od podkre�lenia lub litery\n"
 
-#: g10/g10.c:1773
+#: g10/g10.c:1787
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -891,11 +891,11 @@ msgstr ""
 "nazwa adnotacji mo�e zawiera� tylko litery, cyfry, kropki,\n"
 "podkre�lenia, i musi ko�czy� si� '='\n"
 
-#: g10/g10.c:1779
+#: g10/g10.c:1793
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr "kropki w adnotacji musz� znajdowa� si� pomi�dzy innymi znakami\n"
 
-#: g10/g10.c:1787
+#: g10/g10.c:1801
 msgid "a notation value must not use any control characters\n"
 msgstr "warto�� adnotacji nie mo�e zawiera� znak�w steruj�cych\n"
 
@@ -1588,21 +1588,21 @@ msgstr "Para kluczy dla DSA b�dzie mia�a 1024 bity d�ugo�ci.\n"
 msgid "Key generation canceled.\n"
 msgstr "Procedura generacji klucza zosta�a anulowana.\n"
 
-#: g10/keygen.c:1571
+#: g10/keygen.c:1572
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "zapisuj� klucz publiczny w '%s'\n"
 
-#: g10/keygen.c:1572
+#: g10/keygen.c:1573
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: g10/keygen.c:1668
+#: g10/keygen.c:1670
 msgid "public and secret key created and signed.\n"
 msgstr "tajny i publiczny klucz zosta�y utworzone i podpisane.\n"
 
-#: g10/keygen.c:1673
+#: g10/keygen.c:1675
 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"
@@ -1610,12 +1610,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:1690 g10/keygen.c:1791
+#: g10/keygen.c:1692 g10/keygen.c:1798
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generacja klucza nie powiod�a si�: %s\n"
 
-#: g10/keygen.c:1734 g10/sig-check.c:315 g10/sign.c:112
+#: g10/keygen.c:1739 g10/sig-check.c:315 g10/sign.c:112
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1623,7 +1623,7 @@ msgstr ""
 "klucz zosta� stworzony %lu sekund� w przysz�o�ci (zaburzenia\n"
 "czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
 
-#: g10/keygen.c:1736 g10/sig-check.c:317 g10/sign.c:114
+#: g10/keygen.c:1741 g10/sig-check.c:317 g10/sign.c:114
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1631,7 +1631,7 @@ msgstr ""
 "klucz zosta� stworzony %lu sekund w przysz�o�ci (zaburzenia\n"
 "czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
 
-#: g10/keygen.c:1769
+#: g10/keygen.c:1774
 msgid "Really create? "
 msgstr "Na pewno utworzy�? "
 
@@ -2585,7 +2585,7 @@ msgid "revoked"
 msgstr "uniewa�niony"
 
 #. of subkey
-#: g10/keylist.c:400 g10/mainproc.c:834
+#: g10/keylist.c:404 g10/mainproc.c:834
 #, c-format
 msgid " [expires: %s]"
 msgstr "[wygasa :%s]"
@@ -2738,7 +2738,7 @@ msgstr ""
 msgid "can't connect to `%s': %s\n"
 msgstr "nie mo�na po��czy� si� z %s: %s\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:557
+#: g10/passphrase.c:313 g10/passphrase.c:574
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (g��wny ID klucza %08lX)"
@@ -2782,7 +2782,7 @@ msgstr ""
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
 
-#: g10/passphrase.c:543
+#: g10/passphrase.c:560
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2792,20 +2792,20 @@ msgstr ""
 "Musisz poda� wyra�enie przej�ciowe (has�o) aby uaktywni� klucz tajny\n"
 "dla u�ytkownika: \""
 
-#: g10/passphrase.c:552
+#: g10/passphrase.c:569
 #, 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:590
+#: g10/passphrase.c:607
 msgid "can't query password in batchmode\n"
 msgstr "pytanie o has�o nie dzia�a w trybie wsadowym\n"
 
-#: g10/passphrase.c:594
+#: g10/passphrase.c:611
 msgid "Enter passphrase: "
 msgstr "Wyra�enie przej�ciowe: "
 
-#: g10/passphrase.c:598
+#: g10/passphrase.c:615
 msgid "Repeat passphrase: "
 msgstr "Powt�rzone wyra�enie przej�ciowe: "
 
@@ -2940,12 +2940,12 @@ msgstr "klucz publiczny jest o %lu sekund m�odszy od podpisu\n"
 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:324
-#, c-format
-msgid "NOTE: signature key expired %s\n"
+#: g10/sig-check.c:328
+#, fuzzy, c-format
+msgid "NOTE: signature key %08lX expired %s\n"
 msgstr "UWAGA: klucz podpisuj�cy przekroczy� dat� wa�no�ci %s\n"
 
-#: g10/sig-check.c:393
+#: g10/sig-check.c:398
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 "przyj�to niewa�no�� podpisu z powonu ustawienia nieznanego bitu krytycznego\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index db355437e..778a5795f 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"POT-Creation-Date: 2000-12-19 11:58+0100\n"
+"POT-Creation-Date: 2001-01-11 13:11+0100\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"
@@ -343,7 +343,7 @@ msgstr ""
 "para que o sistema possa coletar mais entropia!\n"
 "(S�o necess�rios mais %d bytes)\n"
 
-#: g10/g10.c:210
+#: g10/g10.c:211
 msgid ""
 "@Commands:\n"
 " "
@@ -351,144 +351,144 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/g10.c:212
+#: g10/g10.c:213
 msgid "|[file]|make a signature"
 msgstr "|[arquivo]|fazer uma assinatura"
 
-#: g10/g10.c:213
+#: g10/g10.c:214
 msgid "|[file]|make a clear text signature"
 msgstr "|[arquivo]|fazer uma assinatura em texto puro"
 
-#: g10/g10.c:214
+#: g10/g10.c:215
 msgid "make a detached signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/g10.c:215
+#: g10/g10.c:216
 msgid "encrypt data"
 msgstr "criptografar dados"
 
-#: g10/g10.c:216
+#: g10/g10.c:217
 msgid "encryption only with symmetric cipher"
 msgstr ""
 "criptografar apenas com criptografia\n"
 "sim�trica"
 
-#: g10/g10.c:217
+#: g10/g10.c:218
 msgid "store only"
 msgstr "apenas armazenar"
 
-#: g10/g10.c:218
+#: g10/g10.c:219
 msgid "decrypt data (default)"
 msgstr "descriptografar dados (padr�o)"
 
-#: g10/g10.c:219
+#: g10/g10.c:220
 msgid "verify a signature"
 msgstr "verificar uma assinatura"
 
-#: g10/g10.c:221
+#: g10/g10.c:222
 msgid "list keys"
 msgstr "listar as chaves"
 
-#: g10/g10.c:223
+#: g10/g10.c:224
 msgid "list keys and signatures"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/g10.c:224
+#: g10/g10.c:225
 msgid "check key signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/g10.c:225
+#: g10/g10.c:226
 msgid "list keys and fingerprints"
 msgstr "listar as chaves e as impress�es digitais"
 
-#: g10/g10.c:226
+#: g10/g10.c:227
 msgid "list secret keys"
 msgstr "listar as chaves secretas"
 
-#: g10/g10.c:227
+#: g10/g10.c:228
 msgid "generate a new key pair"
 msgstr "gerar um novo par de chaves"
 
-#: g10/g10.c:228
+#: g10/g10.c:229
 msgid "remove key from the public keyring"
 msgstr "remover a chave do chaveiro p�blico"
 
-#: g10/g10.c:230
+#: g10/g10.c:231
 msgid "remove key from the secret keyring"
 msgstr "remover a chave do chaveiro secreto"
 
-#: g10/g10.c:231
+#: g10/g10.c:232
 msgid "sign a key"
 msgstr "assinar uma chave"
 
-#: g10/g10.c:232
+#: g10/g10.c:233
 msgid "sign a key locally"
 msgstr "assinar uma chave localmente"
 
-#: g10/g10.c:233
+#: g10/g10.c:234
 msgid "sign or edit a key"
 msgstr "assinar ou editar uma chave"
 
-#: g10/g10.c:234
+#: g10/g10.c:235
 msgid "generate a revocation certificate"
 msgstr "gerar um certificado de revoga��o"
 
-#: g10/g10.c:235
+#: g10/g10.c:236
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/g10.c:236
+#: g10/g10.c:237
 msgid "export keys to a key server"
 msgstr "exportar chaves para um servidor"
 
-#: g10/g10.c:237
+#: g10/g10.c:238
 msgid "import keys from a key server"
 msgstr "importar chaves de um servidor"
 
-#: g10/g10.c:241
+#: g10/g10.c:242
 msgid "import/merge keys"
 msgstr "importar/fundir chaves"
 
-#: g10/g10.c:243
+#: g10/g10.c:244
 msgid "list only the sequence of packets"
 msgstr "listar apenas as seq��ncias de pacotes"
 
 # ownertrust ???
-#: g10/g10.c:245
+#: g10/g10.c:246
 msgid "export the ownertrust values"
 msgstr "exportar os valores de confian�a"
 
-#: g10/g10.c:247
+#: g10/g10.c:248
 msgid "import ownertrust values"
 msgstr "importar os valores de confian�a"
 
-#: g10/g10.c:249
+#: g10/g10.c:250
 msgid "update the trust database"
 msgstr "atualizar o banco de dados de confiabilidade"
 
-#: g10/g10.c:251
+#: g10/g10.c:252
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMES]|verificar o banco de dados de confiabilidade"
 
-#: g10/g10.c:252
+#: g10/g10.c:253
 msgid "fix a corrupted trust database"
 msgstr ""
 "consertar um banco de dados de confiabilidade\n"
 "danificado"
 
-#: g10/g10.c:253
+#: g10/g10.c:254
 msgid "De-Armor a file or stdin"
 msgstr "retirar a armadura de um arquivo ou de \"stdin\""
 
-#: g10/g10.c:255
+#: g10/g10.c:256
 msgid "En-Armor a file or stdin"
 msgstr "criar armadura para um arquivo ou \"stdin\""
 
-#: g10/g10.c:257
+#: g10/g10.c:258
 msgid "|algo [files]|print message digests"
 msgstr "|algo [arquivos]|imprimir \"digests\" de mensagens"
 
-#: g10/g10.c:261
+#: g10/g10.c:262
 msgid ""
 "@\n"
 "Options:\n"
@@ -498,179 +498,179 @@ msgstr ""
 "Op��es:\n"
 " "
 
-#: g10/g10.c:263
+#: g10/g10.c:264
 msgid "create ascii armored output"
 msgstr "criar sa�da com armadura ascii"
 
-#: g10/g10.c:265
+#: g10/g10.c:266
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|criptografar para NOME"
 
-#: g10/g10.c:268
+#: g10/g10.c:269
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|usar NOME como destinat�rio padr�o"
 
-#: g10/g10.c:270
+#: g10/g10.c:271
 msgid "use the default key as default recipient"
 msgstr "usar a chave padr�o como destinat�rio padr�o"
 
-#: g10/g10.c:274
+#: g10/g10.c:275
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "usar este identificador de usu�rio para\n"
 "assinar ou descriptografar"
 
-#: g10/g10.c:275
+#: g10/g10.c:276
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|estabelecer n�vel de compress�o N\n"
 "(0 desabilita)"
 
-#: g10/g10.c:277
+#: g10/g10.c:278
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/g10.c:278
+#: g10/g10.c:279
 msgid "use as output file"
 msgstr "usar como arquivo de sa�da"
 
-#: g10/g10.c:279
+#: g10/g10.c:280
 msgid "verbose"
 msgstr "detalhado"
 
-#: g10/g10.c:280
+#: g10/g10.c:281
 msgid "be somewhat more quiet"
 msgstr "ser mais silencioso"
 
-#: g10/g10.c:281
+#: g10/g10.c:282
 msgid "don't use the terminal at all"
 msgstr "nunca usar o terminal"
 
-#: g10/g10.c:282
+#: g10/g10.c:283
 msgid "force v3 signatures"
 msgstr "for�ar assinaturas v3"
 
-#: g10/g10.c:283
+#: g10/g10.c:284
 msgid "always use a MDC for encryption"
 msgstr "sempre usar um MDC para criptografar"
 
-#: g10/g10.c:284
+#: g10/g10.c:285
 msgid "do not make any changes"
 msgstr "n�o fazer altera��es"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:286
+#: g10/g10.c:287
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/g10.c:287
+#: g10/g10.c:288
 msgid "batch mode: never ask"
 msgstr "modo n�o-interativo: nunca perguntar"
 
-#: g10/g10.c:288
+#: g10/g10.c:289
 msgid "assume yes on most questions"
 msgstr "assumir sim para a maioria das perguntas"
 
-#: g10/g10.c:289
+#: g10/g10.c:290
 msgid "assume no on most questions"
 msgstr "assumir n�o para a maioria das perguntas"
 
-#: g10/g10.c:290
+#: g10/g10.c:291
 msgid "add this keyring to the list of keyrings"
 msgstr "adicionar este chaveiro � lista de chaveiros"
 
-#: g10/g10.c:291
+#: g10/g10.c:292
 msgid "add this secret keyring to the list"
 msgstr "adicionar este chaveiro secreto � lista"
 
-#: g10/g10.c:292
+#: g10/g10.c:293
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usar NOME como chave secreta padr�o"
 
-#: g10/g10.c:293
+#: g10/g10.c:294
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|ENDERE�O|usar este servidor para buscar chaves"
 
-#: g10/g10.c:294
+#: g10/g10.c:295
 msgid "|NAME|set terminal charset to NAME"
 msgstr ""
 "|NOME|definir mapa de caracteres do terminal como\n"
 "NOME"
 
-#: g10/g10.c:295
+#: g10/g10.c:296
 msgid "read options from file"
 msgstr "ler op��es do arquivo"
 
-#: g10/g10.c:299
+#: g10/g10.c:300
 msgid "|FD|write status info to this FD"
 msgstr ""
 "|DA|escrever informa��es de estado para o\n"
 "descritor de arquivo DA"
 
-#: g10/g10.c:304
+#: g10/g10.c:305
 msgid "|KEYID|ulimately trust this key"
 msgstr ""
 
-#: g10/g10.c:305
+#: g10/g10.c:306
 msgid "|FILE|load extension module FILE"
 msgstr "|ARQUIVO|carregar m�dulo de extens�o ARQUIVO"
 
-#: g10/g10.c:306
+#: g10/g10.c:307
 msgid "emulate the mode described in RFC1991"
 msgstr "emular o modo descrito no RFC1991"
 
-#: g10/g10.c:307
+#: g10/g10.c:308
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 "configurar todas as op��es de pacote,\n"
 "criptografia e \"digest\" para comportamento\n"
 "OpenPGP"
 
-#: g10/g10.c:308
+#: g10/g10.c:309
 msgid "|N|use passphrase mode N"
 msgstr "|N|usar frase secreta modo N"
 
-#: g10/g10.c:310
+#: g10/g10.c:311
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr ""
 "|NOME|usar algoritmo de \"digest\" de mensagens NOME\n"
 "para frases secretas"
 
-#: g10/g10.c:312
+#: g10/g10.c:313
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr ""
 "|NOME|usar algoritmo de criptografia NOME para\n"
 "frases secretas"
 
-#: g10/g10.c:313
+#: g10/g10.c:314
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usar algoritmo de criptografia NOME"
 
-#: g10/g10.c:314
+#: g10/g10.c:315
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usar algoritmo de \"digest\" de mensagens NOME"
 
-#: g10/g10.c:315
+#: g10/g10.c:316
 msgid "|N|use compress algorithm N"
 msgstr "|N|usar algoritmo de compress�o N"
 
-#: g10/g10.c:316
+#: g10/g10.c:317
 msgid "throw keyid field of encrypted packets"
 msgstr ""
 "eliminar o campo keyid dos pacotes\n"
 "criptografados"
 
-#: g10/g10.c:317
+#: g10/g10.c:318
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOME=VALOR|usar estes dados de nota��o"
 
-#: g10/g10.c:320
+#: g10/g10.c:321
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:323
+#: g10/g10.c:324
 msgid ""
 "@\n"
 "Examples:\n"
@@ -690,15 +690,15 @@ msgstr ""
 " --list-keys [nomes]        mostrar chaves\n"
 " --fingerprint [nomes]      mostrar impress�es digitais\n"
 
-#: g10/g10.c:427
+#: g10/g10.c:429
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Por favor comunique bugs para <[email protected]>.\n"
 
-#: g10/g10.c:431
+#: g10/g10.c:433
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
 
-#: g10/g10.c:434
+#: g10/g10.c:436
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -708,7 +708,7 @@ msgstr ""
 "assina, verifica, criptografa ou descriptografa\n"
 "a opera��o padr�o depende dos dados de entrada\n"
 
-#: g10/g10.c:441
+#: g10/g10.c:443
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -716,189 +716,189 @@ msgstr ""
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/g10.c:520
+#: g10/g10.c:522
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [op��es] "
 
-#: g10/g10.c:573
+#: g10/g10.c:575
 msgid "conflicting commands\n"
 msgstr "comandos conflitantes\n"
 
-#: g10/g10.c:713
+#: g10/g10.c:725
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: arquivo de op��es padr�o `%s' inexistente\n"
 
-#: g10/g10.c:717
+#: g10/g10.c:729
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "arquivo de op��es `%s': %s\n"
 
-#: g10/g10.c:724
+#: g10/g10.c:736
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo op��es de `%s'\n"
 
-#: g10/g10.c:925
+#: g10/g10.c:937
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/g10.c:994
+#: g10/g10.c:1008
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um arquivo core!\n"
 
-#: g10/g10.c:998 g10/g10.c:1007
+#: g10/g10.c:1012 g10/g10.c:1021
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s n�o � para uso normal!\n"
 
-#: g10/g10.c:1000
+#: g10/g10.c:1014
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: g10/g10.c:1003
+#: g10/g10.c:1017
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/g10.c:1023 g10/g10.c:1035
+#: g10/g10.c:1037 g10/g10.c:1049
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/g10.c:1029 g10/g10.c:1041
+#: g10/g10.c:1043 g10/g10.c:1055
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/g10.c:1045
+#: g10/g10.c:1059
 msgid "the given policy URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/g10.c:1048
+#: g10/g10.c:1062
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "o algoritmo de compress�o deve estar na faixa %d..%d\n"
 
-#: g10/g10.c:1050
+#: g10/g10.c:1064
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/g10.c:1052
+#: g10/g10.c:1066
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/g10.c:1054
+#: g10/g10.c:1068
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth deve estar na entre 1 e 255\n"
 
-#: g10/g10.c:1057
+#: g10/g10.c:1071
 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:1061
+#: g10/g10.c:1075
 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:1146
+#: g10/g10.c:1160
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
 
-#: g10/g10.c:1152
+#: g10/g10.c:1166
 msgid "--store [filename]"
 msgstr "--store [nome_do_arquivo]"
 
-#: g10/g10.c:1159
+#: g10/g10.c:1173
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/g10.c:1167
+#: g10/g10.c:1181
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_arquivo]"
 
-#: g10/g10.c:1180
+#: g10/g10.c:1194
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_arquivo]"
 
-#: g10/g10.c:1193
+#: g10/g10.c:1207
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/g10.c:1207
+#: g10/g10.c:1221
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_arquivo]"
 
-#: g10/g10.c:1224
+#: g10/g10.c:1238
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_arquivo]"
 
-#: g10/g10.c:1232
+#: g10/g10.c:1246
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usu�rio"
 
-#: g10/g10.c:1240
+#: g10/g10.c:1254
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usu�rio"
 
-#: g10/g10.c:1248
+#: g10/g10.c:1262
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usu�rio [comandos]"
 
-#: g10/g10.c:1264
+#: g10/g10.c:1278
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key id-usu�rio"
 
-#: g10/g10.c:1267
+#: g10/g10.c:1281
 msgid "--delete-key user-id"
 msgstr "--delete-key id-usu�rio"
 
-#: g10/encode.c:268 g10/g10.c:1304 g10/sign.c:393
+#: g10/encode.c:268 g10/g10.c:1318 g10/sign.c:393
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "imposs�vel abrir %s: %s\n"
 
-#: g10/g10.c:1319
+#: g10/g10.c:1333
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-usu�rio] [chaveiro]"
 
-#: g10/g10.c:1385
+#: g10/g10.c:1399
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/g10.c:1393
+#: g10/g10.c:1407
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "cria��o de armadura falhou: %s\n"
 
 # "hash" poderia ser "espalhamento", mas n�o fica claro
-#: g10/g10.c:1464
+#: g10/g10.c:1478
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash inv�lido `%s'\n"
 
-#: g10/g10.c:1551
+#: g10/g10.c:1565
 msgid "[filename]"
 msgstr "[nome_do_arquivo]"
 
-#: g10/g10.c:1555
+#: g10/g10.c:1569
 msgid "Go ahead and type your message ...\n"
 msgstr "V� em frente e digite sua mensagem ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1558 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:59 g10/g10.c:1572 g10/verify.c:94 g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "imposs�vel abrir `%s'\n"
 
-#: g10/g10.c:1767
+#: g10/g10.c:1781
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr ""
 "o primeiro caractere de um nome de nota��o deve ser uma letra ou um "
 "sublinhado\n"
 
-#: g10/g10.c:1773
+#: g10/g10.c:1787
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -906,12 +906,12 @@ msgstr ""
 "um nome de nota��o deve ter apenas letras, d�gitos, pontos ou sublinhados e "
 "terminar com '='\n"
 
-#: g10/g10.c:1779
+#: g10/g10.c:1793
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr ""
 "pontos em um nome de nota��o devem estar cercados por outros caracteres\n"
 
-#: g10/g10.c:1787
+#: g10/g10.c:1801
 msgid "a notation value must not use any control characters\n"
 msgstr "um valor de nota��o n�o deve usar caracteres de controle\n"
 
@@ -1594,21 +1594,21 @@ msgstr "O par de chaves DSA ter� 1024 bits.\n"
 msgid "Key generation canceled.\n"
 msgstr "Gera��o de chave cancelada.\n"
 
-#: g10/keygen.c:1571
+#: g10/keygen.c:1572
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "escrevendo certificado p�blico para `%s'\n"
 
-#: g10/keygen.c:1572
+#: g10/keygen.c:1573
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/keygen.c:1668
+#: g10/keygen.c:1670
 msgid "public and secret key created and signed.\n"
 msgstr "chaves p�blica e privada criadas e assinadas.\n"
 
-#: g10/keygen.c:1673
+#: g10/keygen.c:1675
 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"
@@ -1616,12 +1616,12 @@ msgstr ""
 "Note que esta chave n�o pode ser usada para criptografia. Voc� pode usar\n"
 "o comando \"--edit-key\" para gerar uma chave secund�ria para esse fim.\n"
 
-#: g10/keygen.c:1690 g10/keygen.c:1791
+#: g10/keygen.c:1692 g10/keygen.c:1798
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/keygen.c:1734 g10/sig-check.c:315 g10/sign.c:112
+#: g10/keygen.c:1739 g10/sig-check.c:315 g10/sign.c:112
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1629,7 +1629,7 @@ msgstr ""
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:1736 g10/sig-check.c:317 g10/sign.c:114
+#: g10/keygen.c:1741 g10/sig-check.c:317 g10/sign.c:114
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1637,7 +1637,7 @@ msgstr ""
 "a chave foi criada %lu segundos no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:1769
+#: g10/keygen.c:1774
 msgid "Really create? "
 msgstr "Realmente criar? "
 
@@ -2592,7 +2592,7 @@ msgid "revoked"
 msgstr "revkey"
 
 #. of subkey
-#: g10/keylist.c:400 g10/mainproc.c:834
+#: g10/keylist.c:404 g10/mainproc.c:834
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "A chave expira em %s\n"
@@ -2743,7 +2743,7 @@ msgstr ""
 msgid "can't connect to `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:557
+#: g10/passphrase.c:313 g10/passphrase.c:574
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (ID principal da chave %08lX)"
@@ -2787,7 +2787,7 @@ msgstr ""
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
 
-#: g10/passphrase.c:543
+#: g10/passphrase.c:560
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2797,20 +2797,20 @@ msgstr ""
 "Voc� precisa de uma frase secreta para desbloquear a chave secreta do\n"
 "usu�rio: \""
 
-#: g10/passphrase.c:552
+#: g10/passphrase.c:569
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "chave de %u-bit/%s, ID %08lX, criada em %s"
 
-#: g10/passphrase.c:590
+#: g10/passphrase.c:607
 msgid "can't query password in batchmode\n"
 msgstr "imposs�vel pedir senha em modo n�o-interativo\n"
 
-#: g10/passphrase.c:594
+#: g10/passphrase.c:611
 msgid "Enter passphrase: "
 msgstr "Digite a frase secreta: "
 
-#: g10/passphrase.c:598
+#: g10/passphrase.c:615
 msgid "Repeat passphrase: "
 msgstr "Repita a frase secreta: "
 
@@ -2941,12 +2941,12 @@ msgstr "a chave p�blica � %lu segundo mais nova que a assinatura\n"
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "a chave p�blica � %lu segundos mais nova que a assinatura\n"
 
-#: g10/sig-check.c:324
-#, c-format
-msgid "NOTE: signature key expired %s\n"
+#: g10/sig-check.c:328
+#, fuzzy, c-format
+msgid "NOTE: signature key %08lX expired %s\n"
 msgstr "NOTA: chave de assinatura expirou %s\n"
 
-#: g10/sig-check.c:393
+#: g10/sig-check.c:398
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "assumindo assinatura incorreta devido a um bit cr�tico desconhecido\n"
 
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 7a031b6eb..d1cc8675d 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg\n"
-"POT-Creation-Date: 2000-12-19 11:58+0100\n"
+"POT-Creation-Date: 2001-01-11 13:11+0100\n"
 "PO-Revision-Date: 1999-09-09 20:28+0000\n"
 "Last-Translator: Pedro Morais <[email protected]>\n"
 "Language-Team: pt\n"
@@ -339,7 +339,7 @@ msgstr ""
 "N�o h� bytes aleat�rios suficientes. Por favor, fa�a outro trabalho para\n"
 "que o sistema possa recolher mais entropia! (S�o necess�rios mais %d bytes)\n"
 
-#: g10/g10.c:210
+#: g10/g10.c:211
 msgid ""
 "@Commands:\n"
 " "
@@ -347,140 +347,140 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/g10.c:212
+#: g10/g10.c:213
 msgid "|[file]|make a signature"
 msgstr "|[ficheiro]|fazer uma assinatura"
 
-#: g10/g10.c:213
+#: g10/g10.c:214
 msgid "|[file]|make a clear text signature"
 msgstr "|[ficheiro]|fazer uma assinatura em texto puro"
 
-#: g10/g10.c:214
+#: g10/g10.c:215
 msgid "make a detached signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/g10.c:215
+#: g10/g10.c:216
 msgid "encrypt data"
 msgstr "encriptar dados"
 
-#: g10/g10.c:216
+#: g10/g10.c:217
 msgid "encryption only with symmetric cipher"
 msgstr "encriptar apenas com cifra sim�trica"
 
-#: g10/g10.c:217
+#: g10/g10.c:218
 msgid "store only"
 msgstr "apenas armazenar"
 
-#: g10/g10.c:218
+#: g10/g10.c:219
 msgid "decrypt data (default)"
 msgstr "desencriptar dados (ac��o por omiss�o)"
 
-#: g10/g10.c:219
+#: g10/g10.c:220
 msgid "verify a signature"
 msgstr "verificar uma assinatura"
 
-#: g10/g10.c:221
+#: g10/g10.c:222
 msgid "list keys"
 msgstr "listar as chaves"
 
-#: g10/g10.c:223
+#: g10/g10.c:224
 msgid "list keys and signatures"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/g10.c:224
+#: g10/g10.c:225
 msgid "check key signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/g10.c:225
+#: g10/g10.c:226
 msgid "list keys and fingerprints"
 msgstr "listar as chaves e as impress�es digitais"
 
-#: g10/g10.c:226
+#: g10/g10.c:227
 msgid "list secret keys"
 msgstr "listar as chaves secretas"
 
-#: g10/g10.c:227
+#: g10/g10.c:228
 msgid "generate a new key pair"
 msgstr "gerar um novo par de chaves"
 
-#: g10/g10.c:228
+#: g10/g10.c:229
 msgid "remove key from the public keyring"
 msgstr "remover a chave do porta-chaves p�blico"
 
-#: g10/g10.c:230
+#: g10/g10.c:231
 msgid "remove key from the secret keyring"
 msgstr "remover a chave do porta-chaves secreto"
 
-#: g10/g10.c:231
+#: g10/g10.c:232
 msgid "sign a key"
 msgstr "assinar uma chave"
 
-#: g10/g10.c:232
+#: g10/g10.c:233
 msgid "sign a key locally"
 msgstr "assinar uma chave localmente"
 
-#: g10/g10.c:233
+#: g10/g10.c:234
 msgid "sign or edit a key"
 msgstr "assinar ou editar uma chave"
 
-#: g10/g10.c:234
+#: g10/g10.c:235
 msgid "generate a revocation certificate"
 msgstr "gerar um certificado de revoga��o"
 
-#: g10/g10.c:235
+#: g10/g10.c:236
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/g10.c:236
+#: g10/g10.c:237
 msgid "export keys to a key server"
 msgstr "exportar chaves para um servidor"
 
-#: g10/g10.c:237
+#: g10/g10.c:238
 msgid "import keys from a key server"
 msgstr "importar chaves de um servidor"
 
-#: g10/g10.c:241
+#: g10/g10.c:242
 msgid "import/merge keys"
 msgstr "importar/fundir chaves"
 
-#: g10/g10.c:243
+#: g10/g10.c:244
 msgid "list only the sequence of packets"
 msgstr "listar apenas as sequ�ncias de pacotes"
 
 # ownertrust ???
-#: g10/g10.c:245
+#: g10/g10.c:246
 msgid "export the ownertrust values"
 msgstr "exportar os valores de confian�a"
 
-#: g10/g10.c:247
+#: g10/g10.c:248
 msgid "import ownertrust values"
 msgstr "importar os valores de confian�a"
 
-#: g10/g10.c:249
+#: g10/g10.c:250
 msgid "update the trust database"
 msgstr "actualizar a base de dados de confian�a"
 
-#: g10/g10.c:251
+#: g10/g10.c:252
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMES]|verificar a base de dados de confian�a"
 
-#: g10/g10.c:252
+#: g10/g10.c:253
 msgid "fix a corrupted trust database"
 msgstr "consertar uma base de dados de confian�a"
 
-#: g10/g10.c:253
+#: g10/g10.c:254
 msgid "De-Armor a file or stdin"
 msgstr "retirar armadura de um ficheiro ou do \"stdin\""
 
-#: g10/g10.c:255
+#: g10/g10.c:256
 msgid "En-Armor a file or stdin"
 msgstr "criar armadura para um ficheiro ou \"stdin\""
 
-#: g10/g10.c:257
+#: g10/g10.c:258
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheiros]|imprimir \"digests\" de mensagens"
 
-#: g10/g10.c:261
+#: g10/g10.c:262
 msgid ""
 "@\n"
 "Options:\n"
@@ -490,179 +490,179 @@ msgstr ""
 "Op��es:\n"
 " "
 
-#: g10/g10.c:263
+#: g10/g10.c:264
 msgid "create ascii armored output"
 msgstr "criar sa�da com armadura ascii"
 
-#: g10/g10.c:265
+#: g10/g10.c:266
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|encriptar para NOME"
 
-#: g10/g10.c:268
+#: g10/g10.c:269
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|usar NOME como destinat�rio padr�o"
 
-#: g10/g10.c:270
+#: g10/g10.c:271
 msgid "use the default key as default recipient"
 msgstr "usar a chave padr�o como destinat�rio padr�o"
 
-#: g10/g10.c:274
+#: g10/g10.c:275
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "usar este identificador de utilizador para\n"
 "assinar ou desencriptar"
 
-#: g10/g10.c:275
+#: g10/g10.c:276
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|estabelecer n�vel de compress�o N\n"
 "(0 desactiva)"
 
-#: g10/g10.c:277
+#: g10/g10.c:278
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/g10.c:278
+#: g10/g10.c:279
 msgid "use as output file"
 msgstr "usar como ficheiro de sa�da"
 
-#: g10/g10.c:279
+#: g10/g10.c:280
 msgid "verbose"
 msgstr "detalhado"
 
-#: g10/g10.c:280
+#: g10/g10.c:281
 msgid "be somewhat more quiet"
 msgstr "ser mais silencioso"
 
-#: g10/g10.c:281
+#: g10/g10.c:282
 msgid "don't use the terminal at all"
 msgstr "nunca usar o terminal"
 
-#: g10/g10.c:282
+#: g10/g10.c:283
 msgid "force v3 signatures"
 msgstr "for�ar assinaturas v3"
 
-#: g10/g10.c:283
+#: g10/g10.c:284
 msgid "always use a MDC for encryption"
 msgstr "sempre usar um MDC para encriptar"
 
-#: g10/g10.c:284
+#: g10/g10.c:285
 msgid "do not make any changes"
 msgstr "n�o fazer altera��es"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:286
+#: g10/g10.c:287
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/g10.c:287
+#: g10/g10.c:288
 msgid "batch mode: never ask"
 msgstr "modo n�o-interactivo: nunca perguntar"
 
-#: g10/g10.c:288
+#: g10/g10.c:289
 msgid "assume yes on most questions"
 msgstr "assumir sim para a maioria das perguntas"
 
-#: g10/g10.c:289
+#: g10/g10.c:290
 msgid "assume no on most questions"
 msgstr "assumir n�o para a maioria das perguntas"
 
-#: g10/g10.c:290
+#: g10/g10.c:291
 msgid "add this keyring to the list of keyrings"
 msgstr ""
 "adicionar este porta-chaves\n"
 "� lista de porta-chaves"
 
-#: g10/g10.c:291
+#: g10/g10.c:292
 msgid "add this secret keyring to the list"
 msgstr "adicionar este porta-chaves secreto � lista"
 
-#: g10/g10.c:292
+#: g10/g10.c:293
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usar NOME como chave secreta por omiss�o"
 
-#: g10/g10.c:293
+#: g10/g10.c:294
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|ENDERE�O|usar este servidor para buscar chaves"
 
-#: g10/g10.c:294
+#: g10/g10.c:295
 msgid "|NAME|set terminal charset to NAME"
 msgstr ""
 "|NOME|definir mapa de caracteres do terminal como\n"
 "NOME"
 
-#: g10/g10.c:295
+#: g10/g10.c:296
 msgid "read options from file"
 msgstr "ler op��es do ficheiro"
 
-#: g10/g10.c:299
+#: g10/g10.c:300
 msgid "|FD|write status info to this FD"
 msgstr ""
 "|DF|escrever informa��es de estado para o\n"
 "descritor de ficheiro DF"
 
-#: g10/g10.c:304
+#: g10/g10.c:305
 msgid "|KEYID|ulimately trust this key"
 msgstr ""
 
-#: g10/g10.c:305
+#: g10/g10.c:306
 msgid "|FILE|load extension module FILE"
 msgstr "|FICHEIRO|carregar m�dulo de extens�o FICHEIRO"
 
-#: g10/g10.c:306
+#: g10/g10.c:307
 msgid "emulate the mode described in RFC1991"
 msgstr "emular o modo descrito no RFC1991"
 
-#: g10/g10.c:307
+#: g10/g10.c:308
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 "configurar todas as op��es de pacote,\n"
 "criptografia e \"digest\" para comportamento\n"
 "OpenPGP"
 
-#: g10/g10.c:308
+#: g10/g10.c:309
 msgid "|N|use passphrase mode N"
 msgstr "|N|usar mode de frase secreta N"
 
-#: g10/g10.c:310
+#: g10/g10.c:311
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr ""
 "|NOME|usar algoritmo de \"digest\" de mensagens NOME\n"
 "para frases secretas"
 
-#: g10/g10.c:312
+#: g10/g10.c:313
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr ""
 "|NOME|usar algoritmo de criptografia NOME para\n"
 "frases secretas"
 
-#: g10/g10.c:313
+#: g10/g10.c:314
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usar algoritmo de criptografia NOME"
 
-#: g10/g10.c:314
+#: g10/g10.c:315
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usar algoritmo de \"digest\" de mensagens NOME"
 
-#: g10/g10.c:315
+#: g10/g10.c:316
 msgid "|N|use compress algorithm N"
 msgstr "|N|usar algoritmo de compress�o N"
 
-#: g10/g10.c:316
+#: g10/g10.c:317
 msgid "throw keyid field of encrypted packets"
 msgstr "eliminar campo keyid dos pacotes encriptados"
 
-#: g10/g10.c:317
+#: g10/g10.c:318
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOME=VALOR|usar estes dados de nota��o"
 
-#: g10/g10.c:320
+#: g10/g10.c:321
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:323
+#: g10/g10.c:324
 msgid ""
 "@\n"
 "Examples:\n"
@@ -682,15 +682,15 @@ msgstr ""
 " --list-keys [nomes]        mostrar chaves\n"
 " --fingerprint [nomes]      mostrar impress�es digitais\n"
 
-#: g10/g10.c:427
+#: g10/g10.c:429
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Por favor comunique bugs para <[email protected]>.\n"
 
-#: g10/g10.c:431
+#: g10/g10.c:433
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: g10/g10.c:434
+#: g10/g10.c:436
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -700,7 +700,7 @@ msgstr ""
 "assina, verifica, encripta ou desencripta\n"
 "a opera��o por omiss�o depende dos dados de entrada\n"
 
-#: g10/g10.c:441
+#: g10/g10.c:443
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -708,189 +708,189 @@ msgstr ""
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/g10.c:520
+#: g10/g10.c:522
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [op��es] "
 
-#: g10/g10.c:573
+#: g10/g10.c:575
 msgid "conflicting commands\n"
 msgstr "comandos em conflito\n"
 
-#: g10/g10.c:713
+#: g10/g10.c:725
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: ficheiro de op��es por omiss�o `%s' inexistente\n"
 
-#: g10/g10.c:717
+#: g10/g10.c:729
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de op��es `%s': %s\n"
 
-#: g10/g10.c:724
+#: g10/g10.c:736
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "a ler op��es de `%s'\n"
 
-#: g10/g10.c:925
+#: g10/g10.c:937
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/g10.c:994
+#: g10/g10.c:1008
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um ficheiro core!\n"
 
-#: g10/g10.c:998 g10/g10.c:1007
+#: g10/g10.c:1012 g10/g10.c:1021
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s n�o � para uso normal!\n"
 
-#: g10/g10.c:1000
+#: g10/g10.c:1014
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: g10/g10.c:1003
+#: g10/g10.c:1017
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/g10.c:1023 g10/g10.c:1035
+#: g10/g10.c:1037 g10/g10.c:1049
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado n�o � v�lido\n"
 
-#: g10/g10.c:1029 g10/g10.c:1041
+#: g10/g10.c:1043 g10/g10.c:1055
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/g10.c:1045
+#: g10/g10.c:1059
 msgid "the given policy URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/g10.c:1048
+#: g10/g10.c:1062
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "o algoritmo de compress�o deve estar na faixa %d..%d\n"
 
-#: g10/g10.c:1050
+#: g10/g10.c:1064
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/g10.c:1052
+#: g10/g10.c:1066
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/g10.c:1054
+#: g10/g10.c:1068
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth deve estar na entre 1 e 255\n"
 
-#: g10/g10.c:1057
+#: g10/g10.c:1071
 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:1061
+#: g10/g10.c:1075
 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:1146
+#: g10/g10.c:1160
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
 
-#: g10/g10.c:1152
+#: g10/g10.c:1166
 msgid "--store [filename]"
 msgstr "--store [nome_do_ficheiro]"
 
-#: g10/g10.c:1159
+#: g10/g10.c:1173
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_ficheiro]"
 
-#: g10/g10.c:1167
+#: g10/g10.c:1181
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:1180
+#: g10/g10.c:1194
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_ficheiro]"
 
-#: g10/g10.c:1193
+#: g10/g10.c:1207
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:1207
+#: g10/g10.c:1221
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_ficheiro]"
 
-#: g10/g10.c:1224
+#: g10/g10.c:1238
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_ficheiro]"
 
-#: g10/g10.c:1232
+#: g10/g10.c:1246
 msgid "--sign-key user-id"
 msgstr "--sign-key id-utilizador"
 
-#: g10/g10.c:1240
+#: g10/g10.c:1254
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-utilizador"
 
-#: g10/g10.c:1248
+#: g10/g10.c:1262
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-utilizador [comandos]"
 
-#: g10/g10.c:1264
+#: g10/g10.c:1278
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key id-utilizador"
 
-#: g10/g10.c:1267
+#: g10/g10.c:1281
 msgid "--delete-key user-id"
 msgstr "--delete-key id-utilizador"
 
-#: g10/encode.c:268 g10/g10.c:1304 g10/sign.c:393
+#: g10/encode.c:268 g10/g10.c:1318 g10/sign.c:393
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "imposs�vel abrir %s: %s\n"
 
-#: g10/g10.c:1319
+#: g10/g10.c:1333
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-utilizador] [porta-chaves]"
 
-#: g10/g10.c:1385
+#: g10/g10.c:1399
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/g10.c:1393
+#: g10/g10.c:1407
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "cria��o de armadura falhou: %s\n"
 
 # "hash" poderia ser "espalhamento", mas n�o fica claro
-#: g10/g10.c:1464
+#: g10/g10.c:1478
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash inv�lido `%s'\n"
 
-#: g10/g10.c:1551
+#: g10/g10.c:1565
 msgid "[filename]"
 msgstr "[nome_do_ficheiro]"
 
-#: g10/g10.c:1555
+#: g10/g10.c:1569
 msgid "Go ahead and type your message ...\n"
 msgstr "Digite a sua mensagem ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1558 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:59 g10/g10.c:1572 g10/verify.c:94 g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "imposs�vel abrir `%s'\n"
 
-#: g10/g10.c:1767
+#: g10/g10.c:1781
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr ""
 "o primeiro caracter de um nome de nota��o deve ser uma letra ou um "
 "sublinhado\n"
 
-#: g10/g10.c:1773
+#: g10/g10.c:1787
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -898,12 +898,12 @@ msgstr ""
 "um nome de nota��o deve ter apenas letras, d�gitos, pontos ou sublinhados e "
 "terminar com '='\n"
 
-#: g10/g10.c:1779
+#: g10/g10.c:1793
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr ""
 "pontos num nome de nota��o devem estar cercados por outros caracteres\n"
 
-#: g10/g10.c:1787
+#: g10/g10.c:1801
 msgid "a notation value must not use any control characters\n"
 msgstr "um valor de nota��o n�o deve usar caracteres de controle\n"
 
@@ -1588,21 +1588,21 @@ msgstr "O par de chaves DSA ter� 1024 bits.\n"
 msgid "Key generation canceled.\n"
 msgstr "Gera��o de chave cancelada.\n"
 
-#: g10/keygen.c:1571
+#: g10/keygen.c:1572
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "escrevendo certificado p�blico para `%s'\n"
 
-#: g10/keygen.c:1572
+#: g10/keygen.c:1573
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/keygen.c:1668
+#: g10/keygen.c:1670
 msgid "public and secret key created and signed.\n"
 msgstr "chaves p�blica e privada criadas e assinadas.\n"
 
-#: g10/keygen.c:1673
+#: g10/keygen.c:1675
 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"
@@ -1610,12 +1610,12 @@ msgstr ""
 "Note que esta chave n�o pode ser usada para encripta��o. Voc� pode usar\n"
 "o comando \"--edit-key\" para gerar uma chave secund�ria para esse fim.\n"
 
-#: g10/keygen.c:1690 g10/keygen.c:1791
+#: g10/keygen.c:1692 g10/keygen.c:1798
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/keygen.c:1734 g10/sig-check.c:315 g10/sign.c:112
+#: g10/keygen.c:1739 g10/sig-check.c:315 g10/sign.c:112
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1623,7 +1623,7 @@ msgstr ""
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:1736 g10/sig-check.c:317 g10/sign.c:114
+#: g10/keygen.c:1741 g10/sig-check.c:317 g10/sign.c:114
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1631,7 +1631,7 @@ msgstr ""
 "a chave foi criada %lu segundos no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:1769
+#: g10/keygen.c:1774
 msgid "Really create? "
 msgstr "Realmente criar? "
 
@@ -2586,7 +2586,7 @@ msgid "revoked"
 msgstr "revkey"
 
 #. of subkey
-#: g10/keylist.c:400 g10/mainproc.c:834
+#: g10/keylist.c:404 g10/mainproc.c:834
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "A chave expira em %s\n"
@@ -2737,7 +2737,7 @@ msgstr ""
 msgid "can't connect to `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:557
+#: g10/passphrase.c:313 g10/passphrase.c:574
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (ID principal da chave %08lX)"
@@ -2780,7 +2780,7 @@ msgstr ""
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
 
-#: g10/passphrase.c:543
+#: g10/passphrase.c:560
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2790,20 +2790,20 @@ msgstr ""
 "Voc� precisa de uma frase secreta para desbloquear a chave secreta do\n"
 "utilizador: \""
 
-#: g10/passphrase.c:552
+#: g10/passphrase.c:569
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "chave de %u-bit/%s, ID %08lX, criada em %s"
 
-#: g10/passphrase.c:590
+#: g10/passphrase.c:607
 msgid "can't query password in batchmode\n"
 msgstr "imposs�vel pedir senha em modo n�o-interactivo\n"
 
-#: g10/passphrase.c:594
+#: g10/passphrase.c:611
 msgid "Enter passphrase: "
 msgstr "Digite a frase secreta: "
 
-#: g10/passphrase.c:598
+#: g10/passphrase.c:615
 msgid "Repeat passphrase: "
 msgstr "Repita a frase secreta: "
 
@@ -2934,12 +2934,12 @@ msgstr "a chave p�blica � %lu segundo mais nova que a assinatura\n"
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "a chave p�blica � %lu segundos mais nova que a assinatura\n"
 
-#: g10/sig-check.c:324
-#, c-format
-msgid "NOTE: signature key expired %s\n"
+#: g10/sig-check.c:328
+#, fuzzy, c-format
+msgid "NOTE: signature key %08lX expired %s\n"
 msgstr "NOTA: chave de assinatura expirou %s\n"
 
-#: g10/sig-check.c:393
+#: g10/sig-check.c:398
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr "assumindo assinatura incorrecta devido a um bit cr�tico desconhecido\n"
 
diff --git a/po/ru.po b/po/ru.po
index 1c63b3702..6ae0b3577 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: 2000-12-19 11:58+0100\n"
+"POT-Creation-Date: 2001-01-11 13:11+0100\n"
 "Content-Type: text/plain; charset=\n"
 "Date: 1998-01-26 22:08:36+0100\n"
 "From: Gregory Steuck <[email protected]>\n"
@@ -395,7 +395,7 @@ msgstr ""
 "������������ ��������� ������. ����������, ��������� ���-������, �����\n"
 "�� ����� ������� �������������� ��������� �����! (����� ��� %d ����)\n"
 
-#: g10/g10.c:210
+#: g10/g10.c:211
 msgid ""
 "@Commands:\n"
 " "
@@ -403,147 +403,147 @@ msgstr ""
 "@�������:\n"
 " "
 
-#: g10/g10.c:212
+#: g10/g10.c:213
 #, fuzzy
 msgid "|[file]|make a signature"
 msgstr "|[����]|������� �������"
 
-#: g10/g10.c:213
+#: g10/g10.c:214
 #, fuzzy
 msgid "|[file]|make a clear text signature"
 msgstr "|[����]|������� ��������� �������"
 
-#: g10/g10.c:214
+#: g10/g10.c:215
 msgid "make a detached signature"
 msgstr "������� ��������� �������"
 
-#: g10/g10.c:215
+#: g10/g10.c:216
 msgid "encrypt data"
 msgstr "����������� ������"
 
-#: g10/g10.c:216
+#: g10/g10.c:217
 msgid "encryption only with symmetric cipher"
 msgstr "����������� ������������ ����������"
 
-#: g10/g10.c:217
+#: g10/g10.c:218
 msgid "store only"
 msgstr "������ ���������"
 
-#: g10/g10.c:218
+#: g10/g10.c:219
 msgid "decrypt data (default)"
 msgstr "������������ ������ (�� ���������)"
 
-#: g10/g10.c:219
+#: g10/g10.c:220
 msgid "verify a signature"
 msgstr "��������� �������"
 
-#: g10/g10.c:221
+#: g10/g10.c:222
 msgid "list keys"
 msgstr "������ ������"
 
-#: g10/g10.c:223
+#: g10/g10.c:224
 msgid "list keys and signatures"
 msgstr "������ ������ � ��������"
 
-#: g10/g10.c:224
+#: g10/g10.c:225
 msgid "check key signatures"
 msgstr "��������� ������� �� �����"
 
-#: g10/g10.c:225
+#: g10/g10.c:226
 msgid "list keys and fingerprints"
 msgstr "������ ������ � �� \"����������� �������\""
 
-#: g10/g10.c:226
+#: g10/g10.c:227
 msgid "list secret keys"
 msgstr "������ ��������� ������"
 
-#: g10/g10.c:227
+#: g10/g10.c:228
 msgid "generate a new key pair"
 msgstr "������������� ����� ���� ������ (�������� � ���������)"
 
-#: g10/g10.c:228
+#: g10/g10.c:229
 msgid "remove key from the public keyring"
 msgstr "������� ���� �� ������"
 
-#: g10/g10.c:230
+#: g10/g10.c:231
 #, fuzzy
 msgid "remove key from the secret keyring"
 msgstr "������� ���� �� ������"
 
-#: g10/g10.c:231
+#: g10/g10.c:232
 #, fuzzy
 msgid "sign a key"
 msgstr "��������� ����"
 
-#: g10/g10.c:232
+#: g10/g10.c:233
 #, fuzzy
 msgid "sign a key locally"
 msgstr "��������� ����"
 
-#: g10/g10.c:233
+#: g10/g10.c:234
 msgid "sign or edit a key"
 msgstr "��������� ��� ������������� ����"
 
-#: g10/g10.c:234
+#: g10/g10.c:235
 msgid "generate a revocation certificate"
 msgstr "������������� ���������� ����������"
 
-#: g10/g10.c:235
+#: g10/g10.c:236
 msgid "export keys"
 msgstr "�������������� �����"
 
-#: g10/g10.c:236
+#: g10/g10.c:237
 msgid "export keys to a key server"
 msgstr ""
 
-#: g10/g10.c:237
+#: g10/g10.c:238
 msgid "import keys from a key server"
 msgstr ""
 
-#: g10/g10.c:241
+#: g10/g10.c:242
 msgid "import/merge keys"
 msgstr "�������������/�������� �����"
 
-#: g10/g10.c:243
+#: g10/g10.c:244
 msgid "list only the sequence of packets"
 msgstr "���������� ������ ������������������ �������"
 
-#: g10/g10.c:245
+#: g10/g10.c:246
 #, fuzzy
 msgid "export the ownertrust values"
 msgstr "�������������� ��������� �������\n"
 
-#: g10/g10.c:247
+#: g10/g10.c:248
 #, fuzzy
 msgid "import ownertrust values"
 msgstr "������������� ��������� �������\n"
 
-#: g10/g10.c:249
+#: g10/g10.c:250
 #, fuzzy
 msgid "update the trust database"
 msgstr "|[�����]|��������� ���� ������ �������"
 
-#: g10/g10.c:251
+#: g10/g10.c:252
 msgid "|[NAMES]|check the trust database"
 msgstr "|[�����]|��������� ���� ������ �������"
 
-#: g10/g10.c:252
+#: g10/g10.c:253
 msgid "fix a corrupted trust database"
 msgstr "��������� ����������� ���� ������ �������"
 
-#: g10/g10.c:253
+#: g10/g10.c:254
 msgid "De-Armor a file or stdin"
 msgstr "������������ stdin ��� ���� �� ASCII-�������������"
 
-#: g10/g10.c:255
+#: g10/g10.c:256
 msgid "En-Armor a file or stdin"
 msgstr "������������ stdin ��� ���� � ASCII-�������������"
 
-#: g10/g10.c:257
+#: g10/g10.c:258
 msgid "|algo [files]|print message digests"
 msgstr "|algo [files]|���������� �������� ���������"
 
-#: g10/g10.c:261
+#: g10/g10.c:262
 msgid ""
 "@\n"
 "Options:\n"
@@ -553,172 +553,172 @@ msgstr ""
 "���������:\n"
 " "
 
-#: g10/g10.c:263
+#: g10/g10.c:264
 msgid "create ascii armored output"
 msgstr "����� � ASCII-�������������"
 
-#: g10/g10.c:265
+#: g10/g10.c:266
 #, fuzzy
 msgid "|NAME|encrypt for NAME"
 msgstr "|���|������������ ������������ ���������� ���"
 
-#: g10/g10.c:268
+#: g10/g10.c:269
 #, fuzzy
 msgid "|NAME|use NAME as default recipient"
 msgstr "|���|������������ ��� � �������� ���������� ����� �� ���������"
 
-#: g10/g10.c:270
+#: g10/g10.c:271
 msgid "use the default key as default recipient"
 msgstr ""
 
-#: g10/g10.c:274
+#: g10/g10.c:275
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "������������ ��������� ������������� ������������ ��� ������� ��� �����������"
 
-#: g10/g10.c:275
+#: g10/g10.c:276
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|���������� ������� ������ (0 - �� �������)"
 
-#: g10/g10.c:277
+#: g10/g10.c:278
 msgid "use canonical text mode"
 msgstr "������������ ������������ ��������� �����"
 
-#: g10/g10.c:278
+#: g10/g10.c:279
 msgid "use as output file"
 msgstr "������������ � �������� ��������� �����"
 
-#: g10/g10.c:279
+#: g10/g10.c:280
 msgid "verbose"
 msgstr "������������"
 
-#: g10/g10.c:280
+#: g10/g10.c:281
 msgid "be somewhat more quiet"
 msgstr ""
 
-#: g10/g10.c:281
+#: g10/g10.c:282
 msgid "don't use the terminal at all"
 msgstr ""
 
-#: g10/g10.c:282
+#: g10/g10.c:283
 #, fuzzy
 msgid "force v3 signatures"
 msgstr "��������� ������� �� �����"
 
-#: g10/g10.c:283
+#: g10/g10.c:284
 #, fuzzy
 msgid "always use a MDC for encryption"
 msgstr "������������ ��������� ������������� ������������ ��� ����������"
 
-#: g10/g10.c:284
+#: g10/g10.c:285
 msgid "do not make any changes"
 msgstr "Keine wirklichen �nderungen durchf�hren"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:286
+#: g10/g10.c:287
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/g10.c:287
+#: g10/g10.c:288
 msgid "batch mode: never ask"
 msgstr "�������� �����: ������ �� ����������"
 
-#: g10/g10.c:288
+#: g10/g10.c:289
 msgid "assume yes on most questions"
 msgstr "�������� \"��\" �� ����������� ��������"
 
-#: g10/g10.c:289
+#: g10/g10.c:290
 msgid "assume no on most questions"
 msgstr "�������� \"���\" �� ����������� ��������"
 
-#: g10/g10.c:290
+#: g10/g10.c:291
 msgid "add this keyring to the list of keyrings"
 msgstr "�������� ��� ������ � ������ ������ ������"
 
-#: g10/g10.c:291
+#: g10/g10.c:292
 msgid "add this secret keyring to the list"
 msgstr "�������� ��� ��������� ������ � ������ ������ ������"
 
-#: g10/g10.c:292
+#: g10/g10.c:293
 msgid "|NAME|use NAME as default secret key"
 msgstr "|���|������������ ��� � �������� ���������� ����� �� ���������"
 
-#: g10/g10.c:293
+#: g10/g10.c:294
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr ""
 
-#: g10/g10.c:294
+#: g10/g10.c:295
 #, fuzzy
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|���|������������ ������������ ���������� ���"
 
-#: g10/g10.c:295
+#: g10/g10.c:296
 msgid "read options from file"
 msgstr "������ ��������� �� �����"
 
-#: g10/g10.c:299
+#: g10/g10.c:300
 msgid "|FD|write status info to this FD"
 msgstr "|FD| ���������� ���������� � ��������� � ���������� (FD)"
 
-#: g10/g10.c:304
+#: g10/g10.c:305
 msgid "|KEYID|ulimately trust this key"
 msgstr ""
 
-#: g10/g10.c:305
+#: g10/g10.c:306
 #, fuzzy
 msgid "|FILE|load extension module FILE"
 msgstr "|����|��������� ���� � ������������ ��������"
 
-#: g10/g10.c:306
+#: g10/g10.c:307
 msgid "emulate the mode described in RFC1991"
 msgstr "����������� ����� ��������� � RFC1991"
 
-#: g10/g10.c:307
+#: g10/g10.c:308
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:308
+#: g10/g10.c:309
 #, fuzzy
 msgid "|N|use passphrase mode N"
 msgstr "|N|������������ �������� ����� ������ N\n"
 
-#: g10/g10.c:310
+#: g10/g10.c:311
 #, fuzzy
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|���|������������ ���-�������� ��� ��� �������� ����"
 
-#: g10/g10.c:312
+#: g10/g10.c:313
 #, fuzzy
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|���|������������ ������������ ���������� ��� ��� �������� ����"
 
-#: g10/g10.c:313
+#: g10/g10.c:314
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|���|������������ ������������ ���������� ���"
 
-#: g10/g10.c:314
+#: g10/g10.c:315
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|���|������������ ���-�������� ���"
 
-#: g10/g10.c:315
+#: g10/g10.c:316
 msgid "|N|use compress algorithm N"
 msgstr "|N|������������ �������� ������ N"
 
-#: g10/g10.c:316
+#: g10/g10.c:317
 msgid "throw keyid field of encrypted packets"
 msgstr "����������� ���� keyid � ������������� �������"
 
-#: g10/g10.c:317
+#: g10/g10.c:318
 msgid "|NAME=VALUE|use this notation data"
 msgstr ""
 
-#: g10/g10.c:320
+#: g10/g10.c:321
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/g10.c:323
+#: g10/g10.c:324
 #, fuzzy
 msgid ""
 "@\n"
@@ -739,17 +739,17 @@ msgstr ""
 " --list-keys [names]        �������� ������ ������\n"
 " --fingerprint [names]      �������� \"��������� �������\" ������\n"
 
-#: g10/g10.c:427
+#: g10/g10.c:429
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "����������, ����������� ��������� �� ������� �� ������ "
 "<[email protected]>.\n"
 
-#: g10/g10.c:431
+#: g10/g10.c:433
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "�������������: gpg [���������] [�����] (-h ��� ������)"
 
-#: g10/g10.c:434
+#: g10/g10.c:436
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -759,7 +759,7 @@ msgstr ""
 "�����������, ��������� �������, ������� ��� ��������������\n"
 "����� ������ ������� �� ������� ������\n"
 
-#: g10/g10.c:441
+#: g10/g10.c:443
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -767,202 +767,202 @@ msgstr ""
 "\n"
 "�������������� ���������:\n"
 
-#: g10/g10.c:520
+#: g10/g10.c:522
 msgid "usage: gpg [options] "
 msgstr "�������������: gpg [���������] "
 
-#: g10/g10.c:573
+#: g10/g10.c:575
 msgid "conflicting commands\n"
 msgstr "Widerspr�chliche Kommandos\n"
 
-#: g10/g10.c:713
+#: g10/g10.c:725
 #, fuzzy, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "���������: ���� ���������� �� ��������� `%s' �����������\n"
 
-#: g10/g10.c:717
+#: g10/g10.c:729
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "���� ���������� `%s': %s\n"
 
-#: g10/g10.c:724
+#: g10/g10.c:736
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "�������� ��������� �� `%s'\n"
 
-#: g10/g10.c:925
+#: g10/g10.c:937
 #, fuzzy, c-format
 msgid "%s is not a valid character set\n"
 msgstr "������������ ������ � �����������.\n"
 
-#: g10/g10.c:994
+#: g10/g10.c:1008
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/g10.c:998 g10/g10.c:1007
+#: g10/g10.c:1012 g10/g10.c:1021
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr ""
 
-#: g10/g10.c:1000
+#: g10/g10.c:1014
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr ""
 
-#: g10/g10.c:1003
+#: g10/g10.c:1017
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr ""
 
-#: g10/g10.c:1023 g10/g10.c:1035
+#: g10/g10.c:1037 g10/g10.c:1049
 msgid "selected cipher algorithm is invalid\n"
 msgstr "������ ������������ �������� ����������\n"
 
-#: g10/g10.c:1029 g10/g10.c:1041
+#: g10/g10.c:1043 g10/g10.c:1055
 msgid "selected digest algorithm is invalid\n"
 msgstr "������ ������������ ��������-��������\n"
 
-#: g10/g10.c:1045
+#: g10/g10.c:1059
 msgid "the given policy URL is invalid\n"
 msgstr ""
 
-#: g10/g10.c:1048
+#: g10/g10.c:1062
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "�������� �������� ����� ����� �������� �� %d �� %d\n"
 
-#: g10/g10.c:1050
+#: g10/g10.c:1064
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ������ ���� ������ 0\n"
 
-#: g10/g10.c:1052
+#: g10/g10.c:1066
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ������ ���� ������ 1\n"
 
-#: g10/g10.c:1054
+#: g10/g10.c:1068
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr ""
 
-#: g10/g10.c:1057
+#: g10/g10.c:1071
 #, fuzzy
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "���������: ������� S2K ����� (0) ����� �� �������������\n"
 
-#: g10/g10.c:1061
+#: g10/g10.c:1075
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "������������ ����� S2K: ������ ���� 0, 1 ��� 3\n"
 
-#: g10/g10.c:1146
+#: g10/g10.c:1160
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "������ ������������� ���� ������ �������: %s\n"
 
-#: g10/g10.c:1152
+#: g10/g10.c:1166
 msgid "--store [filename]"
 msgstr "--store [��� �����]"
 
-#: g10/g10.c:1159
+#: g10/g10.c:1173
 msgid "--symmetric [filename]"
 msgstr "--symmetric [��� �����]"
 
-#: g10/g10.c:1167
+#: g10/g10.c:1181
 msgid "--encrypt [filename]"
 msgstr "--encrypt [��� �����]"
 
-#: g10/g10.c:1180
+#: g10/g10.c:1194
 msgid "--sign [filename]"
 msgstr "--sign [��� �����]"
 
-#: g10/g10.c:1193
+#: g10/g10.c:1207
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [��� �����]"
 
-#: g10/g10.c:1207
+#: g10/g10.c:1221
 msgid "--clearsign [filename]"
 msgstr "--clearsign [��� �����]"
 
-#: g10/g10.c:1224
+#: g10/g10.c:1238
 msgid "--decrypt [filename]"
 msgstr "--decrypt [��� �����]"
 
-#: g10/g10.c:1232
+#: g10/g10.c:1246
 msgid "--sign-key user-id"
 msgstr ""
 
-#: g10/g10.c:1240
+#: g10/g10.c:1254
 #, fuzzy
 msgid "--lsign-key user-id"
 msgstr "--delete-key ���-������������"
 
-#: g10/g10.c:1248
+#: g10/g10.c:1262
 #, fuzzy
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key ���-������������"
 
-#: g10/g10.c:1264
+#: g10/g10.c:1278
 #, fuzzy
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key ���-������������"
 
-#: g10/g10.c:1267
+#: g10/g10.c:1281
 #, fuzzy
 msgid "--delete-key user-id"
 msgstr "--delete-key ���-������������"
 
-#: g10/encode.c:268 g10/g10.c:1304 g10/sign.c:393
+#: g10/encode.c:268 g10/g10.c:1318 g10/sign.c:393
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "���������� ������� ���� `%s': %s\n"
 
-#: g10/g10.c:1319
+#: g10/g10.c:1333
 #, fuzzy
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [������������� ������������] [������ ������]"
 
-#: g10/g10.c:1385
+#: g10/g10.c:1399
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "������ �������������: %s\n"
 
-#: g10/g10.c:1393
+#: g10/g10.c:1407
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "������ �����������: %s\n"
 
-#: g10/g10.c:1464
+#: g10/g10.c:1478
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "������������ ���-�������� `%s'\n"
 
-#: g10/g10.c:1551
+#: g10/g10.c:1565
 msgid "[filename]"
 msgstr "[��� �����]"
 
-#: g10/g10.c:1555
+#: g10/g10.c:1569
 msgid "Go ahead and type your message ...\n"
 msgstr ""
 
-#: g10/decrypt.c:59 g10/g10.c:1558 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:59 g10/g10.c:1572 g10/verify.c:94 g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "���������� ������� ���� `%s'\n"
 
-#: g10/g10.c:1767
+#: g10/g10.c:1781
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr ""
 
-#: g10/g10.c:1773
+#: g10/g10.c:1787
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
 msgstr ""
 
-#: g10/g10.c:1779
+#: g10/g10.c:1793
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr ""
 
-#: g10/g10.c:1787
+#: g10/g10.c:1801
 msgid "a notation value must not use any control characters\n"
 msgstr ""
 
@@ -1651,21 +1651,21 @@ msgstr "�������� ���� DSA ����� ����� ����� 1024 ����.\n"
 msgid "Key generation canceled.\n"
 msgstr "��������� ����� ��������: %s\n"
 
-#: g10/keygen.c:1571
+#: g10/keygen.c:1572
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "�������� ���������� ������������ � `%s'\n"
 
-#: g10/keygen.c:1572
+#: g10/keygen.c:1573
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "��������� ���������� ������������ � `%s'\n"
 
-#: g10/keygen.c:1668
+#: g10/keygen.c:1670
 msgid "public and secret key created and signed.\n"
 msgstr "�������� � ��������� ����� ������� � ���������.\n"
 
-#: g10/keygen.c:1673
+#: g10/keygen.c:1675
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -1676,12 +1676,12 @@ msgstr ""
 "���������������\n"
 "����� ��� ����������.\n"
 
-#: g10/keygen.c:1690 g10/keygen.c:1791
+#: g10/keygen.c:1692 g10/keygen.c:1798
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "��������� ����� �� �������: %s\n"
 
-#: g10/keygen.c:1734 g10/sig-check.c:315 g10/sign.c:112
+#: g10/keygen.c:1739 g10/sig-check.c:315 g10/sign.c:112
 #, fuzzy, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1689,7 +1689,7 @@ msgstr ""
 "�������� ���� ������������ � ������� (����������� ������� ��� ����������� "
 "����������� ����)\n"
 
-#: g10/keygen.c:1736 g10/sig-check.c:317 g10/sign.c:114
+#: g10/keygen.c:1741 g10/sig-check.c:317 g10/sign.c:114
 #, fuzzy, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1697,7 +1697,7 @@ msgstr ""
 "�������� ���� ������������ � ������� (����������� ������� ��� ����������� "
 "����������� ����)\n"
 
-#: g10/keygen.c:1769
+#: g10/keygen.c:1774
 #, fuzzy
 msgid "Really create? "
 msgstr "������������� �������? "
@@ -2701,7 +2701,7 @@ msgid "revoked"
 msgstr "����"
 
 #. of subkey
-#: g10/keylist.c:400 g10/mainproc.c:834
+#: g10/keylist.c:404 g10/mainproc.c:834
 #, fuzzy, c-format
 msgid " [expires: %s]"
 msgstr "���� ��������� �� %s\n"
@@ -2853,7 +2853,7 @@ msgstr ""
 msgid "can't connect to `%s': %s\n"
 msgstr "���������� ������� ���� `%s': %s\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:557
+#: g10/passphrase.c:313 g10/passphrase.c:574
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr ""
@@ -2911,7 +2911,7 @@ msgstr ""
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
 
-#: g10/passphrase.c:543
+#: g10/passphrase.c:560
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2921,22 +2921,22 @@ msgstr ""
 "��� ����� �������� �����, ����� ��������� ����\n"
 "������������: \""
 
-#: g10/passphrase.c:552
+#: g10/passphrase.c:569
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "(%u-��� %s ����, ID %08lX, ������ %s)\n"
 
-#: g10/passphrase.c:590
+#: g10/passphrase.c:607
 #, fuzzy
 msgid "can't query password in batchmode\n"
 msgstr "���������� ������� ��� � �������� ������.\n"
 
-#: g10/passphrase.c:594
+#: g10/passphrase.c:611
 #, fuzzy
 msgid "Enter passphrase: "
 msgstr "������� �������� �����: %s\n"
 
-#: g10/passphrase.c:598
+#: g10/passphrase.c:615
 #, fuzzy
 msgid "Repeat passphrase: "
 msgstr "��������� �������� �����: %s\n"
@@ -3070,12 +3070,12 @@ msgstr "���� %08lX: ��� �������������� ������������ ��� �������\n"
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "���� %08lX: ��� �������������� ������������ ��� �������\n"
 
-#: g10/sig-check.c:324
+#: g10/sig-check.c:328
 #, fuzzy, c-format
-msgid "NOTE: signature key expired %s\n"
+msgid "NOTE: signature key %08lX expired %s\n"
 msgstr "��������������: ���� ������� ������� %s\n"
 
-#: g10/sig-check.c:393
+#: g10/sig-check.c:398
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 
diff --git a/po/sv.po b/po/sv.po
index 0720217ae..95820bd76 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -13,7 +13,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.1e\n"
-"POT-Creation-Date: 2000-12-19 11:58+0100\n"
+"POT-Creation-Date: 2001-01-11 13:11+0100\n"
 "PO-Revision-Date: 2000-04-23 16:43+02:00\n"
 "Last-Translator: Daniel Resare <[email protected]>\n"
 "Language-Team: Swedish <[email protected]>\n"
@@ -351,7 +351,7 @@ msgstr ""
 "en stund f�r att ge operativsystemet en chans att samla mer entropi!\n"
 "(Beh�ver %d fler byte)\n"
 
-#: g10/g10.c:210
+#: g10/g10.c:211
 msgid ""
 "@Commands:\n"
 " "
@@ -359,139 +359,139 @@ msgstr ""
 "@Kommandon:\n"
 " "
 
-#: g10/g10.c:212
+#: g10/g10.c:213
 msgid "|[file]|make a signature"
 msgstr "|[fil]|skapa en signatur"
 
-#: g10/g10.c:213
+#: g10/g10.c:214
 msgid "|[file]|make a clear text signature"
 msgstr "|[fil]|skapa en klartext-signatur"
 
-#: g10/g10.c:214
+#: g10/g10.c:215
 msgid "make a detached signature"
 msgstr "skapa en signatur i en separat fil"
 
-#: g10/g10.c:215
+#: g10/g10.c:216
 msgid "encrypt data"
 msgstr "kryptera data"
 
-#: g10/g10.c:216
+#: g10/g10.c:217
 msgid "encryption only with symmetric cipher"
 msgstr "endast kryptering med symmetriskt chiffer"
 
-#: g10/g10.c:217
+#: g10/g10.c:218
 msgid "store only"
 msgstr "endast lagring"
 
-#: g10/g10.c:218
+#: g10/g10.c:219
 msgid "decrypt data (default)"
 msgstr "dekryptera data (normall�ge)"
 
-#: g10/g10.c:219
+#: g10/g10.c:220
 msgid "verify a signature"
 msgstr "verifiera en signatur"
 
-#: g10/g10.c:221
+#: g10/g10.c:222
 msgid "list keys"
 msgstr "r�kna upp nycklar"
 
-#: g10/g10.c:223
+#: g10/g10.c:224
 msgid "list keys and signatures"
 msgstr "r�kna upp nycklar och signaturer"
 
-#: g10/g10.c:224
+#: g10/g10.c:225
 msgid "check key signatures"
 msgstr "verifiera nyckelsignaturer"
 
-#: g10/g10.c:225
+#: g10/g10.c:226
 msgid "list keys and fingerprints"
 msgstr "r�kna upp nycklar och fingeravtryck"
 
-#: g10/g10.c:226
+#: g10/g10.c:227
 msgid "list secret keys"
 msgstr "r�kna upp hemliga nycklar"
 
-#: g10/g10.c:227
+#: g10/g10.c:228
 msgid "generate a new key pair"
 msgstr "generera ett nytt nyckelpar"
 
-#: g10/g10.c:228
+#: g10/g10.c:229
 msgid "remove key from the public keyring"
 msgstr "ta bort en nyckel fr�n den publika nyckelringen"
 
-#: g10/g10.c:230
+#: g10/g10.c:231
 msgid "remove key from the secret keyring"
 msgstr "ta bort en nyckel fr�n den hemliga nyckelringen"
 
-#: g10/g10.c:231
+#: g10/g10.c:232
 msgid "sign a key"
 msgstr "signera en nyckel"
 
-#: g10/g10.c:232
+#: g10/g10.c:233
 msgid "sign a key locally"
 msgstr "signera en nyckel lokalt"
 
-#: g10/g10.c:233
+#: g10/g10.c:234
 msgid "sign or edit a key"
 msgstr "signera eller redigera en nyckel"
 
-#: g10/g10.c:234
+#: g10/g10.c:235
 msgid "generate a revocation certificate"
 msgstr "generera ett �terkallelesecertifikat"
 
-#: g10/g10.c:235
+#: g10/g10.c:236
 msgid "export keys"
 msgstr "exportera nycklar"
 
-#: g10/g10.c:236
+#: g10/g10.c:237
 msgid "export keys to a key server"
 msgstr "exportera nycklar till en nyckelserver"
 
-#: g10/g10.c:237
+#: g10/g10.c:238
 msgid "import keys from a key server"
 msgstr "importera nycklar fr�n en nyckelserver"
 
-#: g10/g10.c:241
+#: g10/g10.c:242
 msgid "import/merge keys"
 msgstr "importera/sl� ihop nycklar"
 
-#: g10/g10.c:243
+#: g10/g10.c:244
 msgid "list only the sequence of packets"
 msgstr "skriv endast ut paketsekvensen"
 
-#: g10/g10.c:245
+#: g10/g10.c:246
 msgid "export the ownertrust values"
 msgstr "exportera de v�rden som representerar �gartillit"
 
-#: g10/g10.c:247
+#: g10/g10.c:248
 msgid "import ownertrust values"
 msgstr "importera v�rden som representerar �gartillit"
 
-#: g10/g10.c:249
+#: g10/g10.c:250
 msgid "update the trust database"
 msgstr "uppdatera tillitsdatabasen"
 
-#: g10/g10.c:251
+#: g10/g10.c:252
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NAMN]|kontrollera tillitsdatabasen"
 
-#: g10/g10.c:252
+#: g10/g10.c:253
 msgid "fix a corrupted trust database"
 msgstr "reparera en korrupt tillitsdatabas"
 
-#: g10/g10.c:253
+#: g10/g10.c:254
 msgid "De-Armor a file or stdin"
 msgstr "Skala av en fil eller standard in"
 
-#: g10/g10.c:255
+#: g10/g10.c:256
 msgid "En-Armor a file or stdin"
 msgstr "Skapa ett skal f�r en fil eller standard in"
 
-#: g10/g10.c:257
+#: g10/g10.c:258
 msgid "|algo [files]|print message digests"
 msgstr "|algo [filer]|skriv ut kontrollsummor"
 
-#: g10/g10.c:261
+#: g10/g10.c:262
 msgid ""
 "@\n"
 "Options:\n"
@@ -501,156 +501,156 @@ msgstr ""
 "Flaggor:\n"
 " "
 
-#: g10/g10.c:263
+#: g10/g10.c:264
 msgid "create ascii armored output"
 msgstr "skapa utdata med ett ascii-skal"
 
-#: g10/g10.c:265
+#: g10/g10.c:266
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAMN|kryptera f�r NAMN"
 
-#: g10/g10.c:268
+#: g10/g10.c:269
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAMN|anv�nd NAMN som standardv�rdet f�r mottagare"
 
-#: g10/g10.c:270
+#: g10/g10.c:271
 msgid "use the default key as default recipient"
 msgstr "anv�nd standardnyckeln som standardmottagare"
 
-#: g10/g10.c:274
+#: g10/g10.c:275
 msgid "use this user-id to sign or decrypt"
 msgstr "anv�nd denna anv�ndaridentitet f�r att signera eller dekryptera"
 
-#: g10/g10.c:275
+#: g10/g10.c:276
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|s�tt kompressionsniv�n till N (0 f�r att sl� av kompression)"
 
-#: g10/g10.c:277
+#: g10/g10.c:278
 msgid "use canonical text mode"
 msgstr "anv�nd \"ursprunglig text\"-l�get"
 
-#: g10/g10.c:278
+#: g10/g10.c:279
 msgid "use as output file"
 msgstr "anv�nd som fil f�r utdata"
 
-#: g10/g10.c:279
+#: g10/g10.c:280
 msgid "verbose"
 msgstr "utf�rlig"
 
-#: g10/g10.c:280
+#: g10/g10.c:281
 msgid "be somewhat more quiet"
 msgstr "var n�got tystare"
 
-#: g10/g10.c:281
+#: g10/g10.c:282
 msgid "don't use the terminal at all"
 msgstr "anv�nd inte terminalen alls"
 
-#: g10/g10.c:282
+#: g10/g10.c:283
 msgid "force v3 signatures"
 msgstr "anv�nd v3-signaturer"
 
-#: g10/g10.c:283
+#: g10/g10.c:284
 msgid "always use a MDC for encryption"
 msgstr "anv�nd alltid en MDC f�r kryptering"
 
-#: g10/g10.c:284
+#: g10/g10.c:285
 msgid "do not make any changes"
 msgstr "g�r inga �ndringar"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:286
+#: g10/g10.c:287
 msgid "use the gpg-agent"
 msgstr ""
 
-#: g10/g10.c:287
+#: g10/g10.c:288
 msgid "batch mode: never ask"
 msgstr "batch-l�ge: fr�ga aldrig"
 
-#: g10/g10.c:288
+#: g10/g10.c:289
 msgid "assume yes on most questions"
 msgstr "anta att svaret �r ja p� de flesta fr�gor"
 
-#: g10/g10.c:289
+#: g10/g10.c:290
 msgid "assume no on most questions"
 msgstr "anta att svaret �r nej p� de flesta fr�gor"
 
-#: g10/g10.c:290
+#: g10/g10.c:291
 msgid "add this keyring to the list of keyrings"
 msgstr "l�gg till denna nyckelring till listan av nyckelringar"
 
-#: g10/g10.c:291
+#: g10/g10.c:292
 msgid "add this secret keyring to the list"
 msgstr "l�gg till denna hemliga nyckelring till listan"
 
-#: g10/g10.c:292
+#: g10/g10.c:293
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAMN|anv�nd NAMN som f�rvald hemlig nyckel"
 
-#: g10/g10.c:293
+#: g10/g10.c:294
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|V�RD|anv�nd denna nyckelserver f�r att sl� upp nycklar"
 
-#: g10/g10.c:294
+#: g10/g10.c:295
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAMN|s�tt teckentabellen f�r terminalen till NAMN"
 
-#: g10/g10.c:295
+#: g10/g10.c:296
 msgid "read options from file"
 msgstr "l�s flaggor fr�n fil"
 
-#: g10/g10.c:299
+#: g10/g10.c:300
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skriv statusinformation till denna FD"
 
-#: g10/g10.c:304
+#: g10/g10.c:305
 msgid "|KEYID|ulimately trust this key"
 msgstr ""
 
-#: g10/g10.c:305
+#: g10/g10.c:306
 msgid "|FILE|load extension module FILE"
 msgstr "|FIL|ladda till�ggsmodul FIL"
 
-#: g10/g10.c:306
+#: g10/g10.c:307
 msgid "emulate the mode described in RFC1991"
 msgstr "imitera l�get som beskrivs i RFC1991"
 
-#: g10/g10.c:307
+#: g10/g10.c:308
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "st�ll om alla flaggor s� att gpg f�ljer OpenPGP-standarden"
 
-#: g10/g10.c:308
+#: g10/g10.c:309
 msgid "|N|use passphrase mode N"
 msgstr "|N|anv�nd l�senordsl�get N"
 
-#: g10/g10.c:310
+#: g10/g10.c:311
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAMN|anv�nd kontrollsummealgoritmen NAMN f�r l�senordsfraser"
 
-#: g10/g10.c:312
+#: g10/g10.c:313
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAMN|anv�nd chifferalgoritmen NAMN f�r l�senordsfraser"
 
-#: g10/g10.c:313
+#: g10/g10.c:314
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAMN|anv�nd chifferalgoritmen NAMN"
 
-#: g10/g10.c:314
+#: g10/g10.c:315
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAMN|anv�nd kontrollsummealgoritmen NAMN"
 
-#: g10/g10.c:315
+#: g10/g10.c:316
 msgid "|N|use compress algorithm N"
 msgstr "|N|anv�nd komprimeringsalgoritmen N"
 
-#: g10/g10.c:316
+#: g10/g10.c:317
 msgid "throw keyid field of encrypted packets"
 msgstr "sl�ng bort nyckelidentitetsf�ltet fr�n krypterade paket"
 
-#: g10/g10.c:317
+#: g10/g10.c:318
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NAMN=V�RDE|anv�nd detta s�tt f�r att beskriva data"
 
-#: g10/g10.c:320
+#: g10/g10.c:321
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -658,7 +658,7 @@ msgstr ""
 "@\n"
 "(Se manualsidan f�r en komplett lista p� alla kommandon och flaggor)\n"
 
-#: g10/g10.c:323
+#: g10/g10.c:324
 msgid ""
 "@\n"
 "Examples:\n"
@@ -678,17 +678,17 @@ msgstr ""
 "--list-keys [namn]          visa nycklar\n"
 "--fingerprint [namn]        visa fingeravtryck\n"
 
-#: g10/g10.c:427
+#: g10/g10.c:429
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "Rapportera g�rna fel till <[email protected]>.\n"
 "Rapportera g�rna fel eller synpunkter p� �vers�ttningen till <[email protected]>.\n"
 
-#: g10/g10.c:431
+#: g10/g10.c:433
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Anv�ndning: gpg [flaggor] [filer] (-h f�r hj�lp)"
 
-#: g10/g10.c:434
+#: g10/g10.c:436
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -698,7 +698,7 @@ msgstr ""
 "signera, kontrollera, kryptera eller dekryptera\n"
 "vilken operation som utf�rs beror p� programmets indata\n"
 
-#: g10/g10.c:441
+#: g10/g10.c:443
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -706,66 +706,66 @@ msgstr ""
 "\n"
 "St�dda algoritmer:\n"
 
-#: g10/g10.c:520
+#: g10/g10.c:522
 msgid "usage: gpg [options] "
 msgstr "anv�ndning: gpg [flaggor] "
 
-#: g10/g10.c:573
+#: g10/g10.c:575
 msgid "conflicting commands\n"
 msgstr "motstridiga kommandon\n"
 
-#: g10/g10.c:713
+#: g10/g10.c:725
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTERA: inst�llningsfilen \"%s\" saknas\n"
 
-#: g10/g10.c:717
+#: g10/g10.c:729
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "inst�llningsfil \"%s\": %s\n"
 
-#: g10/g10.c:724
+#: g10/g10.c:736
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "l�ser flaggor fr�n \"%s\"\n"
 
-#: g10/g10.c:925
+#: g10/g10.c:937
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s �r ingen giltig teckentabell\n"
 
-#: g10/g10.c:994
+#: g10/g10.c:1008
 msgid "WARNING: program may create a core file!\n"
 msgstr "VARNING: programmet kan komma att skapa en minnesutskrift!\n"
 
-#: g10/g10.c:998 g10/g10.c:1007
+#: g10/g10.c:1012 g10/g10.c:1021
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTERA: %s �r inte f�r normal anv�ndning!\n"
 
-#: g10/g10.c:1000
+#: g10/g10.c:1014
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s �r inte till�ten tillsammans med %s!\n"
 
-#: g10/g10.c:1003
+#: g10/g10.c:1017
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "det �r ingen po�ng att anv�nda %s tillsammans med %s!\n"
 
-#: g10/g10.c:1023 g10/g10.c:1035
+#: g10/g10.c:1037 g10/g10.c:1049
 msgid "selected cipher algorithm is invalid\n"
 msgstr "den valda chifferalgoritmen �r ogiltig\n"
 
-#: g10/g10.c:1029 g10/g10.c:1041
+#: g10/g10.c:1043 g10/g10.c:1055
 msgid "selected digest algorithm is invalid\n"
 msgstr "den valda kontrollsummealgoritmen �r ogiltig\n"
 
-#: g10/g10.c:1045
+#: g10/g10.c:1059
 msgid "the given policy URL is invalid\n"
 msgstr "angiven URL �r ogiltig\n"
 
-#: g10/g10.c:1048
+#: g10/g10.c:1062
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "kompressionsalgoritmen m�ste vara i intervallet %d..%d\n"
@@ -776,127 +776,127 @@ msgstr "kompressionsalgoritmen m�ste vara i intervallet %d..%d\n"
 # �r �nd� litet. Eventuellt borde meddelandena inte alls
 # �vers�ttas f�r att g�ra eventuell fels�kning l�ttare
 # f�r internationella fels�kare
-#: g10/g10.c:1050
+#: g10/g10.c:1064
 msgid "completes-needed must be greater than 0\n"
 msgstr "variabeln \"completes-needed\" m�ste ha ett v�rde som �r st�rre �n 0\n"
 
-#: g10/g10.c:1052
+#: g10/g10.c:1066
 msgid "marginals-needed must be greater than 1\n"
 msgstr "variabeln \"marginals-needed\" m�ste vara st�rre �n 1\n"
 
-#: g10/g10.c:1054
+#: g10/g10.c:1068
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "variabeln \"max-cert-depth\" m�ste ha ett v�rde mellan 1 och 255\n"
 
-#: g10/g10.c:1057
+#: g10/g10.c:1071
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTERA: enkelt S2K-l�ge (0) rekommenderas inte\n"
 
-#: g10/g10.c:1061
+#: g10/g10.c:1075
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ogiltigt S2K-l�ge; m�ste vara 0, 1 eller 3\n"
 
-#: g10/g10.c:1146
+#: g10/g10.c:1160
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
 
-#: g10/g10.c:1152
+#: g10/g10.c:1166
 msgid "--store [filename]"
 msgstr "--store [filnamn]"
 
-#: g10/g10.c:1159
+#: g10/g10.c:1173
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnamn]"
 
-#: g10/g10.c:1167
+#: g10/g10.c:1181
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnamn]"
 
-#: g10/g10.c:1180
+#: g10/g10.c:1194
 msgid "--sign [filename]"
 msgstr "--sign [filnamn]"
 
-#: g10/g10.c:1193
+#: g10/g10.c:1207
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnamn]"
 
-#: g10/g10.c:1207
+#: g10/g10.c:1221
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnamn]"
 
-#: g10/g10.c:1224
+#: g10/g10.c:1238
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnamn]"
 
-#: g10/g10.c:1232
+#: g10/g10.c:1246
 msgid "--sign-key user-id"
 msgstr "--sign-key anv�ndaridentitet"
 
-#: g10/g10.c:1240
+#: g10/g10.c:1254
 msgid "--lsign-key user-id"
 msgstr "--lsign-key anv�ndaridentitet"
 
-#: g10/g10.c:1248
+#: g10/g10.c:1262
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key anv�ndaridentitet [kommandon]"
 
-#: g10/g10.c:1264
+#: g10/g10.c:1278
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key anv�ndaridentitet"
 
-#: g10/g10.c:1267
+#: g10/g10.c:1281
 msgid "--delete-key user-id"
 msgstr "--delete-key anv�ndaridentitet"
 
 # Filnamn b�de med och utan fnuttar finns. lite ologiskt. Vill n�gon
 # fixa en patch?
-#: g10/encode.c:268 g10/g10.c:1304 g10/sign.c:393
+#: g10/encode.c:268 g10/g10.c:1318 g10/sign.c:393
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "kan inte �ppna %s: %s\n"
 
-#: g10/g10.c:1319
+#: g10/g10.c:1333
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [anv�ndaridentitet] [nyckelring]"
 
-#: g10/g10.c:1385
+#: g10/g10.c:1399
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "misslyckades med att ta bort skalet: %s\n"
 
-#: g10/g10.c:1393
+#: g10/g10.c:1407
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "misslyckades med att skapa skal: %s\n"
 
-#: g10/g10.c:1464
+#: g10/g10.c:1478
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "felaktig hash-algoritm \"%s\"\n"
 
-#: g10/g10.c:1551
+#: g10/g10.c:1565
 msgid "[filename]"
 msgstr "[filnamn]"
 
-#: g10/g10.c:1555
+#: g10/g10.c:1569
 msgid "Go ahead and type your message ...\n"
 msgstr "Skriv ditt meddelande h�r ...\n"
 
 # se f�rra kommentaren
-#: g10/decrypt.c:59 g10/g10.c:1558 g10/verify.c:94 g10/verify.c:139
+#: g10/decrypt.c:59 g10/g10.c:1572 g10/verify.c:94 g10/verify.c:139
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan inte �ppna \"%s\"\n"
 
-#: g10/g10.c:1767
+#: g10/g10.c:1781
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr ""
 "det f�rsta tecknet i ett notationsnamn m�ste vara en bokstav eller\n"
 "ett understrykningstecken (_)\n"
 
-#: g10/g10.c:1773
+#: g10/g10.c:1787
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -904,11 +904,11 @@ msgstr ""
 "ett notationsnamn kan bara inneh�lla bokst�ver, siffror, punkter eller\n"
 "understrykningstecken och sluta med ett likhetstecken\n"
 
-#: g10/g10.c:1779
+#: g10/g10.c:1793
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr "punkter i ett notationsnamn m�ste vara omgivna av andra tecken\n"
 
-#: g10/g10.c:1787
+#: g10/g10.c:1801
 msgid "a notation value must not use any control characters\n"
 msgstr "ett notationsv�rde f�r inte ineh�lla n�gra kontrolltecken\n"
 
@@ -1596,21 +1596,21 @@ msgstr "DSA-nyckelparet kommer att ha 1024 bitar.\n"
 msgid "Key generation canceled.\n"
 msgstr "Skapandet av nycklar avbr�ts.\n"
 
-#: g10/keygen.c:1571
+#: g10/keygen.c:1572
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skriver publik nyckel till \"%s\"\n"
 
-#: g10/keygen.c:1572
+#: g10/keygen.c:1573
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skriver hemlig nyckel till \"%s\"\n"
 
-#: g10/keygen.c:1668
+#: g10/keygen.c:1670
 msgid "public and secret key created and signed.\n"
 msgstr "publik och hemlig nyckel skapad och signerad.\n"
 
-#: g10/keygen.c:1673
+#: g10/keygen.c:1675
 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"
@@ -1619,13 +1619,13 @@ msgstr ""
 "att vilja anv�nda kommandot \"--edit-key\" f�r att generera en sekund�r\n"
 "nyckel f�r detta syfte.\n"
 
-#: g10/keygen.c:1690 g10/keygen.c:1791
+#: g10/keygen.c:1692 g10/keygen.c:1798
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Nyckelgenereringen misslyckades: %s\n"
 
 # c-format beh�vs inte i singularis
-#: g10/keygen.c:1734 g10/sig-check.c:315 g10/sign.c:112
+#: g10/keygen.c:1739 g10/sig-check.c:315 g10/sign.c:112
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -1633,7 +1633,7 @@ msgstr ""
 "nyckeln �r skapad %lu sekund in i framtiden (problemet �r\n"
 "relaterat till tidsresande eller en felst�lld klocka)\n"
 
-#: g10/keygen.c:1736 g10/sig-check.c:317 g10/sign.c:114
+#: g10/keygen.c:1741 g10/sig-check.c:317 g10/sign.c:114
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -1641,7 +1641,7 @@ msgstr ""
 "nyckeln �r skapad %lu sekunder in i framtiden (problemet �r\n"
 "relaterat till tidsresande eller en felst�lld klocka)\n"
 
-#: g10/keygen.c:1769
+#: g10/keygen.c:1774
 msgid "Really create? "
 msgstr "Vill du verkligen skapa? "
 
@@ -2598,7 +2598,7 @@ msgid "revoked"
 msgstr "revkey"
 
 #. of subkey
-#: g10/keylist.c:400 g10/mainproc.c:834
+#: g10/keylist.c:404 g10/mainproc.c:834
 #, c-format
 msgid " [expires: %s]"
 msgstr "[g�r ut: %s]"
@@ -2759,7 +2759,7 @@ msgstr ""
 msgid "can't connect to `%s': %s\n"
 msgstr "kan inte ansluta till \"%s\": %s\n"
 
-#: g10/passphrase.c:313 g10/passphrase.c:557
+#: g10/passphrase.c:313 g10/passphrase.c:574
 #, c-format
 msgid " (main key ID %08lX)"
 msgstr " (huvudnyckelns identitet %08lX)"
@@ -2802,7 +2802,7 @@ msgstr ""
 msgid "problem with the agent: agent returns 0x%lx\n"
 msgstr ""
 
-#: g10/passphrase.c:543
+#: g10/passphrase.c:560
 msgid ""
 "\n"
 "You need a passphrase to unlock the secret key for\n"
@@ -2812,20 +2812,20 @@ msgstr ""
 "Du beh�ver en l�senordsfras f�r att l�sa upp den hemliga nyckeln f�r\n"
 "anv�ndaren: \""
 
-#: g10/passphrase.c:552
+#: g10/passphrase.c:569
 #, c-format
 msgid "%u-bit %s key, ID %08lX, created %s"
 msgstr "%u-bits  %s-nyckel, ID %08lX, skapad %s"
 
-#: g10/passphrase.c:590
+#: g10/passphrase.c:607
 msgid "can't query password in batchmode\n"
 msgstr "kan inte fr�ga efter l�senord i batch-l�ge\n"
 
-#: g10/passphrase.c:594
+#: g10/passphrase.c:611
 msgid "Enter passphrase: "
 msgstr "Ange l�senordsfras: "
 
-#: g10/passphrase.c:598
+#: g10/passphrase.c:615
 msgid "Repeat passphrase: "
 msgstr "Repetera l�senordsfrasen: "
 
@@ -2956,12 +2956,12 @@ msgstr "den publika nyckeln �r %lu sekund nyare �n signaturen\n"
 msgid "public key is %lu seconds newer than the signature\n"
 msgstr "den publika nyckeln �r %lu sekunder nyare �n signaturen\n"
 
-#: g10/sig-check.c:324
-#, c-format
-msgid "NOTE: signature key expired %s\n"
+#: g10/sig-check.c:328
+#, fuzzy, c-format
+msgid "NOTE: signature key %08lX expired %s\n"
 msgstr "NOTERA: signaturnyckeln �r f�r gammal, gick ut vid %s\n"
 
-#: g10/sig-check.c:393
+#: g10/sig-check.c:398
 msgid "assuming bad signature due to an unknown critical bit\n"
 msgstr ""
 "antar att signaturen �r felaktig eftersom en ok�nd kritisk bit �r satt\n"