See ChangeLog: Fri Jul 23 13:53:03 CEST 1999 Werner KochV0-9-9

22 files changed, 1898 insertions, 1701 deletions

diff --git a/AUTHORS b/AUTHORS
index e7107b34b..7ae8560f1 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -48,7 +48,7 @@ Fixed a lot of typos.
 
 TRANSLATIONS	Walter Koch	1998-09-08
 Disclaimer.  [de]
[email protected]
[email protected]
 
 
 TRANSLATIONS	Gregory Steuck	1998-10-20
diff --git a/BUGS b/BUGS
index bf3290199..43998969a 100644
--- a/BUGS
+++ b/BUGS
@@ -29,14 +29,6 @@ and after about half a day in the rsync snapshots.
     The for loop the exp.date is set before v3 detection?
     [is this bug still alive? - can someone please check it]
 
-[  *] #5
-    /home/jam/.gnupg/pubring.gpg: can't open gdbm file: Can't be writer
-    keyblock resource `/home/jam/.gnupg/pubring.gpg': file open error
-    OOPS in close enum_keyblocks - ignored
-    [gdbm is experimental and will be replaced by the new keybox code]
-    FIX: 1999-07-22 (Fixed the second error, there will be no fix for
-    the first one, becuase GDBM is to be replaced)
-
 [ **] #6 1999-02-22 <[email protected]> 0.9.3
     Buserror on IRIX 6.4: Crash while doing a keygen. I think while creating
     the prime.	Other buserrors are reported when doing a "gpg README"
@@ -48,11 +40,6 @@ and after about half a day in the rsync snapshots.
     rndunix hangs on hp/ux.  The problem is related to my_plcose which is
     not always called.	(I suggest to use EGD instead of rndunix.)
 
-[ **] #19 1999-06-11
-    "trustdb transaction too large" with about 500 signatures on a key
-    FAEBD5FC.
-    FIX: 1999-07-12  (less memory requirement and increased the limit)
-
 [  *] #22 1999-07-22
     Solaris make has problems with the generated POTFILES - seems to be a
     gettext bug.  Use GNU gmake as a workaround.
diff --git a/ChangeLog b/ChangeLog
index e9f3eab89..302812aab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Fri Jul 23 13:53:03 CEST 1999  Werner Koch  <[email protected]>
+
+
+	* VERSION: Set to 0.9.9.
+
+	* configure.in: Print a notice when rndunix is used.
+
 Thu Jul 15 10:15:35 CEST 1999  Werner Koch  <[email protected]>
 
 	* acinclude.m4 (GNUPG_SYS_SYMBOL_UNDERSCORE): Fixed last modification.
diff --git a/NEWS b/NEWS
index b0708c928..748c85d25 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+Noteworthy changes in version 0.9.9
+-----------------------------------
 
     * New options --[no-]utf8-strings.
 
diff --git a/OBUGS b/OBUGS
index a8bf33997..5f5654c20 100644
--- a/OBUGS
+++ b/OBUGS
@@ -19,6 +19,14 @@
     gpg:[stdin]: key A6A59DB9: secret key not found: public key not found
     FIX: 1999-02-22 wk
 
+[  *] #5
+    /home/jam/.gnupg/pubring.gpg: can't open gdbm file: Can't be writer
+    keyblock resource `/home/jam/.gnupg/pubring.gpg': file open error
+    OOPS in close enum_keyblocks - ignored
+    [gdbm is experimental and will be replaced by the new keybox code]
+    FIX: 1999-07-22 (Fixed the second error, there will be no fix for
+    the first one, becuase GDBM is to be replaced)
+
 [  *] #7 1999-02-22 <[email protected]> 0.9.3
     Conventional encrytion incompatibilty:
      $ gpg -c --cipher-algo cast5 --compress-algo 1 --no-comment secrets.txt
@@ -77,6 +85,11 @@
     Import does not detect identical user IDs.
     FIX: 1999-05-22
 
+[ **] #19 1999-06-11
+    "trustdb transaction too large" with about 500 signatures on a key
+    FAEBD5FC.
+    FIX: 1999-07-12  (less memory requirement and increased the limit)
+
 [ **] #20 1999-06-16 <[email protected]>  0.9.7
     Using "addkey" in the edit menu with more than 1 subkey leads to
     "out of secure memory" in some cases.
diff --git a/README b/README
index 5de8defe3..23b0021d2 100644
--- a/README
+++ b/README
@@ -1,6 +1,8 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+
 		    GnuPG - The GNU Privacy Guard
 		   -------------------------------
-			   Version 0.9.8
+			   Version 0.9.9
 
     GnuPG is now in Beta test and you should report all bugs to the
     mailing list (see below).  The 0.9.x versions are released mainly
@@ -445,3 +447,12 @@
 
     Have fun and remember: Echelon is looking at you kid.
 
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v0.9.8a (GNU/Linux)
+Comment: For info see http://www.gnupg.org
+
+iQB1AwUBN5g4Lx0Z9MEMmFelAQE+RwL/Ws+kNklTHJnABT8YU8BqN8x310DyUm+e
+ViS23npv3S/kRnHbCOOQo4cEjUYZFFrJXzQgodBvKbLVzMgdj4XQvkulTSBYK6pm
+B7GeQptWRCNJ7m+Hw0Z4gwJ7giQTdfF8
+=pJ7c
+-----END PGP SIGNATURE-----
diff --git a/THANKS b/THANKS
index 4f91ceed2..d69fc4ef1 100644
--- a/THANKS
+++ b/THANKS
@@ -92,7 +92,7 @@ Tomas Fasth		[email protected]
 Thomas Mikkelsen	[email protected]
 Ulf M�ller		[email protected]
 Urko Lusa		[email protected]
-Walter Koch		[email protected]
+Walter Koch		[email protected]
 Werner Koch		[email protected]
 Wim Vandeputte		[email protected]
 			[email protected]
diff --git a/TODO b/TODO
index fe9d05094..2f9381825 100644
--- a/TODO
+++ b/TODO
@@ -1,7 +1,4 @@
 
-  * Check that uids without a self signature don't become fully trusted and
-    print a warning when such a key is used.
-
 
 Scheduled for 1.1
 -----------------
@@ -43,4 +40,12 @@ Nice to have
     verification status of the message to the output (i.e. write something to
     the --output file and not only to stderr.
   * configure option where to find zlib
+  * Check the beginning of file to detect already compresssed files (gzip,
+    bzip2, xdelta and some picture formats)
+  * Display more validity information about the user IDs at certain places.
+    We need a more general function to extract such kind of info from the
+    trustdb.
+  * Evaluate whether it make sense to replace the namehashs either by
+    using the user ID directly or by using pointers into the trustdb.
+
 
diff --git a/VERSION b/VERSION
index c944c51af..7e310bae1 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.9.8b
+0.9.9
diff --git a/cipher/cipher.c b/cipher/cipher.c
index ac77e5b02..4a0e683d9 100644
--- a/cipher/cipher.c
+++ b/cipher/cipher.c
@@ -260,7 +260,7 @@ disable_cipher_algo( int algo )
 	}
     }
     /* fixme: we should use a linked list */
-    log_fatal("can't disable cipher algo %d: table full\n");
+    log_fatal("can't disable cipher algo %d: table full\n", algo );
 }
 
 /****************
@@ -396,7 +396,7 @@ cipher_setiv( CIPHER_HANDLE c, const byte *iv, unsigned ivlen )
     if( iv ) {
 	if( ivlen != c->blocksize )
 	    log_info("WARNING: cipher_setiv: ivlen=%u blklen=%u\n",
-					     ivlen, c->blocksize );
+					     ivlen, (unsigned)c->blocksize );
 	if( ivlen > c->blocksize )
 	    ivlen = c->blocksize;
 	memcpy( c->iv, iv, ivlen );
diff --git a/cipher/pubkey.c b/cipher/pubkey.c
index 548d2e819..a03af3026 100644
--- a/cipher/pubkey.c
+++ b/cipher/pubkey.c
@@ -278,7 +278,7 @@ disable_pubkey_algo( int algo )
 	    return;
 	}
     }
-    log_fatal("can't disable pubkey algo %d: table full\n");
+    log_fatal("can't disable pubkey algo %d: table full\n", algo );
 }
 
 
diff --git a/configure.in b/configure.in
index d94a76a6b..fcf9916a5 100644
--- a/configure.in
+++ b/configure.in
@@ -50,6 +50,8 @@ case "$use_static_rnd" in
       ;;
 esac
 
+
+
 dnl
 dnl See whether the user wants to disable checking for /dev/random
 
@@ -116,8 +118,11 @@ if test x$compile_libgcrypt = xyes ; then
     else
         compile_libgcrypt=no
         AC_MSG_WARN([[
+***
 *** LIBGCRYPT is not yet ready for public testing.
-*** Maybe you have more luck with the next release of GnuPG]])
+*** Maybe you have more luck with the next release of GnuPG
+*** Watch the gnupg-announce mailing list or the webpage.
+***]])
     fi
 fi
 AM_CONDITIONAL(COMPILE_LIBGCRYPT, test x$compile_libgcrypt = xyes)
@@ -400,13 +405,15 @@ if test "$ac_cv_header_sys_capability_h" = "yes" ; then
 fi
 if test "$use_capabilities" = "no" ; then
     AC_MSG_WARN([[
+***
 *** The use of capabilities on this system is not possible.
 *** You need a recent Linux kernel and some patches:
 ***   fcaps-2.2.9-990610.patch      (kernel patch for 2.2.9)
 ***   fcap-module-990613.tar.gz     (kernel module)
 ***   libcap-1.92.tar.gz            (user mode library and utilities)
 *** And you have to configure the kernel with CONFIG_VFS_CAP_PLUGIN
-*** set (filesystems menu). Be warned: This code is *really* ALPHA.]])
+*** set (filesystems menu). Be warned: This code is *really* ALPHA.
+***]])
 fi
 fi
 
@@ -455,6 +462,7 @@ dnl
 dnl Figure out the default linkage mode for cipher modules
 dnl
 dnl (We always need a static rmd160)
+print_egd_notice=no
 static_modules="$static_modules rmd160"
 if test "$use_static_rnd" = default; then
   if test "$ac_cv_have_dev_random" = yes; then
@@ -472,6 +480,7 @@ if test "$use_static_rnd" = default; then
               ;;
           *)
               static_modules="$static_modules rndunix"
+              print_egd_notice=yes
              ;;
       esac
   fi
@@ -480,9 +489,34 @@ else
     :
   else
     static_modules="$static_modules rnd$use_static_rnd"
+    if test "$use_static_rnd" = "unix"; then
+        print_egd_notice=yes
+    fi
   fi
 fi
 
+
+if test "$print_egd_notice" = "yes"; then
+    AC_MSG_WARN([[
+***
+*** The performance of the UNIX random gatherer module is not very good
+*** and it does not keep the entropy pool over multiple invocations of
+*** GnuPG.  The suggested way to overcome this problem is to use the
+***
+***               Entropy Gathering Daemon (EGD)
+***
+*** which provides a entropy source for the whole system.  It is written
+*** in Perl and available at the GnuPG FTP servers.  For more information
+*** consult the GnuPG webpages:
+***
+***           http://www.gnupg.org/donwload.html#egd
+***
+*** You may want to run ./configure with --enable-static-rnd=none to be
+*** able to load the EGD client code dynamically; this way you can choose
+*** between RNDUNIX and RNDEGD without recompilation.
+***]])
+fi
+
 dnl
 dnl Parse the modules list and build the list
 dnl of static and dymically linked modules
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 5fa88ec54..08ef6b11d 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,23 @@
+Fri Jul 23 13:53:03 CEST 1999  Werner Koch  <[email protected]>
+
+
+	* ringedit.c (enum_keyblocks): Removed annoying error message in cases
+	when we have no keyring at all to enum.
+
+	* getkey.c (classify_user_id): Rewrote to relax the recognition of
+	keyIDs and fingerprints (Michael).
+
+	* mainproc.c (check_sig_and_print): Print status NO_PUBKEY.
+	(print_failed_pkenc): Print status NO_SECKEY.
+
+	* import.c (mark_non_selfsigned_uids_valid): New.
+	* g10.c: New option --allow-non-selfsigned-uid.
+
+	* pkclist.c (print_fpr): New.
+	(do_we_trust_pre): Print the fpr before asking whether to use the key
+	anyway.
+	(do_edit_ownertrust): Likewise.
+
 Thu Jul 22 20:03:03 CEST 1999  Werner Koch  <[email protected]>
 
 
diff --git a/g10/keyedit.c b/g10/keyedit.c
index 7025b4d26..5b04e2883 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -655,7 +655,7 @@ keyedit_menu( const char *username, STRLIST locusr, STRLIST commands,
     toggle = 0;
     cur_keyblock = keyblock;
     for(;;) { /* main loop */
-	int i, arg_number=0;
+	int i, arg_number;
 	char *p;
 
 	tty_printf("\n");
diff --git a/g10/pkclist.c b/g10/pkclist.c
index 01d12babb..6dff74219 100644
--- a/g10/pkclist.c
+++ b/g10/pkclist.c
@@ -39,6 +39,36 @@
 
 #define CONTROL_D ('D' - 'A' + 1)
 
+/* fixme: we have nearly the same code in keyedit.c */
+static void
+print_fpr( PKT_public_key *pk )
+{
+    byte array[MAX_FINGERPRINT_LEN], *p;
+    size_t i, n;
+
+    fingerprint_from_pk( pk, array, &n );
+    p = array;
+    /* Translators: this shoud fit into 24 bytes to that the fingerprint
+     * data is properly aligned with the user ID */
+    tty_printf(_("             Fingerprint:"));
+    if( n == 20 ) {
+	for(i=0; i < n ; i++, i++, p += 2 ) {
+	    if( i == 10 )
+		tty_printf(" ");
+	    tty_printf(" %02X%02X", *p, p[1] );
+	}
+    }
+    else {
+	for(i=0; i < n ; i++, p++ ) {
+	    if( i && !(i%8) )
+		tty_printf(" ");
+	    tty_printf(" %02X", *p );
+	}
+    }
+    tty_printf("\n");
+}
+
+
 
 static void
 show_paths( ulong lid, int only_first )
@@ -148,7 +178,9 @@ do_edit_ownertrust( ulong lid, int mode, unsigned *new_trust, int defer_help )
 		p = get_user_id( keyid, &n );
 		tty_print_string( p, n ),
 		m_free(p);
-		tty_printf("\"\n\n");
+		tty_printf("\"\n");
+		print_fpr( pk );
+		tty_printf("\n");
 	    }
 	    tty_printf(_(
 "Please decide how far you trust this user to correctly\n"
@@ -375,6 +407,7 @@ do_we_trust( PKT_public_key *pk, int trustlevel )
 }
 
 
+
 /****************
  * wrapper around do_we_trust, so we can ask whether to use the
  * key anyway.
@@ -402,7 +435,9 @@ do_we_trust_pre( PKT_public_key *pk, int trustlevel )
 	p = get_user_id( keyid, &n );
 	tty_print_string( p, n ),
 	m_free(p);
-	tty_printf("\"\n\n");
+	tty_printf("\"\n");
+	print_fpr( pk );
+	tty_printf("\n");
 
 	tty_printf(_(
 "It is NOT certain that the key belongs to its owner.\n"
diff --git a/po/de.po b/po/de.po
index 2d7cd784e..9adf94f9f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -3,7 +3,7 @@
 # Walter Koch <[email protected]>, 1998.
 msgid ""
 msgstr ""
-"POT-Creation-Date: 1999-07-14 11:47+0200\n"
+"POT-Creation-Date: 1999-07-23 12:13+0200\n"
 "PO-Revision-Date: 1999-07-12 21:56+0200\n"
 "Last-Translator: Walter Koch <[email protected]>\n"
 "Language-Team: German <[email protected]>\n"
@@ -274,7 +274,7 @@ msgstr ""
 "Arbeiten durch, damit das Betriebssystem weitere Entropie sammeln kann!\n"
 "(Es werden noch %d Byte ben�tigt.)\n"
 
-#: g10/g10.c:180
+#: g10/g10.c:183
 msgid ""
 "@Commands:\n"
 " "
@@ -282,138 +282,138 @@ msgstr ""
 "@Befehle:\n"
 " "
 
-#: g10/g10.c:182
+#: g10/g10.c:185
 msgid "|[file]|make a signature"
 msgstr "|[Datei]|Eine Unterschrift erzeugen"
 
-#: g10/g10.c:183
+#: g10/g10.c:186
 msgid "|[file]|make a clear text signature"
 msgstr "|[Datei]|Eine Klartextunterschrift erzeugen"
 
-#: g10/g10.c:184
+#: g10/g10.c:187
 msgid "make a detached signature"
 msgstr "Eine abgetrennte Unterschrift erzeugen"
 
-#: g10/g10.c:185
+#: g10/g10.c:188
 msgid "encrypt data"
 msgstr "Daten verschl�sseln"
 
-#: g10/g10.c:186
+#: g10/g10.c:189
 msgid "encryption only with symmetric cipher"
 msgstr "Daten symmetrisch verschl�sseln"
 
-#: g10/g10.c:187
+#: g10/g10.c:190
 msgid "store only"
 msgstr "Nur speichern"
 
-#: g10/g10.c:188
+#: g10/g10.c:191
 msgid "decrypt data (default)"
 msgstr "Daten entschl�sseln (Voreinstellung)"
 
-#: g10/g10.c:189
+#: g10/g10.c:192
 msgid "verify a signature"
 msgstr "Signatur pr�fen"
 
-#: g10/g10.c:190
+#: g10/g10.c:193
 msgid "list keys"
 msgstr "Liste der Schl�ssel"
 
-#: g10/g10.c:192
+#: g10/g10.c:195
 msgid "list keys and signatures"
 msgstr "Liste der Schl�ssel und ihrer Signaturen"
 
-#: g10/g10.c:193
+#: g10/g10.c:196
 msgid "check key signatures"
 msgstr "Signaturen der Schl�ssel pr�fen"
 
-#: g10/g10.c:194
+#: g10/g10.c:197
 msgid "list keys and fingerprints"
 msgstr "Liste der Schl�ssel und ihrer \"Fingerabdr�cke\""
 
-#: g10/g10.c:195
+#: g10/g10.c:198
 msgid "list secret keys"
 msgstr "Liste der geheimen Schl�ssel"
 
-#: g10/g10.c:196
+#: g10/g10.c:199
 msgid "generate a new key pair"
 msgstr "Ein neues Schl�sselpaar erzeugen"
 
-#: g10/g10.c:197
+#: g10/g10.c:200
 msgid "remove key from the public keyring"
 msgstr "Schl�ssel entfernen"
 
-#: g10/g10.c:198
+#: g10/g10.c:201
 #, fuzzy
 msgid "sign a key"
 msgstr "Den Schl�ssel signieren"
 
-#: g10/g10.c:199
+#: g10/g10.c:202
 #, fuzzy
 msgid "sign a key locally"
 msgstr "Den Schl�ssel nur auf diesem Rechner signieren"
 
-#: g10/g10.c:200
+#: g10/g10.c:203
 msgid "sign or edit a key"
 msgstr "Unterschreiben oder Bearbeiten eines Schl�ssels"
 
-#: g10/g10.c:201
+#: g10/g10.c:204
 msgid "generate a revocation certificate"
 msgstr "Ein Schl�sselwiderruf-Zertifikat erzeugen"
 
-#: g10/g10.c:202
+#: g10/g10.c:205
 msgid "export keys"
 msgstr "Schl�ssel exportieren"
 
-#: g10/g10.c:203
+#: g10/g10.c:206
 msgid "export keys to a key server"
 msgstr "Schl�ssel zu einem Schl�sselserver exportieren"
 
-#: g10/g10.c:204
+#: g10/g10.c:207
 msgid "import keys from a key server"
 msgstr "Schl�ssel von einem Schl�sselserver importieren"
 
-#: g10/g10.c:207
+#: g10/g10.c:210
 msgid "import/merge keys"
 msgstr "Schl�ssel importieren/kombinieren"
 
-#: g10/g10.c:209
+#: g10/g10.c:212
 msgid "list only the sequence of packets"
 msgstr "Lediglich die Struktur der Datenpakete anzeigen"
 
-#: g10/g10.c:211
+#: g10/g10.c:214
 msgid "export the ownertrust values"
 msgstr "Exportieren der \"Owner trust\" Werte"
 
-#: g10/g10.c:213
+#: g10/g10.c:216
 msgid "import ownertrust values"
 msgstr "Importieren der \"Owner trust\" Werte"
 
-#: g10/g10.c:215
+#: g10/g10.c:218
 #, fuzzy
 msgid "update the trust database"
 msgstr "|[NAMEN]|�ndern der \"Trust\"-Datenbank"
 
-#: g10/g10.c:217
+#: g10/g10.c:220
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NAMEN]|�berpr�fen der \"Trust\"-Datenbank"
 
-#: g10/g10.c:218
+#: g10/g10.c:221
 msgid "fix a corrupted trust database"
 msgstr "Reparieren einer besch�digten \"Trust\"-Datenbank"
 
-#: g10/g10.c:219
+#: g10/g10.c:222
 msgid "De-Armor a file or stdin"
 msgstr "Datei oder stdin von der ASCII-H�lle befreien"
 
-#: g10/g10.c:220
+#: g10/g10.c:223
 msgid "En-Armor a file or stdin"
 msgstr "Datei oder stdin in eine ASCII-H�lle einpacken"
 
-#: g10/g10.c:221
+#: g10/g10.c:224
 msgid "|algo [files]|print message digests"
 msgstr "|algo [Dateien]|Message-Digests f�r die Dateien ausgeben"
 
-#: g10/g10.c:225
+#: g10/g10.c:228
 msgid ""
 "@\n"
 "Options:\n"
@@ -423,171 +423,171 @@ msgstr ""
 "Optionen:\n"
 " "
 
-#: g10/g10.c:227
+#: g10/g10.c:230
 msgid "create ascii armored output"
 msgstr "Ausgabe mit ASCII-H�lle versehen"
 
-#: g10/g10.c:228
+#: g10/g10.c:231
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|Verschl�sseln f�r NAME"
 
-#: g10/g10.c:231
+#: g10/g10.c:234
 #, fuzzy
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAME|NAME als voreingestellten Schl�ssel benutzen"
 
-#: g10/g10.c:233
+#: g10/g10.c:236
 msgid "use the default key as default recipient"
 msgstr ""
 
-#: g10/g10.c:237
+#: g10/g10.c:240
 msgid "use this user-id to sign or decrypt"
 msgstr "Mit dieser User-ID signieren"
 
-#: g10/g10.c:238
+#: g10/g10.c:241
 msgid "|N|set compress level N (0 disables)"
 msgstr "Kompressionsstufe auf N setzen (0=keine Kompr.)"
 
-#: g10/g10.c:240
+#: g10/g10.c:243
 msgid "use canonical text mode"
 msgstr "Textmodus benutzen"
 
-#: g10/g10.c:241
+#: g10/g10.c:244
 msgid "use as output file"
 msgstr "Als Ausgabedatei benutzen"
 
-#: g10/g10.c:242
+#: g10/g10.c:245
 msgid "verbose"
 msgstr "Detaillierte Informationen"
 
-#: g10/g10.c:243
+#: g10/g10.c:246
 msgid "be somewhat more quiet"
 msgstr "Etwas weniger Infos"
 
-#: g10/g10.c:244
+#: g10/g10.c:247
 msgid "don't use the terminal at all"
 msgstr "das Terminal gar nicht benutzen"
 
-#: g10/g10.c:245
+#: g10/g10.c:248
 msgid "force v3 signatures"
 msgstr "v3 Signaturen erzwingen"
 
-#: g10/g10.c:246
+#: g10/g10.c:249
 msgid "always use a MDC for encryption"
 msgstr "Beim Verschl�sseln ein Siegel (MDC) verwenden"
 
-#: g10/g10.c:247
+#: g10/g10.c:250
 msgid "do not make any changes"
 msgstr "Keine wirklichen �nderungen durchf�hren"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:249
+#: g10/g10.c:252
 msgid "batch mode: never ask"
 msgstr "Stapelmodus: Keine Abfragen"
 
-#: g10/g10.c:250
+#: g10/g10.c:253
 msgid "assume yes on most questions"
 msgstr "\"Ja\" als Standardantwort annehmen"
 
-#: g10/g10.c:251
+#: g10/g10.c:254
 msgid "assume no on most questions"
 msgstr "\"Nein\" als Standardantwort annehmen"
 
-#: g10/g10.c:252
+#: g10/g10.c:255
 msgid "add this keyring to the list of keyrings"
 msgstr "Als �ffentlichen Schl�sselbund mitbenutzen"
 
-#: g10/g10.c:253
+#: g10/g10.c:256
 msgid "add this secret keyring to the list"
 msgstr "Als geheimen Schl�sselbund mitbenutzen"
 
-#: g10/g10.c:254
+#: g10/g10.c:257
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|NAME als voreingestellten Schl�ssel benutzen"
 
-#: g10/g10.c:255
+#: g10/g10.c:258
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|Schl�ssel bei diesem Server nachschlagen"
 
-#: g10/g10.c:256
+#: g10/g10.c:259
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAME|Terminalzeichensatz NAME benutzen"
 
-#: g10/g10.c:257
+#: g10/g10.c:260
 msgid "read options from file"
 msgstr "Optionen aus der Datei lesen"
 
-#: g10/g10.c:259
+#: g10/g10.c:262
 msgid "set debugging flags"
 msgstr "Debug-Flags einschalten"
 
-#: g10/g10.c:260
+#: g10/g10.c:263
 msgid "enable full debugging"
 msgstr "Alle Debug-Flags einschalten"
 
-#: g10/g10.c:261
+#: g10/g10.c:264
 msgid "|FD|write status info to this FD"
 msgstr "|FD|Statusinfo auf FD (Dateihandle) ausgeben"
 
-#: g10/g10.c:262
+#: g10/g10.c:265
 msgid "do not write comment packets"
 msgstr "Keine Kommentarpakete schreiben"
 
-#: g10/g10.c:263
+#: g10/g10.c:266
 msgid "(default is 1)"
 msgstr "Ben�tigte Vollvertrauen (Voreinstellung 1)"
 
-#: g10/g10.c:264
+#: g10/g10.c:267
 msgid "(default is 3)"
 msgstr "Ben�tigte Teilvertrauen (Voreinstellung 3)"
 
-#: g10/g10.c:266
+#: g10/g10.c:269
 msgid "|FILE|load extension module FILE"
 msgstr "|DATEI|Erweiterungsmodul DATEI laden"
 
-#: g10/g10.c:267
+#: g10/g10.c:270
 msgid "emulate the mode described in RFC1991"
 msgstr "Den in RFC1991 beschriebenen Modus nachahmen"
 
-#: g10/g10.c:268
+#: g10/g10.c:271
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 "alle Paket-, Verschl�sselungs- und Hashoptionen auf OpenPGP-Verhalten "
 "einstellen"
 
-#: g10/g10.c:269
+#: g10/g10.c:272
 msgid "|N|use passphrase mode N"
 msgstr "|N|Verwenden des Mantra-Modus N"
 
-#: g10/g10.c:271
+#: g10/g10.c:274
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAME|Das Hashverfahren NAME f�r Mantras benutzen"
 
-#: g10/g10.c:273
+#: g10/g10.c:276
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAME|Das Verschl�.verfahren NAME f�r Mantras benutzen"
 
-#: g10/g10.c:274
+#: g10/g10.c:277
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|Das Verschl�.verfahren NAME benutzen"
 
-#: g10/g10.c:275
+#: g10/g10.c:278
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|Das Hashverfahren NAME benutzen"
 
-#: g10/g10.c:276
+#: g10/g10.c:279
 msgid "|N|use compress algorithm N"
 msgstr "|N|Die Komprimierverfahren N benutzen"
 
-#: g10/g10.c:277
+#: g10/g10.c:280
 msgid "throw keyid field of encrypted packets"
 msgstr "Entferne die Absender-ID verschl�sselter Pakete"
 
-#: g10/g10.c:278
+#: g10/g10.c:281
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NAME=WERT|verwende diese \"notation\"-Daten"
 
-#: g10/g10.c:280
+#: g10/g10.c:283
 msgid ""
 "@\n"
 "Examples:\n"
@@ -607,15 +607,15 @@ msgstr ""
 " --list-keys [Namen]        Schl�ssel anzeigen\n"
 " --fingerprint [Namen]      \"Fingerabdr�cke\" anzeigen\n"
 
-#: g10/g10.c:360
+#: g10/g10.c:366
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Berichte �ber Bugs (Programmfehler) bitte an <[email protected]>.\n"
 
-#: g10/g10.c:364
+#: g10/g10.c:370
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Aufruf: gpg [Optionen] [Dateien] (-h f�r Hilfe)"
 
-#: g10/g10.c:367
+#: g10/g10.c:373
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -625,7 +625,7 @@ msgstr ""
 "Signieren, pr�fen, verschl�sseln, entschl�sseln\n"
 "Die voreingestellte Operation ist abh�ngig von den Eingabedaten\n"
 
-#: g10/g10.c:372
+#: g10/g10.c:378
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -633,173 +633,173 @@ msgstr ""
 "\n"
 "Unterst�tzte Verfahren:\n"
 
-#: g10/g10.c:446
+#: g10/g10.c:452
 msgid "usage: gpg [options] "
 msgstr "Aufruf: gpg [Optionen] "
 
-#: g10/g10.c:499
+#: g10/g10.c:505
 msgid "conflicting commands\n"
 msgstr "Widerspr�chliche Befehle\n"
 
-#: g10/g10.c:633
+#: g10/g10.c:640
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n"
 
-#: g10/g10.c:637
+#: g10/g10.c:644
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "Optionendatei '%s': %s\n"
 
-#: g10/g10.c:644
+#: g10/g10.c:651
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Optionen werden aus '%s' gelesen\n"
 
-#: g10/g10.c:824
+#: g10/g10.c:831
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s ist kein g�ltiger Zeichensatz.\n"
 
-#: g10/g10.c:872 g10/g10.c:884
+#: g10/g10.c:895 g10/g10.c:907
 msgid "selected cipher algorithm is invalid\n"
 msgstr "Das ausgew�hlte Verschl�sslungsverfahren ist ung�ltig\n"
 
-#: g10/g10.c:878 g10/g10.c:890
+#: g10/g10.c:901 g10/g10.c:913
 msgid "selected digest algorithm is invalid\n"
 msgstr "Das ausgew�hlte Hashverfahren ist ung�ltig\n"
 
-#: g10/g10.c:894
+#: g10/g10.c:917
 msgid "the given policy URL is invalid\n"
 msgstr "Die angegebene URL f�r Richtlinien ist ung�ltig\n"
 
-#: g10/g10.c:897
+#: g10/g10.c:920
 #, 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:899
+#: g10/g10.c:922
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed m�ssen gr��er als 0 sein\n"
 
-#: g10/g10.c:901
+#: g10/g10.c:924
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed m�ssen gr��er als 1 sein\n"
 
-#: g10/g10.c:903
+#: g10/g10.c:926
 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:906
+#: g10/g10.c:929
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n"
 
-#: g10/g10.c:910
+#: g10/g10.c:933
 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:987
+#: g10/g10.c:1010
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
 
-#: g10/g10.c:993
+#: g10/g10.c:1016
 msgid "--store [filename]"
 msgstr "--store [Dateiname]"
 
-#: g10/g10.c:1000
+#: g10/g10.c:1023
 msgid "--symmetric [filename]"
 msgstr "--symmetric [Dateiname]"
 
-#: g10/g10.c:1008
+#: g10/g10.c:1031
 msgid "--encrypt [filename]"
 msgstr "--encrypt [Dateiname]"
 
-#: g10/g10.c:1021
+#: g10/g10.c:1044
 msgid "--sign [filename]"
 msgstr "--sign [Dateiname]"
 
-#: g10/g10.c:1034
+#: g10/g10.c:1057
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [Dateiname]"
 
-#: g10/g10.c:1048
+#: g10/g10.c:1071
 msgid "--clearsign [filename]"
 msgstr "--clearsign [Dateiname]"
 
-#: g10/g10.c:1060
+#: g10/g10.c:1083
 msgid "--decrypt [filename]"
 msgstr "--decrypt [Dateiname]"
 
-#: g10/g10.c:1068
+#: g10/g10.c:1091
 msgid "--sign-key user-id"
 msgstr ""
 
-#: g10/g10.c:1076
+#: g10/g10.c:1099
 #, fuzzy
 msgid "--lsign-key user-id"
 msgstr "--delete-key Benutzername"
 
-#: g10/g10.c:1084
+#: g10/g10.c:1107
 #, fuzzy
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key Username [Befehle]"
 
-#: g10/g10.c:1100
+#: g10/g10.c:1123
 #, fuzzy
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key Username"
 
-#: g10/g10.c:1103
+#: g10/g10.c:1126
 #, fuzzy
 msgid "--delete-key user-id"
 msgstr "--delete-key Benutzername"
 
-#: g10/encode.c:231 g10/g10.c:1127 g10/sign.c:366
+#: g10/encode.c:231 g10/g10.c:1150 g10/sign.c:366
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "'%s' kann nicht ge�ffnet werden: %s\n"
 
-#: g10/g10.c:1138
+#: g10/g10.c:1161
 msgid "-k[v][v][v][c] [userid] [keyring]"
 msgstr "-k[v][v][v][c] [Benutzername] [Keyring]"
 
-#: g10/g10.c:1199
+#: g10/g10.c:1222
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "Entfernen der ASCII-H�lle ist fehlgeschlagen: %s\n"
 
-#: g10/g10.c:1207
+#: g10/g10.c:1230
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "Anbringen der ASCII-H�lle ist fehlgeschlagen: %s\n"
 
-#: g10/g10.c:1275
+#: g10/g10.c:1298
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "Ung�ltiges Hashverfahren '%s'\n"
 
-#: g10/g10.c:1356
+#: g10/g10.c:1379
 msgid "[filename]"
 msgstr "[Dateiname]"
 
-#: g10/g10.c:1360
+#: g10/g10.c:1383
 msgid "Go ahead and type your message ...\n"
 msgstr "Auf geht's - Botschaft eintippen ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1363 g10/verify.c:66
+#: g10/decrypt.c:59 g10/g10.c:1386 g10/verify.c:66
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "'%s' kann nicht ge�ffnet werden\n"
 
-#: g10/g10.c:1532
+#: g10/g10.c:1555
 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:1538
+#: g10/g10.c:1561
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -807,12 +807,12 @@ msgstr ""
 "Ein \"notation\"-Name darf nur Buchstaben, Zahlen, Punkte oder Unterstriche "
 "enthalten und mu� mit einem '=' enden\n"
 
-#: g10/g10.c:1544
+#: g10/g10.c:1567
 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:1552
+#: g10/g10.c:1575
 msgid "a notation value must not use any control characters\n"
 msgstr "Ein \"notation\"-Wert darf keine Kontrollzeichen verwenden\n"
 
@@ -891,13 +891,20 @@ msgstr ""
 "\"quoted printable\" Zeichen in der ASCII-H�lle gefunden - m�glicherweise\n"
 " war ein fehlerhafter E-Mail-Transporter(\"MTA\") die Ursache\n"
 
+#. Translators: this shoud fit into 24 bytes to that the fingerprint
+#. * data is properly aligned with the user ID
+#: g10/pkclist.c:53
+#, fuzzy
+msgid "             Fingerprint:"
+msgstr "           importiert: %lu"
+
 # valid user replies (not including 1..4)
 #. a string with valid answers
-#: g10/pkclist.c:140
+#: g10/pkclist.c:170
 msgid "sSmMqQ"
 msgstr "sSmMqQ"
 
-#: g10/pkclist.c:144
+#: g10/pkclist.c:174
 #, c-format
 msgid ""
 "No trust value assigned to %lu:\n"
@@ -906,7 +913,7 @@ msgstr ""
 "Es ist kein \"Owner trust\" f�r %lu definiert:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:154
+#: g10/pkclist.c:186
 msgid ""
 "Please decide how far you trust this user to correctly\n"
 "verify other users' keys (by looking at passports,\n"
@@ -929,23 +936,23 @@ msgstr ""
 " 4 = Ich vertraue ihm vollst�ndig\n"
 " s = Bitte weitere Information anzeigen\n"
 
-#: g10/pkclist.c:163
+#: g10/pkclist.c:195
 msgid " m = back to the main menu\n"
 msgstr " m = Zur�ck zum Men�\n"
 
-#: g10/pkclist.c:165
+#: g10/pkclist.c:197
 msgid " q = quit\n"
 msgstr " q = verlassen\n"
 
-#: g10/pkclist.c:171
+#: g10/pkclist.c:203
 msgid "Your decision? "
 msgstr "Ihre Auswahl? "
 
-#: g10/pkclist.c:193
+#: g10/pkclist.c:225
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Zertifikate f�hren zu einem letztlich vertrauensw�rdigen Schl�ssel:\n"
 
-#: g10/pkclist.c:264
+#: g10/pkclist.c:296
 msgid ""
 "Could not find a valid trust path to the key.  Let's see whether we\n"
 "can assign some missing owner trust values.\n"
@@ -956,7 +963,7 @@ msgstr ""
 "ermitteln k�nnen.\n"
 "\n"
 
-#: g10/pkclist.c:270
+#: g10/pkclist.c:302
 msgid ""
 "No path leading to one of our keys found.\n"
 "\n"
@@ -964,7 +971,7 @@ msgstr ""
 "Kein Pfad f�hrt zu einen unserer Schl�sseln.\n"
 "\n"
 
-#: g10/pkclist.c:272
+#: g10/pkclist.c:304
 msgid ""
 "No certificates with undefined trust found.\n"
 "\n"
@@ -972,7 +979,7 @@ msgstr ""
 "Keine Zertifikate mit undefinierten Vertrauen gefunden.\n"
 "\n"
 
-#: g10/pkclist.c:274
+#: g10/pkclist.c:306
 msgid ""
 "No trust values changed.\n"
 "\n"
@@ -980,38 +987,38 @@ msgstr ""
 "Keine \"trust\" Werte ge�ndert.\n"
 "\n"
 
-#: g10/pkclist.c:291
+#: g10/pkclist.c:323
 #, c-format
 msgid "key %08lX: key has been revoked!\n"
 msgstr "Schl�ssel %08lX: Schl�ssel wurde widerrufen\n"
 
-#: g10/pkclist.c:297 g10/pkclist.c:307 g10/pkclist.c:413
+#: g10/pkclist.c:329 g10/pkclist.c:339 g10/pkclist.c:448
 msgid "Use this key anyway? "
 msgstr "Diesen Schl�ssel trotzdem benutzen?"
 
-#: g10/pkclist.c:301
+#: g10/pkclist.c:333
 #, c-format
 msgid "key %08lX: subkey has been revoked!\n"
 msgstr "Schl�ssel %08lX: Unterschl�ssel wurde widerrufen\n"
 
-#: g10/pkclist.c:331
+#: g10/pkclist.c:363
 #, c-format
 msgid "%08lX: key has expired\n"
 msgstr "%08lX: Schl�ssel ist verfallen!\n"
 
-#: g10/pkclist.c:337
+#: g10/pkclist.c:369
 #, c-format
 msgid "%08lX: no info to calculate a trust probability\n"
 msgstr ""
 "%08lX: Keine Infos zur Berechnung der Vertrauenswahrscheinlichkeit "
 "vorgefunden\n"
 
-#: g10/pkclist.c:351
+#: g10/pkclist.c:383
 #, c-format
 msgid "%08lX: We do NOT trust this key\n"
 msgstr "%08lX: Wir haben KEIN Vertrauen zu diesem Schl�ssel!\n"
 
-#: g10/pkclist.c:357
+#: g10/pkclist.c:389
 #, c-format
 msgid ""
 "%08lX: It is not sure that this key really belongs to the owner\n"
@@ -1020,18 +1027,18 @@ msgstr ""
 "%08lX: Es ist nicht sicher, da� dieser Schl�ssel wirklich dem vorgeblichen\n"
 "Besitzer geh�rt, aber er wird trotzdem akzeptiert\n"
 
-#: g10/pkclist.c:363
+#: g10/pkclist.c:395
 msgid "This key probably belongs to the owner\n"
 msgstr ""
 "Dieser Schl�ssel geh�rt h�chstwahrscheinlich dem angegebenen Besitzer\n"
 
-#: g10/pkclist.c:368
+#: g10/pkclist.c:400
 msgid "This key belongs to us\n"
 msgstr ""
 "Dieser Schl�ssel geh�rt uns (da wir n�mlich den geheimen Schl�ssel dazu "
 "haben)\n"
 
-#: g10/pkclist.c:408
+#: g10/pkclist.c:443
 msgid ""
 "It is NOT certain that the key belongs to its owner.\n"
 "If you *really* know what you are doing, you may answer\n"
@@ -1042,69 +1049,69 @@ msgstr ""
 "Wenn Sie *wirklich* wissen, was Sie tun, k�nnen Sie die n�chste\n"
 "Frage mit ja beantworten\n"
 
-#: g10/pkclist.c:421 g10/pkclist.c:443
+#: g10/pkclist.c:456 g10/pkclist.c:478
 msgid "WARNING: Using untrusted key!\n"
 msgstr "WARNUNG: Ein Schl�ssel ohne gesichertes Vertrauen wird benutzt!\n"
 
-#: g10/pkclist.c:464
+#: g10/pkclist.c:499
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "WARNUNG: Dieser Schl�ssel wurde von seinem Besitzer widerrufen!\n"
 
-#: g10/pkclist.c:465
+#: g10/pkclist.c:500
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "         Das k�nnte bedeuten, da� die Signatur gef�lscht ist.\n"
 
-#: g10/pkclist.c:469
+#: g10/pkclist.c:504
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "WARNUNG: Dieser Unterschl�ssel wurde von seinem Besitzer widerrufen!\n"
 
-#: g10/pkclist.c:490
+#: g10/pkclist.c:525
 msgid "Note: This key has expired!\n"
 msgstr "Hinweis: Dieser Schl�ssel ist verfallen!\n"
 
-#: g10/pkclist.c:497
+#: g10/pkclist.c:532
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "WARNUNG: Dieser Schl�ssel tr�gt keine vertrauensw�rdige Signatur!\n"
 
-#: g10/pkclist.c:499
+#: g10/pkclist.c:534
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         Es gibt keinen Hinweis, da� die Signatur wirklich dem vorgeblichen "
 "Besitzer geh�rt.\n"
 
-#: g10/pkclist.c:515
+#: g10/pkclist.c:550
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "WARNUNG: Wir haben KEIN Vertrauen zu diesem Schl�ssel!\n"
 
-#: g10/pkclist.c:516
+#: g10/pkclist.c:551
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Die Signatur ist wahrscheinlich eine F�LSCHUNG.\n"
 
-#: g10/pkclist.c:523
+#: g10/pkclist.c:558
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "WARNUNG: Dieser Schl�ssel ist nicht durch hinreichend vertrauensw�rdige "
 "Signaturen zertifiziert!\n"
 
-#: g10/pkclist.c:526
+#: g10/pkclist.c:561
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr ""
 "         Es ist nicht sicher, da� die Signatur wirklich dem vorgeblichen "
 "Besitzer geh�rt.\n"
 
-#: g10/pkclist.c:627 g10/pkclist.c:649 g10/pkclist.c:758 g10/pkclist.c:803
+#: g10/pkclist.c:662 g10/pkclist.c:684 g10/pkclist.c:793 g10/pkclist.c:838
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: �bersprungen: %s\n"
 
-#: g10/pkclist.c:635 g10/pkclist.c:785
+#: g10/pkclist.c:670 g10/pkclist.c:820
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: �bersprungen: �ffentlicher Schl�ssel bereits vorhanden\n"
 
-#: g10/pkclist.c:662
+#: g10/pkclist.c:697
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1112,34 +1119,34 @@ msgstr ""
 "Sie gaben keine User-ID angegeben (Benutzen Sie die Option \"-r\").\n"
 "\n"
 
-#: g10/pkclist.c:672
+#: g10/pkclist.c:707
 msgid "Enter the user ID: "
 msgstr "Geben Sie die User-ID ein: "
 
-#: g10/pkclist.c:684
+#: g10/pkclist.c:719
 msgid "No such user ID.\n"
 msgstr "Keine solche User-ID vorhanden.\n"
 
-#: g10/pkclist.c:704
+#: g10/pkclist.c:739
 #, fuzzy
 msgid "Public key is disabled.\n"
 msgstr "�ffentlicher Schl�ssel ist %08lX\n"
 
-#: g10/pkclist.c:733
+#: g10/pkclist.c:768
 msgid "unknown default recipient `s'\n"
 msgstr ""
 
-#: g10/pkclist.c:766
+#: g10/pkclist.c:801
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: Fehler beim Pr�fen des Schl�ssels: %s\n"
 
-#: g10/pkclist.c:771
+#: g10/pkclist.c:806
 #, fuzzy, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: �bersprungen: �ffentlicher Schl�ssel bereits vorhanden\n"
 
-#: g10/pkclist.c:809
+#: g10/pkclist.c:844
 msgid "no valid addressees\n"
 msgstr "Keine g�ltigen Adressaten\n"
 
@@ -1526,247 +1533,252 @@ msgstr "zu viele Eintr�ge im pk-Lager - abgeschaltet\n"
 msgid "too many entries in unk cache - disabled\n"
 msgstr "zu viele Eintr�ge im unk-Lager - abgeschaltet\n"
 
-#: g10/getkey.c:1535 g10/getkey.c:1591
+#: g10/getkey.c:1565 g10/getkey.c:1621
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr ""
 "der Zweitschl�ssel %08lX wird anstelle des Hauptschl�ssels %08lX verwendet\n"
 
-#: g10/import.c:117
+#: g10/import.c:118
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "'%s' kann nicht ge�ffnet werden: %s\n"
 
-#: g10/import.c:161
+#: g10/import.c:162
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "�berspringe den Block vom Typ %d\n"
 
-#: g10/import.c:168 g10/trustdb.c:1658 g10/trustdb.c:1697
+#: g10/import.c:169 g10/trustdb.c:1658 g10/trustdb.c:1697
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu Schl�ssel bislang bearbeitet\n"
 
-#: g10/import.c:173
+#: g10/import.c:174
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "Fehler beim Lesen von `%s': %s\n"
 
-#: g10/import.c:176
+#: g10/import.c:177
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Anzahl insgesamt bearbeiteter Schl�ssel: %lu\n"
 
-#: g10/import.c:178
+#: g10/import.c:179
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         ohne User-ID: %lu\n"
 
-#: g10/import.c:180
+#: g10/import.c:181
 #, c-format
 msgid "              imported: %lu"
 msgstr "           importiert: %lu"
 
-#: g10/import.c:186
+#: g10/import.c:187
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "          unver�ndert: %lu\n"
 
-#: g10/import.c:188
+#: g10/import.c:189
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "        neue User-IDs: %lu\n"
 
-#: g10/import.c:190
+#: g10/import.c:191
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "  neue Unterschl�ssel: %lu\n"
 
-#: g10/import.c:192
+#: g10/import.c:193
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        neue Signaturen: %lu\n"
 
-#: g10/import.c:194
+#: g10/import.c:195
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "neue Schl�sselwiderrufe: %lu\n"
 
-#: g10/import.c:196
+#: g10/import.c:197
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr " gelesene geheime Schl.: %lu\n"
 
-#: g10/import.c:198
+#: g10/import.c:199
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "geheime Schl�ssel importiert: %lu\n"
 
-#: g10/import.c:200
+#: g10/import.c:201
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " unver�nderte geh.Schl.: %lu\n"
 
-#: g10/import.c:361 g10/import.c:550
+#: g10/import.c:362 g10/import.c:554
 #, c-format
 msgid "key %08lX: no user id\n"
 msgstr "Schl�ssel %08lX: Keine User-ID\n"
 
-#: g10/import.c:372
+#: g10/import.c:376
 #, c-format
 msgid "key %08lX: no valid user ids\n"
 msgstr "Schl�ssel %08lX: Keine g�ltigen User-IDs\n"
 
-#: g10/import.c:374
+#: g10/import.c:378
 msgid "this may be caused by a missing self-signature\n"
 msgstr "dies k�nnte durch fehlende Eigenbeglaubigung verursacht worden sein\n"
 
-#: g10/import.c:385 g10/import.c:617
+#: g10/import.c:389 g10/import.c:621
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "Schl�ssel %08lX: �ffentlicher Schl�ssel nicht gefunden: %s\n"
 
-#: g10/import.c:391
+#: g10/import.c:395
 msgid "no default public keyring\n"
 msgstr "Kein voreingestellter �ffentlicher Schl�sselbund\n"
 
-#: g10/import.c:395 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:559
+#: g10/import.c:399 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:559
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "Schreiben nach '%s'\n"
 
-#: g10/import.c:398 g10/import.c:456 g10/import.c:565 g10/import.c:666
+#: g10/import.c:402 g10/import.c:460 g10/import.c:569 g10/import.c:670
 #, c-format
 msgid "can't lock keyring `%s': %s\n"
 msgstr "kann Schl�sselbund `%s' nicht sperren: %s\n"
 
-#: g10/import.c:401 g10/import.c:459 g10/import.c:568 g10/import.c:669
+#: g10/import.c:405 g10/import.c:463 g10/import.c:572 g10/import.c:673
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "Fehler beim Schreiben des Schl�sselbundes `%s': %s\n"
 
-#: g10/import.c:406
+#: g10/import.c:410
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "Schl�ssel %08lX: �ffentlicher Schl�ssel importiert\n"
 
-#: g10/import.c:423
+#: g10/import.c:427
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "Schl�ssel %08lX: Stimmt nicht mit unserer Kopie �berein\n"
 
-#: g10/import.c:432 g10/import.c:625
+#: g10/import.c:436 g10/import.c:629
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr ""
 "Schl�ssel %08lX: der lokale originale Schl�sselblocks wurde nicht gefunden: "
 "%s\n"
 
-#: g10/import.c:438 g10/import.c:631
+#: g10/import.c:442 g10/import.c:635
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr ""
 "Schl�ssel %08lX: Lesefehler im lokalen originalen Schl�sselblocks: %s\n"
 
-#: g10/import.c:465
+#: g10/import.c:469
 #, c-format
 msgid "key %08lX: 1 new user-id\n"
 msgstr "Schl�ssel %08lX: 1 neue User-ID\n"
 
-#: g10/import.c:468
+#: g10/import.c:472
 #, c-format
 msgid "key %08lX: %d new user-ids\n"
 msgstr "Schl�ssel %08lX: %d neue User-IDs\n"
 
-#: g10/import.c:471
+#: g10/import.c:475
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "Schl�ssel %08lX: 1 neue Signatur\n"
 
-#: g10/import.c:474
+#: g10/import.c:478
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "Schl�ssel %08lX: %d neue Signaturen\n"
 
-#: g10/import.c:477
+#: g10/import.c:481
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "Schl�ssel %08lX: 1 neuer Unterschl�ssel\n"
 
-#: g10/import.c:480
+#: g10/import.c:484
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "Schl�ssel %08lX: %d neue Unterschl�ssel\n"
 
-#: g10/import.c:490
+#: g10/import.c:494
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "Schl�ssel %08lX: Nicht ge�ndert\n"
 
-#: g10/import.c:573
+#: g10/import.c:577
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "Schl�ssel %08lX: Geheimer Schl�ssel importiert\n"
 
 #. we can't merge secret keys
-#: g10/import.c:577
+#: g10/import.c:581
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "Schl�ssel %08lX: Ist bereits im geheimen Schl�sselbund\n"
 
-#: g10/import.c:582
+#: g10/import.c:586
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "Schl�ssel %08lX: geheimer Schl�ssel nicht gefunden: %s\n"
 
-#: g10/import.c:611
+#: g10/import.c:615
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "Schl�ssel %08lX: Kein �ffentlicher Schl�ssel - der Schl�sselwiderruf kann "
 "nicht angebracht werden\n"
 
-#: g10/import.c:642
+#: g10/import.c:646
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "Schl�ssel %08lX: Ung�ltiges Widerrufzertifikat: %s - zur�ckgewiesen\n"
 
-#: g10/import.c:674
+#: g10/import.c:678
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "Schl�ssel %08lX: Widerrufzertifikat importiert\n"
 
-#: g10/import.c:707
+#: g10/import.c:711
 #, c-format
 msgid "key %08lX: no user-id for signature\n"
 msgstr "Schl�ssel %08lX: Keine User-ID f�r Signatur\n"
 
-#: g10/import.c:714 g10/import.c:738
+#: g10/import.c:718 g10/import.c:742
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "Schl�ssel %08lX: Nicht unterst�tzetes Public-Key-Verfahren\n"
 
-#: g10/import.c:715
+#: g10/import.c:719
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "Schl�ssel %08lX: Ung�ltige Eigenbeglaubigung\n"
 
-#: g10/import.c:730
+#: g10/import.c:734
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "Schl�ssel %08lX: Kein Unterschl�ssel f�r die Schl�sselanbindung\n"
 
-#: g10/import.c:739
+#: g10/import.c:743
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "Schl�ssel %08lX: Ung�ltige Unterschl�ssel-Anbindung\n"
 
-#: g10/import.c:771
+#: g10/import.c:769
+#, fuzzy, c-format
+msgid "key %08lX: accepted non self-signed userid '"
+msgstr "Schl�ssel %08lX: �bergehe User-ID '"
+
+#: g10/import.c:798
 #, c-format
 msgid "key %08lX: skipped userid '"
 msgstr "Schl�ssel %08lX: �bergehe User-ID '"
 
-#: g10/import.c:794
+#: g10/import.c:821
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "Schl�ssel %08lX: Unterschl�ssel ignoriert\n"
@@ -1775,32 +1787,32 @@ msgstr "Schl�ssel %08lX: Unterschl�ssel ignoriert\n"
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:819
+#: g10/import.c:846
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "Schl�ssel %08lX: Nicht exportf�hige Unterschrift - �bergangen\n"
 
-#: g10/import.c:828
+#: g10/import.c:855
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "Schl�ssel %08lX: Widerrufzertifikat an falschem Platz - �bergangen\n"
 
-#: g10/import.c:836
+#: g10/import.c:863
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "Schl�ssel %08lX: Ung�ltiges Widerrufzertifikat: %s - �bergangen\n"
 
-#: g10/import.c:936
+#: g10/import.c:963
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "Schl�ssel %08lX: Doppelte User-ID entdeckt - zusammengef�hrt\n"
 
-#: g10/import.c:987
+#: g10/import.c:1014
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "Schl�ssel %08lX: Widerrufzertifikat hinzugef�gt\n"
 
-#: g10/import.c:1100 g10/import.c:1155
+#: g10/import.c:1127 g10/import.c:1182
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "Schl�ssel %08lX: Unsere Kopie hat keine Eigenbeglaubigung\n"
@@ -2352,79 +2364,79 @@ msgstr "Unterschrift vom %.*s, %s Schl�ssel ID %08lX\n"
 msgid "no secret key for decryption available\n"
 msgstr "Geheimer Schl�ssel ist nicht vorhanden"
 
-#: g10/mainproc.c:293
+#: g10/mainproc.c:300
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "Entschl�sselung mit �ffentlichem Schl�ssel fehlgeschlagen: %s\n"
 
-#: g10/mainproc.c:323
+#: g10/mainproc.c:330
 msgid "decryption okay\n"
 msgstr "Enschl�sselung fehlgeschlagen: %s\n"
 
-#: g10/mainproc.c:328
+#: g10/mainproc.c:335
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "Warnung: Verschl�sselte Botschaft ist manipuliert worden!\n"
 
-#: g10/mainproc.c:333
+#: g10/mainproc.c:340
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "Enschl�sselung fehlgeschlagen: %s\n"
 
-#: g10/mainproc.c:351
+#: g10/mainproc.c:358
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr ""
 "Hinweis: Der Absender verlangte Vertraulichkeit(\"for-your-eyes-only\")\n"
 
-#: g10/mainproc.c:353
+#: g10/mainproc.c:360
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "Urspr�nglicher Dateiname='%.*s'\n"
 
-#: g10/mainproc.c:580 g10/mainproc.c:589
+#: g10/mainproc.c:587 g10/mainproc.c:596
 msgid "WARNING: invalid notation data found\n"
 msgstr "WARNUNG: Ung�ltige \"Notation\"-Daten gefunden\n"
 
-#: g10/mainproc.c:592
+#: g10/mainproc.c:599
 msgid "Notation: "
 msgstr "\"Notation\": "
 
-#: g10/mainproc.c:599
+#: g10/mainproc.c:606
 msgid "Policy: "
 msgstr "Richtlinie: "
 
-#: g10/mainproc.c:1018
+#: g10/mainproc.c:1025
 msgid "signature verification suppressed\n"
 msgstr "Unterschriften-�berpr�fung unterdr�ckt\n"
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen mu� "ID" rein :-(
-#: g10/mainproc.c:1024
+#: g10/mainproc.c:1031
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Unterschrift vom %.*s, %s Schl�ssel ID %08lX\n"
 
 #. just in case that we have no userid
-#: g10/mainproc.c:1050 g10/mainproc.c:1061
+#: g10/mainproc.c:1057 g10/mainproc.c:1068
 msgid "BAD signature from \""
 msgstr "FALSCHE Unterschrift von \""
 
-#: g10/mainproc.c:1051 g10/mainproc.c:1062
+#: g10/mainproc.c:1058 g10/mainproc.c:1069
 msgid "Good signature from \""
 msgstr "Korrekte Unterschrift von \""
 
-#: g10/mainproc.c:1053
+#: g10/mainproc.c:1060
 msgid "                aka \""
 msgstr "                    alias \""
 
-#: g10/mainproc.c:1104
+#: g10/mainproc.c:1115
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Unterschrift kann nicht gepr�ft werden: %s\n"
 
-#: g10/mainproc.c:1198
+#: g10/mainproc.c:1209
 msgid "old style (PGP 2.x) signature\n"
 msgstr "Unterschrift nach alter (PGP 2.x) Art\n"
 
-#: g10/mainproc.c:1203
+#: g10/mainproc.c:1214
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "ung�ltiges root-Paket in proc_tree() entdeckt\n"
 
@@ -2647,7 +2659,7 @@ msgstr "%s: Verzeichnis erzeugt\n"
 msgid "%s: directory does not exist!\n"
 msgstr "%s: Verzeichnis existiert nicht!\n"
 
-#: g10/openfile.c:182 g10/openfile.c:253 g10/ringedit.c:1344 g10/tdbio.c:457
+#: g10/openfile.c:182 g10/openfile.c:253 g10/ringedit.c:1346 g10/tdbio.c:457
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: kann nicht erzeugt werden: %s\n"
@@ -3043,26 +3055,26 @@ msgstr "WARNUNG: Lange 'Pref'-Records k�nnen noch nicht benutzt werden\n"
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s: Schl�sselbund kann nicht erzeugt werden: %s\n"
 
-#: g10/ringedit.c:333 g10/ringedit.c:1349
+#: g10/ringedit.c:333 g10/ringedit.c:1351
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: Schl�sselbund erstellt\n"
 
-#: g10/ringedit.c:1526
+#: g10/ringedit.c:1528
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "Warnung: Zwei Dateien mit vertraulichem Inhalt vorhanden.\n"
 
-#: g10/ringedit.c:1527
+#: g10/ringedit.c:1529
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s ist der Unver�nderte\n"
 
-#: g10/ringedit.c:1528
+#: g10/ringedit.c:1530
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s ist der Neue\n"
 
-#: g10/ringedit.c:1529
+#: g10/ringedit.c:1531
 msgid "Please fix this possible security flaw\n"
 msgstr "Bitte diesen potentiellen Sicherheitsmangel beseitigen\n"
 
diff --git a/po/es_ES.po b/po/es_ES.po
index f4bf992bf..46a101da0 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -7,7 +7,7 @@
 # GPG version: 0.9.7
 msgid ""
 msgstr ""
-"POT-Creation-Date: 1999-07-14 11:47+0200\n"
+"POT-Creation-Date: 1999-07-23 12:13+0200\n"
 "PO-Revision-Date: 1999-06-06 18:33+0200\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Date: 1998-11-13 10:49:25+0100\n"
@@ -283,7 +283,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:180
+#: g10/g10.c:183
 msgid ""
 "@Commands:\n"
 " "
@@ -291,138 +291,138 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/g10.c:182
+#: g10/g10.c:185
 msgid "|[file]|make a signature"
 msgstr "|[file]|hace una firma"
 
-#: g10/g10.c:183
+#: g10/g10.c:186
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|hace una firma en texto claro"
 
-#: g10/g10.c:184
+#: g10/g10.c:187
 msgid "make a detached signature"
 msgstr "hace una firma separada"
 
-#: g10/g10.c:185
+#: g10/g10.c:188
 msgid "encrypt data"
 msgstr "cifra datos"
 
-#: g10/g10.c:186
+#: g10/g10.c:189
 msgid "encryption only with symmetric cipher"
 msgstr "cifra s�lo con un cifrado sim�trico"
 
-#: g10/g10.c:187
+#: g10/g10.c:190
 msgid "store only"
 msgstr "s�lo almacenar"
 
-#: g10/g10.c:188
+#: g10/g10.c:191
 msgid "decrypt data (default)"
 msgstr "descifra datos (predefinido)"
 
-#: g10/g10.c:189
+#: g10/g10.c:192
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/g10.c:190
+#: g10/g10.c:193
 msgid "list keys"
 msgstr "lista claves"
 
-#: g10/g10.c:192
+#: g10/g10.c:195
 msgid "list keys and signatures"
 msgstr "lista claves y firmas"
 
-#: g10/g10.c:193
+#: g10/g10.c:196
 msgid "check key signatures"
 msgstr "comprueba las firmas de las claves"
 
-#: g10/g10.c:194
+#: g10/g10.c:197
 msgid "list keys and fingerprints"
 msgstr "lista claves y huellas dactilares"
 
-#: g10/g10.c:195
+#: g10/g10.c:198
 msgid "list secret keys"
 msgstr "lista claves secretas"
 
-#: g10/g10.c:196
+#: g10/g10.c:199
 msgid "generate a new key pair"
 msgstr "genera un nuevo par de claves"
 
-#: g10/g10.c:197
+#: g10/g10.c:200
 msgid "remove key from the public keyring"
 msgstr "elimina la clave del anillo p�blico"
 
-#: g10/g10.c:198
+#: g10/g10.c:201
 #, fuzzy
 msgid "sign a key"
 msgstr "firma la clave"
 
-#: g10/g10.c:199
+#: g10/g10.c:202
 #, fuzzy
 msgid "sign a key locally"
 msgstr "firma la clave localmente"
 
-#: g10/g10.c:200
+#: g10/g10.c:203
 msgid "sign or edit a key"
 msgstr "firma o modifica una clave"
 
-#: g10/g10.c:201
+#: g10/g10.c:204
 msgid "generate a revocation certificate"
 msgstr "genera un certificado de revocaci�n"
 
-#: g10/g10.c:202
+#: g10/g10.c:205
 msgid "export keys"
 msgstr "exporta claves"
 
-#: g10/g10.c:203
+#: g10/g10.c:206
 msgid "export keys to a key server"
 msgstr "exporta claves a un servidor de claves"
 
-#: g10/g10.c:204
+#: g10/g10.c:207
 msgid "import keys from a key server"
 msgstr "importa claves desde un servidor de claves"
 
-#: g10/g10.c:207
+#: g10/g10.c:210
 msgid "import/merge keys"
 msgstr "importa/fusiona claves"
 
-#: g10/g10.c:209
+#: g10/g10.c:212
 msgid "list only the sequence of packets"
 msgstr "lista s�lo la secuencia de paquetes"
 
-#: g10/g10.c:211
+#: g10/g10.c:214
 msgid "export the ownertrust values"
 msgstr "exporta los valores de confianza"
 
-#: g10/g10.c:213
+#: g10/g10.c:216
 msgid "import ownertrust values"
 msgstr "importa los valores de confianza"
 
-#: g10/g10.c:215
+#: g10/g10.c:218
 #, fuzzy
 msgid "update the trust database"
 msgstr "|[NOMBRES]|actualiza la base de datos de confianza"
 
-#: g10/g10.c:217
+#: g10/g10.c:220
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMBRES]|comprueba la base de datos de confianza"
 
-#: g10/g10.c:218
+#: g10/g10.c:221
 msgid "fix a corrupted trust database"
 msgstr "arregla una base de datos de confianza da�ada"
 
-#: g10/g10.c:219
+#: g10/g10.c:222
 msgid "De-Armor a file or stdin"
 msgstr "quita la armadura de un fichero o stdin"
 
-#: g10/g10.c:220
+#: g10/g10.c:223
 msgid "En-Armor a file or stdin"
 msgstr "crea la armadura a un fichero o stdin"
 
-#: g10/g10.c:221
+#: g10/g10.c:224
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheros]|imprime res�menes de mensaje"
 
-#: g10/g10.c:225
+#: g10/g10.c:228
 msgid ""
 "@\n"
 "Options:\n"
@@ -432,173 +432,173 @@ msgstr ""
 "Opciones:\n"
 " "
 
-#: g10/g10.c:227
+#: g10/g10.c:230
 msgid "create ascii armored output"
 msgstr "crea una salida ascii con armadura"
 
-#: g10/g10.c:228
+#: g10/g10.c:231
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOMBRE|cifra para NOMBRE"
 
-#: g10/g10.c:231
+#: g10/g10.c:234
 #, fuzzy
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOMBRE|usa NOMBRE como clave secreta por defecto"
 
-#: g10/g10.c:233
+#: g10/g10.c:236
 msgid "use the default key as default recipient"
 msgstr ""
 
-#: g10/g10.c:237
+#: g10/g10.c:240
 msgid "use this user-id to sign or decrypt"
 msgstr "usa este usuario para firmar o descifrar"
 
-#: g10/g10.c:238
+#: g10/g10.c:241
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|establece nivel de compresi�n N (0 no comprime)"
 
-#: g10/g10.c:240
+#: g10/g10.c:243
 msgid "use canonical text mode"
 msgstr "usa modo de texto can�nico"
 
-#: g10/g10.c:241
+#: g10/g10.c:244
 msgid "use as output file"
 msgstr "usa como fichero de salida"
 
-#: g10/g10.c:242
+#: g10/g10.c:245
 msgid "verbose"
 msgstr "prolijo"
 
-#: g10/g10.c:243
+#: g10/g10.c:246
 msgid "be somewhat more quiet"
 msgstr "algo m�s discreto"
 
-#: g10/g10.c:244
+#: g10/g10.c:247
 msgid "don't use the terminal at all"
 msgstr ""
 
-#: g10/g10.c:245
+#: g10/g10.c:248
 msgid "force v3 signatures"
 msgstr "fuerza firmas v3"
 
-#: g10/g10.c:246
+#: g10/g10.c:249
 msgid "always use a MDC for encryption"
 msgstr "siempre usa un MCD para cifrar"
 
-#: g10/g10.c:247
+#: g10/g10.c:250
 msgid "do not make any changes"
 msgstr "no hace ning�n cambio"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:249
+#: g10/g10.c:252
 msgid "batch mode: never ask"
 msgstr "proceso por lotes: nunca preguntar"
 
-#: g10/g10.c:250
+#: g10/g10.c:253
 msgid "assume yes on most questions"
 msgstr "asume \"s�\" en casi todas las preguntas"
 
-#: g10/g10.c:251
+#: g10/g10.c:254
 msgid "assume no on most questions"
 msgstr "asume \"no\" en casi todas las preguntas"
 
-#: g10/g10.c:252
+#: g10/g10.c:255
 msgid "add this keyring to the list of keyrings"
 msgstr "a�ade este anillo a la lista de anillos"
 
-#: g10/g10.c:253
+#: g10/g10.c:256
 msgid "add this secret keyring to the list"
 msgstr "a�ade este anillo secreto a la lista"
 
-#: g10/g10.c:254
+#: g10/g10.c:257
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOMBRE|usa NOMBRE como clave secreta por defecto"
 
-#: g10/g10.c:255
+#: g10/g10.c:258
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|SERVIDOR|usa este servidor de claves"
 
-#: g10/g10.c:256
+#: g10/g10.c:259
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOMBRE|usa el juego de caracteres NOMBRE"
 
-#: g10/g10.c:257
+#: g10/g10.c:260
 msgid "read options from file"
 msgstr "lee opciones del fichero"
 
-#: g10/g10.c:259
+#: g10/g10.c:262
 msgid "set debugging flags"
 msgstr "establece los par�metros de depuraci�n"
 
-#: g10/g10.c:260
+#: g10/g10.c:263
 msgid "enable full debugging"
 msgstr "habilita depuraci�n completa"
 
-#: g10/g10.c:261
+#: g10/g10.c:264
 msgid "|FD|write status info to this FD"
 msgstr "|DF|escribe informaci�n de estado en descriptor DF"
 
-#: g10/g10.c:262
+#: g10/g10.c:265
 msgid "do not write comment packets"
 msgstr "no escribe paquetes de comentario"
 
-#: g10/g10.c:263
+#: g10/g10.c:266
 msgid "(default is 1)"
 msgstr "(por defecto es 1)"
 
-#: g10/g10.c:264
+#: g10/g10.c:267
 msgid "(default is 3)"
 msgstr "(por defecto es 3)"
 
-#: g10/g10.c:266
+#: g10/g10.c:269
 msgid "|FILE|load extension module FILE"
 msgstr "|FICHERO|carga m�dulo de extensiones FICHERO"
 
-#: g10/g10.c:267
+#: g10/g10.c:270
 msgid "emulate the mode described in RFC1991"
 msgstr "emula el modo descrito en la RFC1991"
 
-#: g10/g10.c:268
+#: g10/g10.c:271
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:269
+#: g10/g10.c:272
 msgid "|N|use passphrase mode N"
 msgstr "|N|usa modo de contrase�a N"
 
-#: g10/g10.c:271
+#: g10/g10.c:274
 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:273
+#: g10/g10.c:276
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr ""
 "|NOMBRE|usa el algoritmo de cifrado NOMBRE para las\n"
 "contrase�as"
 
-#: g10/g10.c:274
+#: g10/g10.c:277
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOMBRE|usa el algoritmo de cifrado NOMBRE"
 
-#: g10/g10.c:275
+#: g10/g10.c:278
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOMBRE|usa algoritmo de resumen de mensaje NOMBRE"
 
-#: g10/g10.c:276
+#: g10/g10.c:279
 msgid "|N|use compress algorithm N"
 msgstr "|N|usa el algoritmo de compresi�n N"
 
-#: g10/g10.c:277
+#: g10/g10.c:280
 msgid "throw keyid field of encrypted packets"
 msgstr "elimina el campo keyid de los paquetes cifrados"
 
-#: g10/g10.c:278
+#: g10/g10.c:281
 msgid "|NAME=VALUE|use this notation data"
 msgstr ""
 
-#: g10/g10.c:280
+#: g10/g10.c:283
 msgid ""
 "@\n"
 "Examples:\n"
@@ -618,15 +618,15 @@ msgstr ""
 " --list-keys [nombres]      muestra las claves\n"
 " --fingerprint [nombres]    muestra las huellas dactilares\n"
 
-#: g10/g10.c:360
+#: g10/g10.c:366
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Por favor, informe de posibles \"bugs\" a <[email protected]>.\n"
 
-#: g10/g10.c:364
+#: g10/g10.c:370
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
 
-#: g10/g10.c:367
+#: g10/g10.c:373
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -636,7 +636,7 @@ msgstr ""
 "Firma, comprueba, cifra o descifra.\n"
 "La operaci�n por defecto depende del tipo de datos de entrada.\n"
 
-#: g10/g10.c:372
+#: g10/g10.c:378
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -644,181 +644,181 @@ msgstr ""
 "\n"
 "Algoritmos soportados:\n"
 
-#: g10/g10.c:446
+#: g10/g10.c:452
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opciones] "
 
-#: g10/g10.c:499
+#: g10/g10.c:505
 msgid "conflicting commands\n"
 msgstr "comandos incompatibles\n"
 
-#: g10/g10.c:633
+#: g10/g10.c:640
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: no existe el fichero de opciones predefinido `%s'\n"
 
-#: g10/g10.c:637
+#: g10/g10.c:644
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichero de opciones `%s': %s\n"
 
-#: g10/g10.c:644
+#: g10/g10.c:651
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "leyendo opciones desde `%s'\n"
 
-#: g10/g10.c:824
+#: g10/g10.c:831
 #, 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:872 g10/g10.c:884
+#: g10/g10.c:895 g10/g10.c:907
 msgid "selected cipher algorithm is invalid\n"
 msgstr "el algoritmo de cifrado seleccionado no es v�lido\n"
 
-#: g10/g10.c:878 g10/g10.c:890
+#: g10/g10.c:901 g10/g10.c:913
 msgid "selected digest algorithm is invalid\n"
 msgstr "el algoritmo de resumen seleccionado no es v�lido\n"
 
-#: g10/g10.c:894
+#: g10/g10.c:917
 msgid "the given policy URL is invalid\n"
 msgstr ""
 
-#: g10/g10.c:897
+#: g10/g10.c:920
 #, 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:899
+#: g10/g10.c:922
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser mayor que 0\n"
 
-#: g10/g10.c:901
+#: g10/g10.c:924
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser mayor que 1\n"
 
-#: g10/g10.c:903
+#: g10/g10.c:926
 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:906
+#: g10/g10.c:929
 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:910
+#: g10/g10.c:933
 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:987
+#: g10/g10.c:1010
 #, 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:993
+#: g10/g10.c:1016
 msgid "--store [filename]"
 msgstr "--store [nombre_fichero]"
 
-#: g10/g10.c:1000
+#: g10/g10.c:1023
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nombre_fichero]"
 
-#: g10/g10.c:1008
+#: g10/g10.c:1031
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nombre_fichero]"
 
-#: g10/g10.c:1021
+#: g10/g10.c:1044
 msgid "--sign [filename]"
 msgstr "--sign [nombre_fichero]"
 
-#: g10/g10.c:1034
+#: g10/g10.c:1057
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nombre_fichero]"
 
-#: g10/g10.c:1048
+#: g10/g10.c:1071
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nombre_fichero]"
 
-#: g10/g10.c:1060
+#: g10/g10.c:1083
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nombre_fichero]"
 
-#: g10/g10.c:1068
+#: g10/g10.c:1091
 msgid "--sign-key user-id"
 msgstr ""
 
-#: g10/g10.c:1076
+#: g10/g10.c:1099
 #, fuzzy
 msgid "--lsign-key user-id"
 msgstr "--delete-key nombre_usuario"
 
-#: g10/g10.c:1084
+#: g10/g10.c:1107
 #, fuzzy
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key nombre_usuario [comandos]"
 
-#: g10/g10.c:1100
+#: g10/g10.c:1123
 #, fuzzy
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key nombre_usuario"
 
-#: g10/g10.c:1103
+#: g10/g10.c:1126
 #, fuzzy
 msgid "--delete-key user-id"
 msgstr "--delete-key nombre_usuario"
 
-#: g10/encode.c:231 g10/g10.c:1127 g10/sign.c:366
+#: g10/encode.c:231 g10/g10.c:1150 g10/sign.c:366
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "no puede abrirse `%s': %s\n"
 
-#: g10/g10.c:1138
+#: g10/g10.c:1161
 msgid "-k[v][v][v][c] [userid] [keyring]"
 msgstr "-k[v][v][v][c] [id_usuario] [anillo]"
 
-#: g10/g10.c:1199
+#: g10/g10.c:1222
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminaci�n de armadura fallida: %s\n"
 
-#: g10/g10.c:1207
+#: g10/g10.c:1230
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creaci�n de armadura fallida: %s\n"
 
-#: g10/g10.c:1275
+#: g10/g10.c:1298
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de distribuci�n no v�lido `%s'\n"
 
-#: g10/g10.c:1356
+#: g10/g10.c:1379
 msgid "[filename]"
 msgstr "[nombre_fichero]"
 
-#: g10/g10.c:1360
+#: g10/g10.c:1383
 msgid "Go ahead and type your message ...\n"
 msgstr "Adelante, teclee su mensaje ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1363 g10/verify.c:66
+#: g10/decrypt.c:59 g10/g10.c:1386 g10/verify.c:66
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "no puede abrirse `%s'\n"
 
-#: g10/g10.c:1532
+#: g10/g10.c:1555
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr ""
 
-#: g10/g10.c:1538
+#: g10/g10.c:1561
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
 msgstr ""
 
-#: g10/g10.c:1544
+#: g10/g10.c:1567
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr ""
 
-#: g10/g10.c:1552
+#: g10/g10.c:1575
 msgid "a notation value must not use any control characters\n"
 msgstr ""
 
@@ -897,12 +897,19 @@ msgstr ""
 "caracter \"quoted printable\" en la armadura - probablemente se us�\n"
 "un MTA defectuoso\n"
 
+#. Translators: this shoud fit into 24 bytes to that the fingerprint
+#. * data is properly aligned with the user ID
+#: g10/pkclist.c:53
+#, fuzzy
+msgid "             Fingerprint:"
+msgstr "                 importadas: %lu"
+
 #. a string with valid answers
-#: g10/pkclist.c:140
+#: g10/pkclist.c:170
 msgid "sSmMqQ"
 msgstr "iImMqQ"
 
-#: g10/pkclist.c:144
+#: g10/pkclist.c:174
 #, c-format
 msgid ""
 "No trust value assigned to %lu:\n"
@@ -911,7 +918,7 @@ msgstr ""
 "No hay confianza definida para el propietario %lu:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:154
+#: g10/pkclist.c:186
 msgid ""
 "Please decide how far you trust this user to correctly\n"
 "verify other users' keys (by looking at passports,\n"
@@ -933,23 +940,23 @@ msgstr ""
 " 4 = Me f�o completamente\n"
 " i = Mostrar m�s informaci�n\n"
 
-#: g10/pkclist.c:163
+#: g10/pkclist.c:195
 msgid " m = back to the main menu\n"
 msgstr " m = volver al men� principal\n"
 
-#: g10/pkclist.c:165
+#: g10/pkclist.c:197
 msgid " q = quit\n"
 msgstr " q = salir\n"
 
-#: g10/pkclist.c:171
+#: g10/pkclist.c:203
 msgid "Your decision? "
 msgstr "Su decisi�n: "
 
-#: g10/pkclist.c:193
+#: g10/pkclist.c:225
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certificados que llevan a una clave de confianza absoluta:\n"
 
-#: g10/pkclist.c:264
+#: g10/pkclist.c:296
 msgid ""
 "Could not find a valid trust path to the key.  Let's see whether we\n"
 "can assign some missing owner trust values.\n"
@@ -959,7 +966,7 @@ msgstr ""
 "si es posible asignar algunos valores de confianza perdidos.\n"
 "\n"
 
-#: g10/pkclist.c:270
+#: g10/pkclist.c:302
 msgid ""
 "No path leading to one of our keys found.\n"
 "\n"
@@ -967,7 +974,7 @@ msgstr ""
 "No se ha encontrado ninguna ruta con una de nuestras claves.\n"
 "\n"
 
-#: g10/pkclist.c:272
+#: g10/pkclist.c:304
 msgid ""
 "No certificates with undefined trust found.\n"
 "\n"
@@ -975,7 +982,7 @@ msgstr ""
 "No se ha encontrado ning�n certificado sin valor de confianza.\n"
 "\n"
 
-#: g10/pkclist.c:274
+#: g10/pkclist.c:306
 msgid ""
 "No trust values changed.\n"
 "\n"
@@ -983,36 +990,36 @@ msgstr ""
 "No se cambi� ning�n valor de confianza.\n"
 "\n"
 
-#: g10/pkclist.c:291
+#: g10/pkclist.c:323
 #, c-format
 msgid "key %08lX: key has been revoked!\n"
 msgstr "clave %08lX: �esta clave ha sido revocada!\n"
 
-#: g10/pkclist.c:297 g10/pkclist.c:307 g10/pkclist.c:413
+#: g10/pkclist.c:329 g10/pkclist.c:339 g10/pkclist.c:448
 msgid "Use this key anyway? "
 msgstr "�Usar esta clave de todas formas? "
 
-#: g10/pkclist.c:301
+#: g10/pkclist.c:333
 #, c-format
 msgid "key %08lX: subkey has been revoked!\n"
 msgstr "clave %08lX: �esta subclave ha sido revocada!\n"
 
-#: g10/pkclist.c:331
+#: g10/pkclist.c:363
 #, c-format
 msgid "%08lX: key has expired\n"
 msgstr "%08lX: clave caducada\n"
 
-#: g10/pkclist.c:337
+#: g10/pkclist.c:369
 #, c-format
 msgid "%08lX: no info to calculate a trust probability\n"
 msgstr "%08lX: no hay informaci�n para calcular la probabilidad de confianza\n"
 
-#: g10/pkclist.c:351
+#: g10/pkclist.c:383
 #, c-format
 msgid "%08lX: We do NOT trust this key\n"
 msgstr "%08lX: �Esta clave NO es de confianza!\n"
 
-#: g10/pkclist.c:357
+#: g10/pkclist.c:389
 #, c-format
 msgid ""
 "%08lX: It is not sure that this key really belongs to the owner\n"
@@ -1022,15 +1029,15 @@ msgstr ""
 "proprietario\n"
 "pero se acepta igualmente\n"
 
-#: g10/pkclist.c:363
+#: g10/pkclist.c:395
 msgid "This key probably belongs to the owner\n"
 msgstr "Esta clave probablemente pertenece a su proprietario\n"
 
-#: g10/pkclist.c:368
+#: g10/pkclist.c:400
 msgid "This key belongs to us\n"
 msgstr "Esta clave nos pertenece\n"
 
-#: g10/pkclist.c:408
+#: g10/pkclist.c:443
 msgid ""
 "It is NOT certain that the key belongs to its owner.\n"
 "If you *really* know what you are doing, you may answer\n"
@@ -1042,66 +1049,66 @@ msgstr ""
 "\"s�\" a la siguiente pregunta.\n"
 "\n"
 
-#: g10/pkclist.c:421 g10/pkclist.c:443
+#: g10/pkclist.c:456 g10/pkclist.c:478
 msgid "WARNING: Using untrusted key!\n"
 msgstr "ATENCI�N: �Usando una clave no fiable!\n"
 
-#: g10/pkclist.c:464
+#: g10/pkclist.c:499
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "ATENCI�N: �Esta clave ha sido revocada por su propietario!\n"
 
-#: g10/pkclist.c:465
+#: g10/pkclist.c:500
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "          Esto puede significar que la firma est� falsificada.\n"
 
-#: g10/pkclist.c:469
+#: g10/pkclist.c:504
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "ATENCI�N: �Esta clave ha sido revocada por su propietario!\n"
 
-#: g10/pkclist.c:490
+#: g10/pkclist.c:525
 msgid "Note: This key has expired!\n"
 msgstr "Nota: �Esta clave est� caducada!\n"
 
-#: g10/pkclist.c:497
+#: g10/pkclist.c:532
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 "ATENCI�N: �Esta clave no est� certificada por una firma de confianza!\n"
 
-#: g10/pkclist.c:499
+#: g10/pkclist.c:534
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "         No hay indicios de que la firma pertenezca al propietario.\n"
 
-#: g10/pkclist.c:515
+#: g10/pkclist.c:550
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "ATENCI�N: �Esta clave NO es de confianza!\n"
 
-#: g10/pkclist.c:516
+#: g10/pkclist.c:551
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         La firma es probablemente una FALSIFICACI�N.\n"
 
-#: g10/pkclist.c:523
+#: g10/pkclist.c:558
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "ATENCI�N: �Esta clave no est� certificada con suficientes firmas de "
 "confianza!\n"
 
-#: g10/pkclist.c:526
+#: g10/pkclist.c:561
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         No es seguro que la firma pertenezca al propietario.\n"
 
-#: g10/pkclist.c:627 g10/pkclist.c:649 g10/pkclist.c:758 g10/pkclist.c:803
+#: g10/pkclist.c:662 g10/pkclist.c:684 g10/pkclist.c:793 g10/pkclist.c:838
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignorado: %s\n"
 
-#: g10/pkclist.c:635 g10/pkclist.c:785
+#: g10/pkclist.c:670 g10/pkclist.c:820
 #, fuzzy, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: problema lectura del bloque de clave: %s\n"
 
-#: g10/pkclist.c:662
+#: g10/pkclist.c:697
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1109,34 +1116,34 @@ msgstr ""
 "No se ha especificado un ID de usuario (puede usar \"-r\")\n"
 "\n"
 
-#: g10/pkclist.c:672
+#: g10/pkclist.c:707
 msgid "Enter the user ID: "
 msgstr "Introduzca el ID de usuario: "
 
-#: g10/pkclist.c:684
+#: g10/pkclist.c:719
 msgid "No such user ID.\n"
 msgstr "ID de usuario inexistente.\n"
 
-#: g10/pkclist.c:704
+#: g10/pkclist.c:739
 #, fuzzy
 msgid "Public key is disabled.\n"
 msgstr "la clave p�blica es %08lX\n"
 
-#: g10/pkclist.c:733
+#: g10/pkclist.c:768
 msgid "unknown default recipient `s'\n"
 msgstr ""
 
-#: g10/pkclist.c:766
+#: g10/pkclist.c:801
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: error comprobando la clave: %s\n"
 
-#: g10/pkclist.c:771
+#: g10/pkclist.c:806
 #, fuzzy, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: problema lectura del bloque de clave: %s\n"
 
-#: g10/pkclist.c:809
+#: g10/pkclist.c:844
 msgid "no valid addressees\n"
 msgstr "no hay direcciones v�lidas\n"
 
@@ -1525,243 +1532,248 @@ msgstr "demasiados registros en la cache pk - anulada\n"
 msgid "too many entries in unk cache - disabled\n"
 msgstr "demasiados registros en la cache unk - anulada\n"
 
-#: g10/getkey.c:1535 g10/getkey.c:1591
+#: g10/getkey.c:1565 g10/getkey.c:1621
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "usando clave secundaria %08lX en vez de clave primaria %08lX\n"
 
-#: g10/import.c:117
+#: g10/import.c:118
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "no puede abrirse `%s': %s\n"
 
-#: g10/import.c:161
+#: g10/import.c:162
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "ignorando bloque de tipo %d\n"
 
-#: g10/import.c:168 g10/trustdb.c:1658 g10/trustdb.c:1697
+#: g10/import.c:169 g10/trustdb.c:1658 g10/trustdb.c:1697
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "hasta ahora se han procesado %lu claves\n"
 
-#: g10/import.c:173
+#: g10/import.c:174
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "error leyendo `%s': %s\n"
 
-#: g10/import.c:176
+#: g10/import.c:177
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "   Cantidad total procesada: %lu\n"
 
-#: g10/import.c:178
+#: g10/import.c:179
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "         sin identificativo: %lu\n"
 
-#: g10/import.c:180
+#: g10/import.c:181
 #, c-format
 msgid "              imported: %lu"
 msgstr "                 importadas: %lu"
 
-#: g10/import.c:186
+#: g10/import.c:187
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                sin cambios: %lu\n"
 
-#: g10/import.c:188
+#: g10/import.c:189
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "     nuevos identificativos: %lu\n"
 
-#: g10/import.c:190
+#: g10/import.c:191
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           nuevas subclaves: %lu\n"
 
-#: g10/import.c:192
+#: g10/import.c:193
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "              nuevas firmas: %lu\n"
 
-#: g10/import.c:194
+#: g10/import.c:195
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "        nuevas revocaciones: %lu\n"
 
-#: g10/import.c:196
+#: g10/import.c:197
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "     claves secretas le�das: %lu\n"
 
-#: g10/import.c:198
+#: g10/import.c:199
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr " claves secretas importadas: %lu\n"
 
-#: g10/import.c:200
+#: g10/import.c:201
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "claves secretas sin cambios: %lu\n"
 
-#: g10/import.c:361 g10/import.c:550
+#: g10/import.c:362 g10/import.c:554
 #, c-format
 msgid "key %08lX: no user id\n"
 msgstr "clave %08lX: no hay identificativo de usuario\n"
 
-#: g10/import.c:372
+#: g10/import.c:376
 #, c-format
 msgid "key %08lX: no valid user ids\n"
 msgstr "clave %08lX: no hay identificativos de usuario v�lidos\n"
 
-#: g10/import.c:374
+#: g10/import.c:378
 msgid "this may be caused by a missing self-signature\n"
 msgstr "esto puede ser debido a la ausencia de autofirma\n"
 
-#: g10/import.c:385 g10/import.c:617
+#: g10/import.c:389 g10/import.c:621
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "clave %08lX: clave p�blica no encontrada: %s\n"
 
-#: g10/import.c:391
+#: g10/import.c:395
 msgid "no default public keyring\n"
 msgstr "no hay anillo p�blico por defecto\n"
 
-#: g10/import.c:395 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:559
+#: g10/import.c:399 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:559
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escribiendo en `%s'\n"
 
-#: g10/import.c:398 g10/import.c:456 g10/import.c:565 g10/import.c:666
+#: g10/import.c:402 g10/import.c:460 g10/import.c:569 g10/import.c:670
 #, c-format
 msgid "can't lock keyring `%s': %s\n"
 msgstr "no puede bloquearse el anillo `%s': %s\n"
 
-#: g10/import.c:401 g10/import.c:459 g10/import.c:568 g10/import.c:669
+#: g10/import.c:405 g10/import.c:463 g10/import.c:572 g10/import.c:673
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "error escribiendo anillo `%s': %s\n"
 
-#: g10/import.c:406
+#: g10/import.c:410
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "clave %08lX: clave p�blica importada\n"
 
-#: g10/import.c:423
+#: g10/import.c:427
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "clave %08lX: no se corresponde con nuestra copia\n"
 
-#: g10/import.c:432 g10/import.c:625
+#: g10/import.c:436 g10/import.c:629
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "clave %08lX: no puede localizarse el bloque de claves original: %s\n"
 
-#: g10/import.c:438 g10/import.c:631
+#: g10/import.c:442 g10/import.c:635
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "clave %08lX: no puede leerse el bloque de claves original: %s\n"
 
-#: g10/import.c:465
+#: g10/import.c:469
 #, c-format
 msgid "key %08lX: 1 new user-id\n"
 msgstr "clave %08lX: 1 nuevo identificativo de usuario\n"
 
-#: g10/import.c:468
+#: g10/import.c:472
 #, c-format
 msgid "key %08lX: %d new user-ids\n"
 msgstr "clave %08lX: %d nuevos identificativos de usuario\n"
 
-#: g10/import.c:471
+#: g10/import.c:475
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "clave %08lX: 1 nueva firma\n"
 
-#: g10/import.c:474
+#: g10/import.c:478
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "clave %08lX: %d nuevas firmas\n"
 
-#: g10/import.c:477
+#: g10/import.c:481
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "clave %08lX: 1 nueva subclave\n"
 
-#: g10/import.c:480
+#: g10/import.c:484
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "clave %08lX: %d nuevas subclaves\n"
 
-#: g10/import.c:490
+#: g10/import.c:494
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "clave %08lX: sin cambios\n"
 
-#: g10/import.c:573
+#: g10/import.c:577
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "clave %08lX: clave secreta importada\n"
 
 #. we can't merge secret keys
-#: g10/import.c:577
+#: g10/import.c:581
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "clave %08lX: ya estaba en el anillo secreto\n"
 
-#: g10/import.c:582
+#: g10/import.c:586
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "clave %08lX: clave secreta no encontrada: %s\n"
 
-#: g10/import.c:611
+#: g10/import.c:615
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "clave %08lX: falta la clave p�blica - imposibile applicar el\n"
 "certificado de revocaci�n\n"
 
-#: g10/import.c:642
+#: g10/import.c:646
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "clave %08lX: certificado de revocaci�n no v�lido: %s - rechazado\n"
 
-#: g10/import.c:674
+#: g10/import.c:678
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "clave %08lX: certificado de revocaci�n importado\n"
 
-#: g10/import.c:707
+#: g10/import.c:711
 #, c-format
 msgid "key %08lX: no user-id for signature\n"
 msgstr "clave %08lX: no hay identificativo de usuario para la firma\n"
 
-#: g10/import.c:714 g10/import.c:738
+#: g10/import.c:718 g10/import.c:742
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "clave %08lX: algoritmo de clave p�blica no soportado\n"
 
-#: g10/import.c:715
+#: g10/import.c:719
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "clave %08lX: autofirma no v�lida\n"
 
-#: g10/import.c:730
+#: g10/import.c:734
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "clave %08lX: no hay subclave para unir\n"
 
-#: g10/import.c:739
+#: g10/import.c:743
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "clave %08lX.%lu: uni�n de subclave no v�lida\n"
 
-#: g10/import.c:771
+#: g10/import.c:769
+#, fuzzy, c-format
+msgid "key %08lX: accepted non self-signed userid '"
+msgstr "clave %08lX: ignorado identificativo de usuario '"
+
+#: g10/import.c:798
 #, c-format
 msgid "key %08lX: skipped userid '"
 msgstr "clave %08lX: ignorado identificativo de usuario '"
 
-#: g10/import.c:794
+#: g10/import.c:821
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "clave %08lX: subclave ignorada\n"
@@ -1770,33 +1782,33 @@ msgstr "clave %08lX: subclave ignorada\n"
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:819
+#: g10/import.c:846
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "clave %08lX: firma no exportable (clase %02x) - ignorada\n"
 
-#: g10/import.c:828
+#: g10/import.c:855
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "clave %08lX: certificado de revocaci�n en lugar equivocado - ignorado\n"
 
-#: g10/import.c:836
+#: g10/import.c:863
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "clave %08lX: certificado de revocaci�n no valido: %s - ignorado\n"
 
-#: g10/import.c:936
+#: g10/import.c:963
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "clave %08lX: detectado usuario duplicado - fusionada\n"
 
-#: g10/import.c:987
+#: g10/import.c:1014
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "clave %08lX: certificado de revocaci�n a�adido\n"
 
-#: g10/import.c:1100 g10/import.c:1155
+#: g10/import.c:1127 g10/import.c:1182
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "clave %08lX: nuestra copia no tiene autofirma\n"
@@ -2356,78 +2368,78 @@ msgstr "Firma creada %.*s usando identificativo de clave %s %08lX\n"
 msgid "no secret key for decryption available\n"
 msgstr "Clave secreta no disponible"
 
-#: g10/mainproc.c:293
+#: g10/mainproc.c:300
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "descifrado de la clave p�blica fallido: %s\n"
 
-#: g10/mainproc.c:323
+#: g10/mainproc.c:330
 msgid "decryption okay\n"
 msgstr "descifrado correcto\n"
 
-#: g10/mainproc.c:328
+#: g10/mainproc.c:335
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATENCI�N: �el mensaje cifrado ha sido manipulado!\n"
 
-#: g10/mainproc.c:333
+#: g10/mainproc.c:340
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "descifrado fallido: %s\n"
 
-#: g10/mainproc.c:351
+#: g10/mainproc.c:358
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: el remitente solicit� \"s�lo-para-tus-ojos\"\n"
 
-#: g10/mainproc.c:353
+#: g10/mainproc.c:360
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nombre fichero original='%.*s'\n"
 
-#: g10/mainproc.c:580 g10/mainproc.c:589
+#: g10/mainproc.c:587 g10/mainproc.c:596
 #, fuzzy
 msgid "WARNING: invalid notation data found\n"
 msgstr "no se han encontrados datos OpenPGP v�lidos\n"
 
-#: g10/mainproc.c:592
+#: g10/mainproc.c:599
 msgid "Notation: "
 msgstr ""
 
-#: g10/mainproc.c:599
+#: g10/mainproc.c:606
 msgid "Policy: "
 msgstr ""
 
-#: g10/mainproc.c:1018
+#: g10/mainproc.c:1025
 msgid "signature verification suppressed\n"
 msgstr "suprimida la verificaci�n de la firma\n"
 
-#: g10/mainproc.c:1024
+#: g10/mainproc.c:1031
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Firma creada %.*s usando identificativo de clave %s %08lX\n"
 
 #. just in case that we have no userid
-#: g10/mainproc.c:1050 g10/mainproc.c:1061
+#: g10/mainproc.c:1057 g10/mainproc.c:1068
 msgid "BAD signature from \""
 msgstr "Firma INCORRECTA de \""
 
-#: g10/mainproc.c:1051 g10/mainproc.c:1062
+#: g10/mainproc.c:1058 g10/mainproc.c:1069
 msgid "Good signature from \""
 msgstr "Firma correcta de \""
 
-#: g10/mainproc.c:1053
+#: g10/mainproc.c:1060
 msgid "                aka \""
 msgstr "tambi�n conocido como \""
 
-#: g10/mainproc.c:1104
+#: g10/mainproc.c:1115
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposible comprobar la firma: %s\n"
 
-#: g10/mainproc.c:1198
+#: g10/mainproc.c:1209
 msgid "old style (PGP 2.x) signature\n"
 msgstr "firma viejo estilo (PGP 2.x)\n"
 
-#: g10/mainproc.c:1203
+#: g10/mainproc.c:1214
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquete ra�z no v�lido detectado en proc_tree()\n"
 
@@ -2643,7 +2655,7 @@ msgstr "%s: directorio creado\n"
 msgid "%s: directory does not exist!\n"
 msgstr "%s: �el directorio no existe!\n"
 
-#: g10/openfile.c:182 g10/openfile.c:253 g10/ringedit.c:1344 g10/tdbio.c:457
+#: g10/openfile.c:182 g10/openfile.c:253 g10/ringedit.c:1346 g10/tdbio.c:457
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: no puede crearse: %s\n"
@@ -3039,26 +3051,26 @@ msgstr "ATENC�ON: todav�a no puedo tratar registros de preferencias largos\n"
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s: no se puede crear el anillo: %s\n"
 
-#: g10/ringedit.c:333 g10/ringedit.c:1349
+#: g10/ringedit.c:333 g10/ringedit.c:1351
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: anillo creado\n"
 
-#: g10/ringedit.c:1526
+#: g10/ringedit.c:1528
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "ATENCI�N: existen 2 ficheros con informaci�n confidencial.\n"
 
-#: g10/ringedit.c:1527
+#: g10/ringedit.c:1529
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s es el que no se ha modificado\n"
 
-#: g10/ringedit.c:1528
+#: g10/ringedit.c:1530
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s es el nuevo\n"
 
-#: g10/ringedit.c:1529
+#: g10/ringedit.c:1531
 msgid "Please fix this possible security flaw\n"
 msgstr "Por favor arregle este posible fallo de seguridad\n"
 
diff --git a/po/fr.po b/po/fr.po
index 33af86802..aff1a51fd 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 0.9.7\n"
-"POT-Creation-Date: 1999-07-14 11:47+0200\n"
+"POT-Creation-Date: 1999-07-23 12:13+0200\n"
 "PO-Revision-Date: 1999-05-24 21:48+02:00\n"
 "Last-Translator: Ga�l Qu�ri <[email protected]>\n"
 "Language-Team: French <[email protected]>\n"
@@ -276,7 +276,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:180
+#: g10/g10.c:183
 msgid ""
 "@Commands:\n"
 " "
@@ -284,139 +284,139 @@ msgstr ""
 "@Commandes:\n"
 " "
 
-#: g10/g10.c:182
+#: g10/g10.c:185
 msgid "|[file]|make a signature"
 msgstr "|[fichier]|faire une signature"
 
-#: g10/g10.c:183
+#: g10/g10.c:186
 msgid "|[file]|make a clear text signature"
 msgstr "|[fichier]|faire une signature en texte clair"
 
-#: g10/g10.c:184
+#: g10/g10.c:187
 msgid "make a detached signature"
 msgstr "faire une signature d�tach�e"
 
-#: g10/g10.c:185
+#: g10/g10.c:188
 msgid "encrypt data"
 msgstr "chiffrer les donn�es"
 
-#: g10/g10.c:186
+#: g10/g10.c:189
 msgid "encryption only with symmetric cipher"
 msgstr "chiffrement sym�trique seulement"
 
-#: g10/g10.c:187
+#: g10/g10.c:190
 msgid "store only"
 msgstr "pas d'action"
 
-#: g10/g10.c:188
+#: g10/g10.c:191
 msgid "decrypt data (default)"
 msgstr "d�chiffrer les donn�es (d�faut)"
 
-#: g10/g10.c:189
+#: g10/g10.c:192
 msgid "verify a signature"
 msgstr "v�rifier une signature"
 
-#: g10/g10.c:190
+#: g10/g10.c:193
 msgid "list keys"
 msgstr "lister les cl�s"
 
-#: g10/g10.c:192
+#: g10/g10.c:195
 msgid "list keys and signatures"
 msgstr "lister les cl�s et les signatures"
 
-#: g10/g10.c:193
+#: g10/g10.c:196
 msgid "check key signatures"
 msgstr "v�rifier les signatures des cl�s"
 
-#: g10/g10.c:194
+#: g10/g10.c:197
 msgid "list keys and fingerprints"
 msgstr "lister les cl�s et les empreintes"
 
-#: g10/g10.c:195
+#: g10/g10.c:198
 msgid "list secret keys"
 msgstr "lister les cl�s secr�tes"
 
-#: g10/g10.c:196
+#: g10/g10.c:199
 msgid "generate a new key pair"
 msgstr "g�n�rer une nouvelle paire de cl�s"
 
-#: g10/g10.c:197
+#: g10/g10.c:200
 msgid "remove key from the public keyring"
 msgstr "enlever la cl� du porte-cl�s public"
 
-#: g10/g10.c:198
+#: g10/g10.c:201
 #, fuzzy
 msgid "sign a key"
 msgstr "signer la cl�"
 
-#: g10/g10.c:199
+#: g10/g10.c:202
 #, fuzzy
 msgid "sign a key locally"
 msgstr "signer la cl� localement"
 
-#: g10/g10.c:200
+#: g10/g10.c:203
 msgid "sign or edit a key"
 msgstr "signer ou �diter une cl�"
 
-#: g10/g10.c:201
+#: g10/g10.c:204
 msgid "generate a revocation certificate"
 msgstr "g�n�rer un certificat de r�vocation"
 
-#: g10/g10.c:202
+#: g10/g10.c:205
 msgid "export keys"
 msgstr "exporter les cl�s"
 
-#: g10/g10.c:203
+#: g10/g10.c:206
 msgid "export keys to a key server"
 msgstr "exporter les cl�s vers un serveur de cl�s"
 
-#: g10/g10.c:204
+#: g10/g10.c:207
 msgid "import keys from a key server"
 msgstr "importer les cl�s d'un serveur de cl�s"
 
-#: g10/g10.c:207
+#: g10/g10.c:210
 msgid "import/merge keys"
 msgstr "importer/fusionner les cl�s"
 
-#: g10/g10.c:209
+#: g10/g10.c:212
 msgid "list only the sequence of packets"
 msgstr "ne lister que les paquets"
 
-#: g10/g10.c:211
+#: g10/g10.c:214
 msgid "export the ownertrust values"
 msgstr "exporter les indices de confiance"
 
-#: g10/g10.c:213
+#: g10/g10.c:216
 msgid "import ownertrust values"
 msgstr "importer les indices de confiance"
 
 #
-#: g10/g10.c:215
+#: g10/g10.c:218
 #, fuzzy
 msgid "update the trust database"
 msgstr "|[NOMS]|mettre la base de confiance � jour"
 
-#: g10/g10.c:217
+#: g10/g10.c:220
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMS]|v�rifier la base de confiance"
 
-#: g10/g10.c:218
+#: g10/g10.c:221
 msgid "fix a corrupted trust database"
 msgstr "r�parer une base de confiance corrompue"
 
-#: g10/g10.c:219
+#: g10/g10.c:222
 msgid "De-Armor a file or stdin"
 msgstr "Enlever l'armure d'un fichier ou de stdin"
 
-#: g10/g10.c:220
+#: g10/g10.c:223
 msgid "En-Armor a file or stdin"
 msgstr "Mettre une armure � un fichier ou � stdin"
 
-#: g10/g10.c:221
+#: g10/g10.c:224
 msgid "|algo [files]|print message digests"
 msgstr "|alg. [fich.]|indiquer les fonctions de hachage"
 
-#: g10/g10.c:225
+#: g10/g10.c:228
 msgid ""
 "@\n"
 "Options:\n"
@@ -426,171 +426,171 @@ msgstr ""
 "Options:\n"
 " "
 
-#: g10/g10.c:227
+#: g10/g10.c:230
 msgid "create ascii armored output"
 msgstr "cr�er une sortie ascii avec armure"
 
-#: g10/g10.c:228
+#: g10/g10.c:231
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOM|chiffrer pour NOM"
 
-#: g10/g10.c:231
+#: g10/g10.c:234
 #, fuzzy
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOM|utiliser NOM comme cl� secr�te par d�faut"
 
-#: g10/g10.c:233
+#: g10/g10.c:236
 msgid "use the default key as default recipient"
 msgstr ""
 
-#: g10/g10.c:237
+#: g10/g10.c:240
 msgid "use this user-id to sign or decrypt"
 msgstr "utiliser ce nom pour signer ou d�chiffrer"
 
-#: g10/g10.c:238
+#: g10/g10.c:241
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|niveau de compression N (0 d�sactive)"
 
-#: g10/g10.c:240
+#: g10/g10.c:243
 msgid "use canonical text mode"
 msgstr "utiliser le mode texte canonique"
 
-#: g10/g10.c:241
+#: g10/g10.c:244
 msgid "use as output file"
 msgstr "utiliser comme fichier de sortie"
 
-#: g10/g10.c:242
+#: g10/g10.c:245
 msgid "verbose"
 msgstr "bavard"
 
-#: g10/g10.c:243
+#: g10/g10.c:246
 msgid "be somewhat more quiet"
 msgstr "devenir beaucoup plus silencieux"
 
-#: g10/g10.c:244
+#: g10/g10.c:247
 msgid "don't use the terminal at all"
 msgstr ""
 
 #
-#: g10/g10.c:245
+#: g10/g10.c:248
 msgid "force v3 signatures"
 msgstr "forcer les signatures en v3"
 
-#: g10/g10.c:246
+#: g10/g10.c:249
 msgid "always use a MDC for encryption"
 msgstr "toujours utiliser un sceau pour le chiffrement"
 
-#: g10/g10.c:247
+#: g10/g10.c:250
 msgid "do not make any changes"
 msgstr "ne rien changer"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:249
+#: g10/g10.c:252
 msgid "batch mode: never ask"
 msgstr "mode automatique : ne jamais rien demander"
 
-#: g10/g10.c:250
+#: g10/g10.c:253
 msgid "assume yes on most questions"
 msgstr "r�pondre oui � la plupart des questions"
 
-#: g10/g10.c:251
+#: g10/g10.c:254
 msgid "assume no on most questions"
 msgstr "r�pondre non � la plupart des questions"
 
-#: g10/g10.c:252
+#: g10/g10.c:255
 msgid "add this keyring to the list of keyrings"
 msgstr "ajouter ce porte-cl�s � la liste des porte-cl�s"
 
-#: g10/g10.c:253
+#: g10/g10.c:256
 msgid "add this secret keyring to the list"
 msgstr "ajouter ce porte-cl�s secret � la liste"
 
-#: g10/g10.c:254
+#: g10/g10.c:257
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOM|utiliser NOM comme cl� secr�te par d�faut"
 
-#: g10/g10.c:255
+#: g10/g10.c:258
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|H�TE|utiliser ce serveur pour chercher des cl�s"
 
-#: g10/g10.c:256
+#: g10/g10.c:259
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOM|le terminal utilise la table de caract�res NOM"
 
-#: g10/g10.c:257
+#: g10/g10.c:260
 msgid "read options from file"
 msgstr "lire les options du fichier"
 
-#: g10/g10.c:259
+#: g10/g10.c:262
 msgid "set debugging flags"
 msgstr "choisir les attributs de d�boguage"
 
-#: g10/g10.c:260
+#: g10/g10.c:263
 msgid "enable full debugging"
 msgstr "permettre un d�boguage complet"
 
-#: g10/g10.c:261
+#: g10/g10.c:264
 msgid "|FD|write status info to this FD"
 msgstr "|FD|�crire l'�tat sur ce descripteur"
 
-#: g10/g10.c:262
+#: g10/g10.c:265
 msgid "do not write comment packets"
 msgstr "ne pas �crire de paquets de commentaire"
 
-#: g10/g10.c:263
+#: g10/g10.c:266
 msgid "(default is 1)"
 msgstr "nombre de signatures compl�tes requises (1)"
 
-#: g10/g10.c:264
+#: g10/g10.c:267
 msgid "(default is 3)"
 msgstr "nombre de signatures marginales requises (3)"
 
-#: g10/g10.c:266
+#: g10/g10.c:269
 msgid "|FILE|load extension module FILE"
 msgstr "|FICH|charger le module d'extension FICH"
 
-#: g10/g10.c:267
+#: g10/g10.c:270
 msgid "emulate the mode described in RFC1991"
 msgstr "imiter le mode d�crit dans la RFC1991"
 
-#: g10/g10.c:268
+#: g10/g10.c:271
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 
 # FIXMOI : faudra trouver mieux ...
-#: g10/g10.c:269
+#: g10/g10.c:272
 msgid "|N|use passphrase mode N"
 msgstr "|N|utiliser le mode de codage des mots de passe N"
 
-#: g10/g10.c:271
+#: g10/g10.c:274
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NOM|utiliser le hachage NOM pour les mots de passe"
 
-#: g10/g10.c:273
+#: g10/g10.c:276
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NOM|utiliser le chiffre NOM pour les mots de passe"
 
-#: g10/g10.c:274
+#: g10/g10.c:277
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOM|utiliser l'algorithme de chiffrement NOM"
 
-#: g10/g10.c:275
+#: g10/g10.c:278
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOM|utiliser la fonction de hachage NOM"
 
-#: g10/g10.c:276
+#: g10/g10.c:279
 msgid "|N|use compress algorithm N"
 msgstr "|N|utiliser l'algorithme de compression N"
 
-#: g10/g10.c:277
+#: g10/g10.c:280
 msgid "throw keyid field of encrypted packets"
 msgstr "supprimer l'identification des paquets chiffr�s"
 
-#: g10/g10.c:278
+#: g10/g10.c:281
 msgid "|NAME=VALUE|use this notation data"
 msgstr ""
 
-#: g10/g10.c:280
+#: g10/g10.c:283
 msgid ""
 "@\n"
 "Examples:\n"
@@ -610,15 +610,15 @@ msgstr ""
 " --list-keys [utilisateur]    montrer les cl�s\n"
 " --fingerprint [utilisateur]  montrer les empreintes\n"
 
-#: g10/g10.c:360
+#: g10/g10.c:366
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Rapporter toutes anomalies � <[email protected]>.\n"
 
-#: g10/g10.c:364
+#: g10/g10.c:370
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: g10/g10.c:367
+#: g10/g10.c:373
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -628,7 +628,7 @@ msgstr ""
 "signer, v�rifier, chiffer ou d�chiffrer\n"
 "l'op�ration par d�faut d�pend des donn�es entr�es\n"
 
-#: g10/g10.c:372
+#: g10/g10.c:378
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -636,181 +636,181 @@ msgstr ""
 "\n"
 "Algorithmes support�s:\n"
 
-#: g10/g10.c:446
+#: g10/g10.c:452
 msgid "usage: gpg [options] "
 msgstr "utilisation: gpg [options] "
 
-#: g10/g10.c:499
+#: g10/g10.c:505
 msgid "conflicting commands\n"
 msgstr "commandes en conflit\n"
 
-#: g10/g10.c:633
+#: g10/g10.c:640
 #, 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:637
+#: g10/g10.c:644
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichier d'options `%s' : %s\n"
 
-#: g10/g10.c:644
+#: g10/g10.c:651
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lire les options de `%s'\n"
 
-#: g10/g10.c:824
+#: g10/g10.c:831
 #, 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:872 g10/g10.c:884
+#: g10/g10.c:895 g10/g10.c:907
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorithme de chiffrement s�lectionn� est invalide\n"
 
-#: g10/g10.c:878 g10/g10.c:890
+#: g10/g10.c:901 g10/g10.c:913
 msgid "selected digest algorithm is invalid\n"
 msgstr "la fonction de hachage s�lectionn�e est invalide\n"
 
-#: g10/g10.c:894
+#: g10/g10.c:917
 msgid "the given policy URL is invalid\n"
 msgstr ""
 
-#: g10/g10.c:897
+#: g10/g10.c:920
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "l'algorithme de compression doit faire partie de l'�chelle %d..%d\n"
 
-#: g10/g10.c:899
+#: g10/g10.c:922
 msgid "completes-needed must be greater than 0\n"
 msgstr "� completes-needed � doit �tre sup�rieur � 0\n"
 
-#: g10/g10.c:901
+#: g10/g10.c:924
 msgid "marginals-needed must be greater than 1\n"
 msgstr "� marginals-needed � doit �tre sup�rieur � 1\n"
 
-#: g10/g10.c:903
+#: g10/g10.c:926
 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:906
+#: g10/g10.c:929
 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:910
+#: g10/g10.c:933
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mode S2K invalide ; doit �tre 0, 1 ou 3\n"
 
-#: g10/g10.c:987
+#: g10/g10.c:1010
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "n'a pas pu initialiser la base de confiance : %s\n"
 
-#: g10/g10.c:993
+#: g10/g10.c:1016
 msgid "--store [filename]"
 msgstr "--store [nom du fichier]"
 
-#: g10/g10.c:1000
+#: g10/g10.c:1023
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom du fichier]"
 
-#: g10/g10.c:1008
+#: g10/g10.c:1031
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom du fichier]"
 
-#: g10/g10.c:1021
+#: g10/g10.c:1044
 msgid "--sign [filename]"
 msgstr "--sign [nom du fichier]"
 
-#: g10/g10.c:1034
+#: g10/g10.c:1057
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom du fichier]"
 
-#: g10/g10.c:1048
+#: g10/g10.c:1071
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom du fichier]"
 
-#: g10/g10.c:1060
+#: g10/g10.c:1083
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom du fichier]"
 
-#: g10/g10.c:1068
+#: g10/g10.c:1091
 msgid "--sign-key user-id"
 msgstr ""
 
-#: g10/g10.c:1076
+#: g10/g10.c:1099
 #, fuzzy
 msgid "--lsign-key user-id"
 msgstr "--delete-key utilisateur"
 
-#: g10/g10.c:1084
+#: g10/g10.c:1107
 #, fuzzy
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key utilisateur [commandes]"
 
-#: g10/g10.c:1100
+#: g10/g10.c:1123
 #, fuzzy
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key utilisateur"
 
-#: g10/g10.c:1103
+#: g10/g10.c:1126
 #, fuzzy
 msgid "--delete-key user-id"
 msgstr "--delete-key utilisateur"
 
-#: g10/encode.c:231 g10/g10.c:1127 g10/sign.c:366
+#: g10/encode.c:231 g10/g10.c:1150 g10/sign.c:366
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "ne peut ouvrir %s: %s\n"
 
-#: g10/g10.c:1138
+#: g10/g10.c:1161
 msgid "-k[v][v][v][c] [userid] [keyring]"
 msgstr "-k[v][v][v][c] [utilisateur] [porte-cl�s]"
 
-#: g10/g10.c:1199
+#: g10/g10.c:1222
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "suppression d'armure non r�ussie : %s\n"
 
-#: g10/g10.c:1207
+#: g10/g10.c:1230
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "construction d'armure non r�ussie : %s \n"
 
-#: g10/g10.c:1275
+#: g10/g10.c:1298
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algorithme de hachage `%s' invalide\n"
 
-#: g10/g10.c:1356
+#: g10/g10.c:1379
 msgid "[filename]"
 msgstr "[nom du fichier]"
 
-#: g10/g10.c:1360
+#: g10/g10.c:1383
 msgid "Go ahead and type your message ...\n"
 msgstr "Continuez et tapez votre message...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1363 g10/verify.c:66
+#: g10/decrypt.c:59 g10/g10.c:1386 g10/verify.c:66
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "ne peut ouvrir `%s'\n"
 
-#: g10/g10.c:1532
+#: g10/g10.c:1555
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr ""
 
-#: g10/g10.c:1538
+#: g10/g10.c:1561
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
 msgstr ""
 
-#: g10/g10.c:1544
+#: g10/g10.c:1567
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr ""
 
-#: g10/g10.c:1552
+#: g10/g10.c:1575
 msgid "a notation value must not use any control characters\n"
 msgstr ""
 
@@ -889,12 +889,19 @@ msgstr ""
 "caract�re cit�-imprimable (quoted-printable) dans l'armure provenant\n"
 "certainement d'un agent de transfert de messages bogu�\n"
 
+#. Translators: this shoud fit into 24 bytes to that the fingerprint
+#. * data is properly aligned with the user ID
+#: g10/pkclist.c:53
+#, fuzzy
+msgid "             Fingerprint:"
+msgstr "                      import�e : %lu"
+
 #. a string with valid answers
-#: g10/pkclist.c:140
+#: g10/pkclist.c:170
 msgid "sSmMqQ"
 msgstr "sSmMqQ"
 
-#: g10/pkclist.c:144
+#: g10/pkclist.c:174
 #, c-format
 msgid ""
 "No trust value assigned to %lu:\n"
@@ -903,7 +910,7 @@ msgstr ""
 "Pas de confiance d�finie pour %lu :\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:154
+#: g10/pkclist.c:186
 msgid ""
 "Please decide how far you trust this user to correctly\n"
 "verify other users' keys (by looking at passports,\n"
@@ -927,23 +934,23 @@ msgstr ""
 " 4 = je le crois totalement\n"
 " s = montrez-moi plus d'informations\n"
 
-#: g10/pkclist.c:163
+#: g10/pkclist.c:195
 msgid " m = back to the main menu\n"
 msgstr " m = retour au menu principal\n"
 
-#: g10/pkclist.c:165
+#: g10/pkclist.c:197
 msgid " q = quit\n"
 msgstr " q = quitter\n"
 
-#: g10/pkclist.c:171
+#: g10/pkclist.c:203
 msgid "Your decision? "
 msgstr "Votre d�cision ? "
 
-#: g10/pkclist.c:193
+#: g10/pkclist.c:225
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certificats conduisant vers une cl� � confiance ultime :\n"
 
-#: g10/pkclist.c:264
+#: g10/pkclist.c:296
 msgid ""
 "Could not find a valid trust path to the key.  Let's see whether we\n"
 "can assign some missing owner trust values.\n"
@@ -952,7 +959,7 @@ msgstr ""
 "N'a pas pu trouver un chemin de confiance valide jusqu'� la cl�. Voyons si\n"
 "nous ne pouvons pas assigner quelques indices de confiance manquants.\n"
 
-#: g10/pkclist.c:270
+#: g10/pkclist.c:302
 msgid ""
 "No path leading to one of our keys found.\n"
 "\n"
@@ -960,7 +967,7 @@ msgstr ""
 "Aucun chemin menant vers une de nos cl�s n'a �t� trouv�.\n"
 "\n"
 
-#: g10/pkclist.c:272
+#: g10/pkclist.c:304
 msgid ""
 "No certificates with undefined trust found.\n"
 "\n"
@@ -968,7 +975,7 @@ msgstr ""
 "Aucun certificat � confiance ind�finie n'a �t� trouv�.\n"
 "\n"
 
-#: g10/pkclist.c:274
+#: g10/pkclist.c:306
 msgid ""
 "No trust values changed.\n"
 "\n"
@@ -976,36 +983,36 @@ msgstr ""
 "Pas d'indice de confiance chang�.\n"
 "\n"
 
-#: g10/pkclist.c:291
+#: g10/pkclist.c:323
 #, c-format
 msgid "key %08lX: key has been revoked!\n"
 msgstr "cl� %08lX : la cl� a �t� r�voqu�e !\n"
 
-#: g10/pkclist.c:297 g10/pkclist.c:307 g10/pkclist.c:413
+#: g10/pkclist.c:329 g10/pkclist.c:339 g10/pkclist.c:448
 msgid "Use this key anyway? "
 msgstr "Utiliser cette cl� quand-m�me ? "
 
-#: g10/pkclist.c:301
+#: g10/pkclist.c:333
 #, c-format
 msgid "key %08lX: subkey has been revoked!\n"
 msgstr "cl� %08lX : la sous-cl� a �t� r�voqu�e !\n"
 
-#: g10/pkclist.c:331
+#: g10/pkclist.c:363
 #, c-format
 msgid "%08lX: key has expired\n"
 msgstr "%08lX : la cl� a expir�\n"
 
-#: g10/pkclist.c:337
+#: g10/pkclist.c:369
 #, c-format
 msgid "%08lX: no info to calculate a trust probability\n"
 msgstr "%08lX : pas d'information pour calculer une probabilit� de confiance\n"
 
-#: g10/pkclist.c:351
+#: g10/pkclist.c:383
 #, c-format
 msgid "%08lX: We do NOT trust this key\n"
 msgstr "%08lX : Nous ne faisons PAS confiance � cette cl�\n"
 
-#: g10/pkclist.c:357
+#: g10/pkclist.c:389
 #, c-format
 msgid ""
 "%08lX: It is not sure that this key really belongs to the owner\n"
@@ -1015,15 +1022,15 @@ msgstr ""
 "propri�taire\n"
 "mais elle est quand m�me accept�e\n"
 
-#: g10/pkclist.c:363
+#: g10/pkclist.c:395
 msgid "This key probably belongs to the owner\n"
 msgstr "Cette cl� appartient probablement � son propri�taire\n"
 
-#: g10/pkclist.c:368
+#: g10/pkclist.c:400
 msgid "This key belongs to us\n"
 msgstr "Cette cl� nous appartient\n"
 
-#: g10/pkclist.c:408
+#: g10/pkclist.c:443
 msgid ""
 "It is NOT certain that the key belongs to its owner.\n"
 "If you *really* know what you are doing, you may answer\n"
@@ -1035,67 +1042,67 @@ msgstr ""
 "oui � la prochaine question\n"
 "\n"
 
-#: g10/pkclist.c:421 g10/pkclist.c:443
+#: g10/pkclist.c:456 g10/pkclist.c:478
 msgid "WARNING: Using untrusted key!\n"
 msgstr "ATTENTION : Utilisation d'une cl� sans confiance !\n"
 
-#: g10/pkclist.c:464
+#: g10/pkclist.c:499
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "ATTENTION : Cette cl� � �t� r�voqu�e par son propri�taire !\n"
 
-#: g10/pkclist.c:465
+#: g10/pkclist.c:500
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "         Cela pourrait signifier que la signature est fausse.\n"
 
-#: g10/pkclist.c:469
+#: g10/pkclist.c:504
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "ATTENTION : Cette sous-cl� � �t� r�voqu�e par son propri�taire !\n"
 
-#: g10/pkclist.c:490
+#: g10/pkclist.c:525
 msgid "Note: This key has expired!\n"
 msgstr "Note : Cette cl� a expir� !\n"
 
-#: g10/pkclist.c:497
+#: g10/pkclist.c:532
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr ""
 "ATTENTION : Cette cl� n'est pas certifi�e avec une signature de confiance !\n"
 
-#: g10/pkclist.c:499
+#: g10/pkclist.c:534
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "         Rien ne dit que la signature appartient � son propri�taire.\n"
 
-#: g10/pkclist.c:515
+#: g10/pkclist.c:550
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "ATTENTION : Nous ne faisons PAS confiance � cette cl� !\n"
 
-#: g10/pkclist.c:516
+#: g10/pkclist.c:551
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         La signature est certainement FAUSSE.\n"
 
-#: g10/pkclist.c:523
+#: g10/pkclist.c:558
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "ATTENTION : Les signatures de cette cl� n'ont pas une confiance suffisante "
 "!\n"
 
-#: g10/pkclist.c:526
+#: g10/pkclist.c:561
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr ""
 "         Il n'est pas s�r que la signature appartient � son propri�taire.\n"
 
-#: g10/pkclist.c:627 g10/pkclist.c:649 g10/pkclist.c:758 g10/pkclist.c:803
+#: g10/pkclist.c:662 g10/pkclist.c:684 g10/pkclist.c:793 g10/pkclist.c:838
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s : ignor� : %s\n"
 
-#: g10/pkclist.c:635 g10/pkclist.c:785
+#: g10/pkclist.c:670 g10/pkclist.c:820
 #, fuzzy, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s : probl�me de lecture du bloc de cl�s : %s\n"
 
-#: g10/pkclist.c:662
+#: g10/pkclist.c:697
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1104,34 +1111,34 @@ msgstr ""
 "\"-r\")\n"
 "\n"
 
-#: g10/pkclist.c:672
+#: g10/pkclist.c:707
 msgid "Enter the user ID: "
 msgstr "Entrez le nom d'utilisateur : "
 
-#: g10/pkclist.c:684
+#: g10/pkclist.c:719
 msgid "No such user ID.\n"
 msgstr "Pas de tel utilisateur.\n"
 
-#: g10/pkclist.c:704
+#: g10/pkclist.c:739
 #, fuzzy
 msgid "Public key is disabled.\n"
 msgstr "la cl� publique est %08lX\n"
 
-#: g10/pkclist.c:733
+#: g10/pkclist.c:768
 msgid "unknown default recipient `s'\n"
 msgstr ""
 
-#: g10/pkclist.c:766
+#: g10/pkclist.c:801
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s : erreur pendant la v�rification de la cl� : %s\n"
 
-#: g10/pkclist.c:771
+#: g10/pkclist.c:806
 #, fuzzy, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s : probl�me de lecture du bloc de cl�s : %s\n"
 
-#: g10/pkclist.c:809
+#: g10/pkclist.c:844
 msgid "no valid addressees\n"
 msgstr "pas de destinataire valide\n"
 
@@ -1519,245 +1526,250 @@ msgstr "trop d'entr�es dans le cache pk - d�sactiv�\n"
 msgid "too many entries in unk cache - disabled\n"
 msgstr "trop d'entr�es dans le cache unk - d�sactiv�\n"
 
-#: g10/getkey.c:1535 g10/getkey.c:1591
+#: g10/getkey.c:1565 g10/getkey.c:1621
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr ""
 "utilisation de la cl� secondaire %08lX � la place de la cl�\n"
 "principale %08lX\n"
 
-#: g10/import.c:117
+#: g10/import.c:118
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossible d'ouvrir `%s': %s\n"
 
-#: g10/import.c:161
+#: g10/import.c:162
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "ne prend pas en compte le bloc de type %d\n"
 
-#: g10/import.c:168 g10/trustdb.c:1658 g10/trustdb.c:1697
+#: g10/import.c:169 g10/trustdb.c:1658 g10/trustdb.c:1697
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu cl�s trait�es jusqu'ici\n"
 
-#: g10/import.c:173
+#: g10/import.c:174
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erreur pendant la lecture de `%s' : %s\n"
 
-#: g10/import.c:176
+#: g10/import.c:177
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "       Quantit� totale trait�e : %lu\n"
 
-#: g10/import.c:178
+#: g10/import.c:179
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "        sans nom d'utilisateur : %lu\n"
 
-#: g10/import.c:180
+#: g10/import.c:181
 #, c-format
 msgid "              imported: %lu"
 msgstr "                      import�e : %lu"
 
-#: g10/import.c:186
+#: g10/import.c:187
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                     inchang�e : %lu\n"
 
-#: g10/import.c:188
+#: g10/import.c:189
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "  nouveaux noms d'utilisateurs : %lu\n"
 
-#: g10/import.c:190
+#: g10/import.c:191
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           nouvelles sous-cl�s : %lu\n"
 
-#: g10/import.c:192
+#: g10/import.c:193
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "          nouvelles signatures : %lu\n"
 
-#: g10/import.c:194
+#: g10/import.c:195
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr " nouvelles r�vocations de cl�s : %lu\n"
 
-#: g10/import.c:196
+#: g10/import.c:197
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "            cl�s secr�tes lues : %lu\n"
 
-#: g10/import.c:198
+#: g10/import.c:199
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "       cl�s secr�tes import�es : %lu\n"
 
-#: g10/import.c:200
+#: g10/import.c:201
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "      cl�s secr�tes inchang�es : %lu\n"
 
-#: g10/import.c:361 g10/import.c:550
+#: g10/import.c:362 g10/import.c:554
 #, c-format
 msgid "key %08lX: no user id\n"
 msgstr "cl� %08lX : pas de nom d'utilisateur\n"
 
-#: g10/import.c:372
+#: g10/import.c:376
 #, c-format
 msgid "key %08lX: no valid user ids\n"
 msgstr "cl� %08lX : pas de nom d'utilisateur valide\n"
 
-#: g10/import.c:374
+#: g10/import.c:378
 msgid "this may be caused by a missing self-signature\n"
 msgstr "cela peut provenir d'une auto-signature manquante\n"
 
-#: g10/import.c:385 g10/import.c:617
+#: g10/import.c:389 g10/import.c:621
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "cl� %08lX : cl� publique pas trouv�e: %s\n"
 
-#: g10/import.c:391
+#: g10/import.c:395
 msgid "no default public keyring\n"
 msgstr "pas de porte-cl�s public par d�faut\n"
 
-#: g10/import.c:395 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:559
+#: g10/import.c:399 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:559
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "�criture de `%s'\n"
 
-#: g10/import.c:398 g10/import.c:456 g10/import.c:565 g10/import.c:666
+#: g10/import.c:402 g10/import.c:460 g10/import.c:569 g10/import.c:670
 #, c-format
 msgid "can't lock keyring `%s': %s\n"
 msgstr "ne peut verrouiller le porte-cl�s `%s' : %s\n"
 
-#: g10/import.c:401 g10/import.c:459 g10/import.c:568 g10/import.c:669
+#: g10/import.c:405 g10/import.c:463 g10/import.c:572 g10/import.c:673
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erreur durant l'�criture du porte-cl�s `%s' : %s\n"
 
-#: g10/import.c:406
+#: g10/import.c:410
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "cl� %08lX : cl� publique import�e\n"
 
-#: g10/import.c:423
+#: g10/import.c:427
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "cl� %08lX : ne ressemble pas � notre copie\n"
 
-#: g10/import.c:432 g10/import.c:625
+#: g10/import.c:436 g10/import.c:629
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "cl� %08lX : ne peut trouver le bloc de cl�s original : %s\n"
 
-#: g10/import.c:438 g10/import.c:631
+#: g10/import.c:442 g10/import.c:635
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "cl� %08lX : ne peut lire le bloc de cl�s original : %s\n"
 
-#: g10/import.c:465
+#: g10/import.c:469
 #, c-format
 msgid "key %08lX: 1 new user-id\n"
 msgstr "cl� %08lX : un nouvel utilisateur\n"
 
-#: g10/import.c:468
+#: g10/import.c:472
 #, c-format
 msgid "key %08lX: %d new user-ids\n"
 msgstr "cl� %08lX : %d nouveaux utilisateurs\n"
 
-#: g10/import.c:471
+#: g10/import.c:475
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "cl� %08lX : une nouvelle signature\n"
 
-#: g10/import.c:474
+#: g10/import.c:478
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "cl� %08lX : %d nouvelles signatures\n"
 
-#: g10/import.c:477
+#: g10/import.c:481
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "cl� %08lX : une nouvelle sous-cl�\n"
 
-#: g10/import.c:480
+#: g10/import.c:484
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "cl� %08lX : %d nouvelles sous-cl�s\n"
 
-#: g10/import.c:490
+#: g10/import.c:494
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "cl� %08lX : n'a pas chang�\n"
 
-#: g10/import.c:573
+#: g10/import.c:577
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "cl� %08lX : cl� secr�te import�e\n"
 
 #. we can't merge secret keys
-#: g10/import.c:577
+#: g10/import.c:581
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "cl� %08lX : d�j� dans le porte-cl�s secret\n"
 
-#: g10/import.c:582
+#: g10/import.c:586
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "cl� %08lX : cl� secr�te pas trouv�e: %s\n"
 
-#: g10/import.c:611
+#: g10/import.c:615
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "cl� %08lX : pas de cl� publique - ne peut appliquer le certificat de\n"
 "r�vocation\n"
 
-#: g10/import.c:642
+#: g10/import.c:646
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "cl� %08lX : certificat de r�vocation invalide : %s - rejet�\n"
 
-#: g10/import.c:674
+#: g10/import.c:678
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "cl� %08lX : certificat de r�vocation import�\n"
 
-#: g10/import.c:707
+#: g10/import.c:711
 #, c-format
 msgid "key %08lX: no user-id for signature\n"
 msgstr "cl� %08lX : pas d'utilisateur pour la signature\n"
 
-#: g10/import.c:714 g10/import.c:738
+#: g10/import.c:718 g10/import.c:742
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "cl� %08lX : algorithme de cl� publique non support�\n"
 
-#: g10/import.c:715
+#: g10/import.c:719
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "cl� %08lX : auto-signature invalide\n"
 
-#: g10/import.c:730
+#: g10/import.c:734
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "cl� %08lX : pas de sous-cl� pour relier la cl�\n"
 
-#: g10/import.c:739
+#: g10/import.c:743
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "cl� %08lX : liaison avec la sous-cl� invalide\n"
 
-#: g10/import.c:771
+#: g10/import.c:769
+#, fuzzy, c-format
+msgid "key %08lX: accepted non self-signed userid '"
+msgstr "cl� %08lX : utilisateur non pris en compte '"
+
+#: g10/import.c:798
 #, c-format
 msgid "key %08lX: skipped userid '"
 msgstr "cl� %08lX : utilisateur non pris en compte '"
 
-#: g10/import.c:794
+#: g10/import.c:821
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "cl� %08lX : sous-cl� non prise en compte\n"
@@ -1766,32 +1778,32 @@ msgstr "cl� %08lX : sous-cl� non prise en compte\n"
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:819
+#: g10/import.c:846
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "cl� %08lX : signature non exportable (classe %02x) - ignor�e\n"
 
-#: g10/import.c:828
+#: g10/import.c:855
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "cl� %08lX : certificat de r�vocation au mauvais endroit - ignor�e\n"
 
-#: g10/import.c:836
+#: g10/import.c:863
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "cl� %08lX : certificat de r�vocation invalide : %s - ignor�e\n"
 
-#: g10/import.c:936
+#: g10/import.c:963
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "cl� %08lX: nom d'utilisateur doublon fusionn�\n"
 
-#: g10/import.c:987
+#: g10/import.c:1014
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "cl� %08lX : certificat de r�vocation ajout�\n"
 
-#: g10/import.c:1100 g10/import.c:1155
+#: g10/import.c:1127 g10/import.c:1182
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "cl� %08lX : notre copie n'a pas d'auto-signature\n"
@@ -2353,78 +2365,78 @@ msgstr "Signature faite %.*s avec une cl� %s ID %08lX\n"
 msgid "no secret key for decryption available\n"
 msgstr "la cl� secr�te n'est pas disponible"
 
-#: g10/mainproc.c:293
+#: g10/mainproc.c:300
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "le d�chiffrement de la cl� publique a �chou� : %s\n"
 
-#: g10/mainproc.c:323
+#: g10/mainproc.c:330
 msgid "decryption okay\n"
 msgstr "le d�chiffrement a r�ussi\n"
 
-#: g10/mainproc.c:328
+#: g10/mainproc.c:335
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATTENTION: le message chiffr� a �t� manipul� !\n"
 
-#: g10/mainproc.c:333
+#: g10/mainproc.c:340
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "le d�chiffrement a �chou� : %s\n"
 
-#: g10/mainproc.c:351
+#: g10/mainproc.c:358
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTE : l'exp�diteur a demand� � pour vos yeux seulement �\n"
 
-#: g10/mainproc.c:353
+#: g10/mainproc.c:360
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nom de fichier original : '%.*s'\n"
 
-#: g10/mainproc.c:580 g10/mainproc.c:589
+#: g10/mainproc.c:587 g10/mainproc.c:596
 #, fuzzy
 msgid "WARNING: invalid notation data found\n"
 msgstr "aucune donn�e OpenPGP valide n'a �t� trouv�e.\n"
 
-#: g10/mainproc.c:592
+#: g10/mainproc.c:599
 msgid "Notation: "
 msgstr ""
 
-#: g10/mainproc.c:599
+#: g10/mainproc.c:606
 msgid "Policy: "
 msgstr ""
 
-#: g10/mainproc.c:1018
+#: g10/mainproc.c:1025
 msgid "signature verification suppressed\n"
 msgstr "v�rification de signature supprim�e\n"
 
-#: g10/mainproc.c:1024
+#: g10/mainproc.c:1031
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Signature faite %.*s avec une cl� %s ID %08lX\n"
 
 #. just in case that we have no userid
-#: g10/mainproc.c:1050 g10/mainproc.c:1061
+#: g10/mainproc.c:1057 g10/mainproc.c:1068
 msgid "BAD signature from \""
 msgstr "MAUVAISE signature de \""
 
-#: g10/mainproc.c:1051 g10/mainproc.c:1062
+#: g10/mainproc.c:1058 g10/mainproc.c:1069
 msgid "Good signature from \""
 msgstr "Bonne signature de \""
 
-#: g10/mainproc.c:1053
+#: g10/mainproc.c:1060
 msgid "                aka \""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1104
+#: g10/mainproc.c:1115
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Ne peut v�rifier la signature : %s\n"
 
-#: g10/mainproc.c:1198
+#: g10/mainproc.c:1209
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signature d'un ancien style (PGP 2.x)\n"
 
-#: g10/mainproc.c:1203
+#: g10/mainproc.c:1214
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquet racine invalide d�tect� dans proc_tree()\n"
 
@@ -2647,7 +2659,7 @@ msgstr "%s : r�pertoire cr��\n"
 msgid "%s: directory does not exist!\n"
 msgstr "%s : le r�pertoire n'existe pas !\n"
 
-#: g10/openfile.c:182 g10/openfile.c:253 g10/ringedit.c:1344 g10/tdbio.c:457
+#: g10/openfile.c:182 g10/openfile.c:253 g10/ringedit.c:1346 g10/tdbio.c:457
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s : ne peut cr�er : %s\n"
@@ -3054,27 +3066,27 @@ msgstr ""
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s : ne peut cr�er le porte-cl�s : %s\n"
 
-#: g10/ringedit.c:333 g10/ringedit.c:1349
+#: g10/ringedit.c:333 g10/ringedit.c:1351
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s : porte-cl�s cr��\n"
 
-#: g10/ringedit.c:1526
+#: g10/ringedit.c:1528
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr ""
 "ATTENTION : 2 fichiers avec des informations confidentielles existent.\n"
 
-#: g10/ringedit.c:1527
+#: g10/ringedit.c:1529
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s est le fichier original\n"
 
-#: g10/ringedit.c:1528
+#: g10/ringedit.c:1530
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s est le nouveau\n"
 
-#: g10/ringedit.c:1529
+#: g10/ringedit.c:1531
 msgid "Please fix this possible security flaw\n"
 msgstr "R�parez ce probl�me de s�curit� possible\n"
 
diff --git a/po/it.po b/po/it.po
index 2d8a09ecc..66153ec3b 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-0.9.7\n"
-"POT-Creation-Date: 1999-07-14 11:47+0200\n"
+"POT-Creation-Date: 1999-07-23 12:13+0200\n"
 "PO-Revision-Date: 1999-06-28 19:49+02:00\n"
 "Last-Translator: Marco d'Itri <[email protected]>\n"
 "Language-Team: Italian <[email protected]>\n"
@@ -271,7 +271,7 @@ msgstr ""
 "altra cosa per dare all'OS la possibilit� di raccogliere altra entropia!\n"
 "(Servono ancora %d altri byte)\n"
 
-#: g10/g10.c:180
+#: g10/g10.c:183
 msgid ""
 "@Commands:\n"
 " "
@@ -279,138 +279,138 @@ msgstr ""
 "@Comandi:\n"
 " "
 
-#: g10/g10.c:182
+#: g10/g10.c:185
 msgid "|[file]|make a signature"
 msgstr "|[file]|fai una firma"
 
-#: g10/g10.c:183
+#: g10/g10.c:186
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|fai una firma mantenendo il testo in chiaro"
 
-#: g10/g10.c:184
+#: g10/g10.c:187
 msgid "make a detached signature"
 msgstr "fai una firma separata"
 
-#: g10/g10.c:185
+#: g10/g10.c:188
 msgid "encrypt data"
 msgstr "cifra dati"
 
-#: g10/g10.c:186
+#: g10/g10.c:189
 msgid "encryption only with symmetric cipher"
 msgstr "cifra solo con un cifrario simmetrico"
 
-#: g10/g10.c:187
+#: g10/g10.c:190
 msgid "store only"
 msgstr "immagazzina soltanto"
 
-#: g10/g10.c:188
+#: g10/g10.c:191
 msgid "decrypt data (default)"
 msgstr "decifra dati (predefinito)"
 
-#: g10/g10.c:189
+#: g10/g10.c:192
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/g10.c:190
+#: g10/g10.c:193
 msgid "list keys"
 msgstr "elenca le chiavi"
 
-#: g10/g10.c:192
+#: g10/g10.c:195
 msgid "list keys and signatures"
 msgstr "elenca le chiavi e le firme"
 
-#: g10/g10.c:193
+#: g10/g10.c:196
 msgid "check key signatures"
 msgstr "controlla le firme delle chiavi"
 
-#: g10/g10.c:194
+#: g10/g10.c:197
 msgid "list keys and fingerprints"
 msgstr "elenca le chiavi e le impronte digitali"
 
-#: g10/g10.c:195
+#: g10/g10.c:198
 msgid "list secret keys"
 msgstr "elenca le chiavi segrete"
 
-#: g10/g10.c:196
+#: g10/g10.c:199
 msgid "generate a new key pair"
 msgstr "genera una nuova coppia di chiavi"
 
-#: g10/g10.c:197
+#: g10/g10.c:200
 msgid "remove key from the public keyring"
 msgstr "rimuove una chiave dal portachiavi pubblico"
 
-#: g10/g10.c:198
+#: g10/g10.c:201
 #, fuzzy
 msgid "sign a key"
 msgstr "firma la chiave"
 
-#: g10/g10.c:199
+#: g10/g10.c:202
 #, fuzzy
 msgid "sign a key locally"
 msgstr "firma la chiave localmente"
 
-#: g10/g10.c:200
+#: g10/g10.c:203
 msgid "sign or edit a key"
 msgstr "firma o modifica una chiave"
 
-#: g10/g10.c:201
+#: g10/g10.c:204
 msgid "generate a revocation certificate"
 msgstr "genera un certificato di revoca"
 
-#: g10/g10.c:202
+#: g10/g10.c:205
 msgid "export keys"
 msgstr "esporta delle chiavi"
 
-#: g10/g10.c:203
+#: g10/g10.c:206
 msgid "export keys to a key server"
 msgstr "esporta le chiavi a un key server"
 
-#: g10/g10.c:204
+#: g10/g10.c:207
 msgid "import keys from a key server"
 msgstr "importa le chiavi da un key server"
 
-#: g10/g10.c:207
+#: g10/g10.c:210
 msgid "import/merge keys"
 msgstr "importa/aggiungi delle chiavi"
 
-#: g10/g10.c:209
+#: g10/g10.c:212
 msgid "list only the sequence of packets"
 msgstr "elenca solo la sequenza dei pacchetti"
 
-#: g10/g10.c:211
+#: g10/g10.c:214
 msgid "export the ownertrust values"
 msgstr "esporta i valori di fiducia"
 
-#: g10/g10.c:213
+#: g10/g10.c:216
 msgid "import ownertrust values"
 msgstr "importa i valori di fiducia"
 
-#: g10/g10.c:215
+#: g10/g10.c:218
 #, fuzzy
 msgid "update the trust database"
 msgstr "|[NOMI]|controlla il database della fiducia"
 
-#: g10/g10.c:217
+#: g10/g10.c:220
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMI]|controlla il database della fiducia"
 
-#: g10/g10.c:218
+#: g10/g10.c:221
 msgid "fix a corrupted trust database"
 msgstr "ripara un database della fiducia rovinato"
 
-#: g10/g10.c:219
+#: g10/g10.c:222
 msgid "De-Armor a file or stdin"
 msgstr "rimuovi l'armatura a un file o a stdin"
 
-#: g10/g10.c:220
+#: g10/g10.c:223
 msgid "En-Armor a file or stdin"
 msgstr "crea l'armatura a un file o a stdin"
 
-#: g10/g10.c:221
+#: g10/g10.c:224
 msgid "|algo [files]|print message digests"
 msgstr "|algo [files]|stampa tutti i message digests"
 
-#: g10/g10.c:225
+#: g10/g10.c:228
 msgid ""
 "@\n"
 "Options:\n"
@@ -420,169 +420,169 @@ msgstr ""
 "Opzioni:\n"
 " "
 
-#: g10/g10.c:227
+#: g10/g10.c:230
 msgid "create ascii armored output"
 msgstr "crea un output ascii con armatura"
 
-#: g10/g10.c:228
+#: g10/g10.c:231
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifra per NOME"
 
-#: g10/g10.c:231
+#: g10/g10.c:234
 #, fuzzy
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAME|usa NAME come chiave segreta predefinita"
 
-#: g10/g10.c:233
+#: g10/g10.c:236
 msgid "use the default key as default recipient"
 msgstr ""
 
-#: g10/g10.c:237
+#: g10/g10.c:240
 msgid "use this user-id to sign or decrypt"
 msgstr "usa questo user-id per firmare o decifrare"
 
-#: g10/g10.c:238
+#: g10/g10.c:241
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|imposta il livello di compressione (0 disabilita)"
 
-#: g10/g10.c:240
+#: g10/g10.c:243
 msgid "use canonical text mode"
 msgstr "usa il modo testo canonico"
 
-#: g10/g10.c:241
+#: g10/g10.c:244
 msgid "use as output file"
 msgstr "usa come file di output"
 
-#: g10/g10.c:242
+#: g10/g10.c:245
 msgid "verbose"
 msgstr "prolisso"
 
-#: g10/g10.c:243
+#: g10/g10.c:246
 msgid "be somewhat more quiet"
 msgstr "meno prolisso"
 
-#: g10/g10.c:244
+#: g10/g10.c:247
 msgid "don't use the terminal at all"
 msgstr "non usa per niente il terminale"
 
-#: g10/g10.c:245
+#: g10/g10.c:248
 msgid "force v3 signatures"
 msgstr "forza l'uso di firme v3"
 
-#: g10/g10.c:246
+#: g10/g10.c:249
 msgid "always use a MDC for encryption"
 msgstr "usa sempre un MDC per cifrare"
 
-#: g10/g10.c:247
+#: g10/g10.c:250
 msgid "do not make any changes"
 msgstr "non fa cambiamenti"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:249
+#: g10/g10.c:252
 msgid "batch mode: never ask"
 msgstr "modo batch: non fare domande"
 
-#: g10/g10.c:250
+#: g10/g10.c:253
 msgid "assume yes on most questions"
 msgstr "assumi \"s�\" a quasi tutte le domande"
 
-#: g10/g10.c:251
+#: g10/g10.c:254
 msgid "assume no on most questions"
 msgstr "assumi \"no\" a quasi tutte le domande"
 
-#: g10/g10.c:252
+#: g10/g10.c:255
 msgid "add this keyring to the list of keyrings"
 msgstr "aggiungi questo portachiavi alla lista"
 
-#: g10/g10.c:253
+#: g10/g10.c:256
 msgid "add this secret keyring to the list"
 msgstr "aggiungi questo portachiavi segreto alla lista"
 
-#: g10/g10.c:254
+#: g10/g10.c:257
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|usa NAME come chiave segreta predefinita"
 
-#: g10/g10.c:255
+#: g10/g10.c:258
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|cerca le chiavi in questo keyserver"
 
-#: g10/g10.c:256
+#: g10/g10.c:259
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAME|imposta il set di caratteri del terminale NOME"
 
-#: g10/g10.c:257
+#: g10/g10.c:260
 msgid "read options from file"
 msgstr "leggi le opzioni dal file"
 
-#: g10/g10.c:259
+#: g10/g10.c:262
 msgid "set debugging flags"
 msgstr "imposta i flag di debugging"
 
-#: g10/g10.c:260
+#: g10/g10.c:263
 msgid "enable full debugging"
 msgstr "abilita il debugging completo"
 
-#: g10/g10.c:261
+#: g10/g10.c:264
 msgid "|FD|write status info to this FD"
 msgstr "|FD|scrivi le informazioni di stato su questo fd"
 
-#: g10/g10.c:262
+#: g10/g10.c:265
 msgid "do not write comment packets"
 msgstr "non scrivere pacchetti di commento"
 
-#: g10/g10.c:263
+#: g10/g10.c:266
 msgid "(default is 1)"
 msgstr "(predefinito � 1)"
 
-#: g10/g10.c:264
+#: g10/g10.c:267
 msgid "(default is 3)"
 msgstr "(predefinito � 3)"
 
-#: g10/g10.c:266
+#: g10/g10.c:269
 msgid "|FILE|load extension module FILE"
 msgstr "|FILE|carica il modulo di estensione FILE"
 
-#: g10/g10.c:267
+#: g10/g10.c:270
 msgid "emulate the mode described in RFC1991"
 msgstr "emula il modo descritto in RFC 1991"
 
-#: g10/g10.c:268
+#: g10/g10.c:271
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr "imposta per OpenPGP le opzioni di pacchetto, cifrario e digest"
 
-#: g10/g10.c:269
+#: g10/g10.c:272
 msgid "|N|use passphrase mode N"
 msgstr "|N|usa il modo N per la passphrase"
 
-#: g10/g10.c:271
+#: g10/g10.c:274
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|NAME|usa l'algoritmo di message digest NOME"
 
-#: g10/g10.c:273
+#: g10/g10.c:276
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|NAME|usa l'alg. di cifratura NOME per le passphrase"
 
-#: g10/g10.c:274
+#: g10/g10.c:277
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|usa l'algoritmo di cifratura NOME"
 
-#: g10/g10.c:275
+#: g10/g10.c:278
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|usa l'algoritmo di message digest NOME"
 
-#: g10/g10.c:276
+#: g10/g10.c:279
 msgid "|N|use compress algorithm N"
 msgstr "|N|usa l'algoritmo di compressione N"
 
-#: g10/g10.c:277
+#: g10/g10.c:280
 msgid "throw keyid field of encrypted packets"
 msgstr "elimina il campo keyid dei pacchetti cifrati"
 
-#: g10/g10.c:278
+#: g10/g10.c:281
 msgid "|NAME=VALUE|use this notation data"
 msgstr "|NOME=VALORE|usa questi dati per una nota"
 
-#: g10/g10.c:280
+#: g10/g10.c:283
 msgid ""
 "@\n"
 "Examples:\n"
@@ -602,15 +602,15 @@ msgstr ""
 " --list-keys [nomi]         mostra le chiavi\n"
 " --fingerprint [nomi]       mostra le impronte digitali\n"
 
-#: g10/g10.c:360
+#: g10/g10.c:366
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Per favore segnala i bug a <[email protected]>.\n"
 
-#: g10/g10.c:364
+#: g10/g10.c:370
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opzioni] [file] (-h per l'aiuto)"
 
-#: g10/g10.c:367
+#: g10/g10.c:373
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -620,7 +620,7 @@ msgstr ""
 "firma, controlla, cifra o decifra\n"
 "l'operazione predefinita dipende dai dati di input\n"
 
-#: g10/g10.c:372
+#: g10/g10.c:378
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -628,173 +628,173 @@ msgstr ""
 "\n"
 "Algoritmi gestiti:\n"
 
-#: g10/g10.c:446
+#: g10/g10.c:452
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [options] "
 
-#: g10/g10.c:499
+#: g10/g10.c:505
 msgid "conflicting commands\n"
 msgstr "comandi in conflitto\n"
 
-#: g10/g10.c:633
+#: g10/g10.c:640
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: manca il file con le opzioni predefinite `%s'\n"
 
-#: g10/g10.c:637
+#: g10/g10.c:644
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file con le opzioni `%s': %s\n"
 
-#: g10/g10.c:644
+#: g10/g10.c:651
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lettura delle opzioni da `%s'\n"
 
-#: g10/g10.c:824
+#: g10/g10.c:831
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/g10.c:872 g10/g10.c:884
+#: g10/g10.c:895 g10/g10.c:907
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non � valido\n"
 
-#: g10/g10.c:878 g10/g10.c:890
+#: g10/g10.c:901 g10/g10.c:913
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non � valido\n"
 
-#: g10/g10.c:894
+#: g10/g10.c:917
 msgid "the given policy URL is invalid\n"
 msgstr "L'URL della policy indicato non � valido\n"
 
-#: g10/g10.c:897
+#: g10/g10.c:920
 #, 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:899
+#: g10/g10.c:922
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve essere maggiore di 0\n"
 
-#: g10/g10.c:901
+#: g10/g10.c:924
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve essere maggiore di 1\n"
 
-#: g10/g10.c:903
+#: g10/g10.c:926
 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:906
+#: g10/g10.c:929
 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:910
+#: g10/g10.c:933
 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:987
+#: g10/g10.c:1010
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: g10/g10.c:993
+#: g10/g10.c:1016
 msgid "--store [filename]"
 msgstr "--store [nomefile]"
 
-#: g10/g10.c:1000
+#: g10/g10.c:1023
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nomefile]"
 
-#: g10/g10.c:1008
+#: g10/g10.c:1031
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nomefile]"
 
-#: g10/g10.c:1021
+#: g10/g10.c:1044
 msgid "--sign [filename]"
 msgstr "--sign [nomefile]"
 
-#: g10/g10.c:1034
+#: g10/g10.c:1057
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/g10.c:1048
+#: g10/g10.c:1071
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nomefile]"
 
-#: g10/g10.c:1060
+#: g10/g10.c:1083
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nomefile]"
 
-#: g10/g10.c:1068
+#: g10/g10.c:1091
 msgid "--sign-key user-id"
 msgstr ""
 
-#: g10/g10.c:1076
+#: g10/g10.c:1099
 #, fuzzy
 msgid "--lsign-key user-id"
 msgstr "--delete-key nomeutente"
 
-#: g10/g10.c:1084
+#: g10/g10.c:1107
 #, fuzzy
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key nomeutente [comandi]"
 
-#: g10/g10.c:1100
+#: g10/g10.c:1123
 #, fuzzy
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key nomeutente"
 
-#: g10/g10.c:1103
+#: g10/g10.c:1126
 #, fuzzy
 msgid "--delete-key user-id"
 msgstr "--delete-key nomeutente"
 
-#: g10/encode.c:231 g10/g10.c:1127 g10/sign.c:366
+#: g10/encode.c:231 g10/g10.c:1150 g10/sign.c:366
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "impossibile aprire `%s': %s\n"
 
-#: g10/g10.c:1138
+#: g10/g10.c:1161
 msgid "-k[v][v][v][c] [userid] [keyring]"
 msgstr "-k[v][v][v][c] [userid] [portachiavi]"
 
-#: g10/g10.c:1199
+#: g10/g10.c:1222
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "rimozione dell'armatura fallita: %s\n"
 
-#: g10/g10.c:1207
+#: g10/g10.c:1230
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creazione dell'armatura fallita: %s\n"
 
-#: g10/g10.c:1275
+#: g10/g10.c:1298
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo di hash non valido `%s'\n"
 
-#: g10/g10.c:1356
+#: g10/g10.c:1379
 msgid "[filename]"
 msgstr "[nomefile]"
 
-#: g10/g10.c:1360
+#: g10/g10.c:1383
 msgid "Go ahead and type your message ...\n"
 msgstr "Vai avanti e scrivi il messaggio...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1363 g10/verify.c:66
+#: g10/decrypt.c:59 g10/g10.c:1386 g10/verify.c:66
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossibile aprire `%s'\n"
 
-#: g10/g10.c:1532
+#: g10/g10.c:1555
 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:1538
+#: g10/g10.c:1561
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
@@ -802,11 +802,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:1544
+#: g10/g10.c:1567
 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:1552
+#: g10/g10.c:1575
 msgid "a notation value must not use any control characters\n"
 msgstr "il valore di una nota non deve usare caratteri di controllo\n"
 
@@ -885,14 +885,21 @@ msgstr ""
 "carattere quoted printable nell'armatura - probabilmente � stato usato\n"
 "un MTA buggato\n"
 
+#. Translators: this shoud fit into 24 bytes to that the fingerprint
+#. * data is properly aligned with the user ID
+#: g10/pkclist.c:53
+#, fuzzy
+msgid "             Fingerprint:"
+msgstr "importate: %lu"
+
 # valid user replies (not including 1..4)
 # [Marco, you can change 'm' and 's' to whatever letters you like]
 #. a string with valid answers
-#: g10/pkclist.c:140
+#: g10/pkclist.c:170
 msgid "sSmMqQ"
 msgstr "sSmMqQ"
 
-#: g10/pkclist.c:144
+#: g10/pkclist.c:174
 #, c-format
 msgid ""
 "No trust value assigned to %lu:\n"
@@ -901,7 +908,7 @@ msgstr ""
 "Nessun valore di fiducia assegnato a %lu:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:154
+#: g10/pkclist.c:186
 msgid ""
 "Please decide how far you trust this user to correctly\n"
 "verify other users' keys (by looking at passports,\n"
@@ -923,23 +930,23 @@ msgstr ""
 " 4 = Mi fido completamente\n"
 " s = mostrami ulteriori informazioni\n"
 
-#: g10/pkclist.c:163
+#: g10/pkclist.c:195
 msgid " m = back to the main menu\n"
 msgstr " m = torna al men� principale\n"
 
-#: g10/pkclist.c:165
+#: g10/pkclist.c:197
 msgid " q = quit\n"
 msgstr " q = abbandona\n"
 
-#: g10/pkclist.c:171
+#: g10/pkclist.c:203
 msgid "Your decision? "
 msgstr "Cosa hai deciso? "
 
-#: g10/pkclist.c:193
+#: g10/pkclist.c:225
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certificati che portano a chiavi definitivamente affidabili:\n"
 
-#: g10/pkclist.c:264
+#: g10/pkclist.c:296
 msgid ""
 "Could not find a valid trust path to the key.  Let's see whether we\n"
 "can assign some missing owner trust values.\n"
@@ -949,20 +956,20 @@ msgstr ""
 "se possiamo assegnare qualche valore di fiducia del proprietario mancante.\n"
 "\n"
 
-#: g10/pkclist.c:270
+#: g10/pkclist.c:302
 msgid ""
 "No path leading to one of our keys found.\n"
 "\n"
 msgstr ""
 "Non � stato trovato alcun percorso che porti a una delle nostre chiavi.\n"
 
-#: g10/pkclist.c:272
+#: g10/pkclist.c:304
 msgid ""
 "No certificates with undefined trust found.\n"
 "\n"
 msgstr "Non � stato trovato alcun certificato con fiducia non definita.\n"
 
-#: g10/pkclist.c:274
+#: g10/pkclist.c:306
 msgid ""
 "No trust values changed.\n"
 "\n"
@@ -970,37 +977,37 @@ msgstr ""
 "Nessun valore di fiducia modificato.\n"
 "\n"
 
-#: g10/pkclist.c:291
+#: g10/pkclist.c:323
 #, c-format
 msgid "key %08lX: key has been revoked!\n"
 msgstr "chiave %08lX: la chiave � stata revocata!\n"
 
-#: g10/pkclist.c:297 g10/pkclist.c:307 g10/pkclist.c:413
+#: g10/pkclist.c:329 g10/pkclist.c:339 g10/pkclist.c:448
 msgid "Use this key anyway? "
 msgstr "Uso lo stesso questa chiave? "
 
-#: g10/pkclist.c:301
+#: g10/pkclist.c:333
 #, c-format
 msgid "key %08lX: subkey has been revoked!\n"
 msgstr "chiave %08lX: la subchiave � stata revocata!\n"
 
-#: g10/pkclist.c:331
+#: g10/pkclist.c:363
 #, c-format
 msgid "%08lX: key has expired\n"
 msgstr "%08lX: la chiave � scaduta\n"
 
-#: g10/pkclist.c:337
+#: g10/pkclist.c:369
 #, c-format
 msgid "%08lX: no info to calculate a trust probability\n"
 msgstr ""
 "%08lX: mancano informazioni su come calcolare una probabilit� di fiducia\n"
 
-#: g10/pkclist.c:351
+#: g10/pkclist.c:383
 #, c-format
 msgid "%08lX: We do NOT trust this key\n"
 msgstr "%08lX: NON ci fidiamo di questa chiave!\n"
 
-#: g10/pkclist.c:357
+#: g10/pkclist.c:389
 #, c-format
 msgid ""
 "%08lX: It is not sure that this key really belongs to the owner\n"
@@ -1009,15 +1016,15 @@ msgstr ""
 "%08lX: Non � sicuro che questa chiave appartenga veramente al proprietario\n"
 "ma � accettata comunque\n"
 
-#: g10/pkclist.c:363
+#: g10/pkclist.c:395
 msgid "This key probably belongs to the owner\n"
 msgstr "Questa chiave probabilmente appartiene al proprietario\n"
 
-#: g10/pkclist.c:368
+#: g10/pkclist.c:400
 msgid "This key belongs to us\n"
 msgstr "Questa chiave ci appartiene\n"
 
-#: g10/pkclist.c:408
+#: g10/pkclist.c:443
 msgid ""
 "It is NOT certain that the key belongs to its owner.\n"
 "If you *really* know what you are doing, you may answer\n"
@@ -1029,65 +1036,65 @@ msgstr ""
 "prossima domanda.\n"
 "\n"
 
-#: g10/pkclist.c:421 g10/pkclist.c:443
+#: g10/pkclist.c:456 g10/pkclist.c:478
 msgid "WARNING: Using untrusted key!\n"
 msgstr "ATTENZIONE: uso di una chiave non fidata!\n"
 
-#: g10/pkclist.c:464
+#: g10/pkclist.c:499
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "ATTENZIONE: questa chiave � stata revocata dal suo proprietario!\n"
 
-#: g10/pkclist.c:465
+#: g10/pkclist.c:500
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "         Questo pu� significare che la firma � stata falsificata.\n"
 
-#: g10/pkclist.c:469
+#: g10/pkclist.c:504
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "ATTENZIONE: questa subchiave � stata revocata dal proprietario!\n"
 
-#: g10/pkclist.c:490
+#: g10/pkclist.c:525
 msgid "Note: This key has expired!\n"
 msgstr "Nota: questa chiave � scaduta!\n"
 
-#: g10/pkclist.c:497
+#: g10/pkclist.c:532
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "ATTENZIONE: questa chiave non � certificata con una firma fidata!\n"
 
-#: g10/pkclist.c:499
+#: g10/pkclist.c:534
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         Non ci sono indicazioni che la firma appartenga al proprietario.\n"
 
-#: g10/pkclist.c:515
+#: g10/pkclist.c:550
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "ATTENZIONE: NON ci fidiamo di questa chiave!\n"
 
-#: g10/pkclist.c:516
+#: g10/pkclist.c:551
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "          La firma � probabilmente un FALSO.\n"
 
-#: g10/pkclist.c:523
+#: g10/pkclist.c:558
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "ATTENZIONE: questa chiave non � certificata con firme abbastanza fidate!\n"
 
-#: g10/pkclist.c:526
+#: g10/pkclist.c:561
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         Non � sicuro che la firma appartenga al proprietario.\n"
 
-#: g10/pkclist.c:627 g10/pkclist.c:649 g10/pkclist.c:758 g10/pkclist.c:803
+#: g10/pkclist.c:662 g10/pkclist.c:684 g10/pkclist.c:793 g10/pkclist.c:838
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: saltata: %s\n"
 
-#: g10/pkclist.c:635 g10/pkclist.c:785
+#: g10/pkclist.c:670 g10/pkclist.c:820
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: saltato: chiave pubblica gi� presente\n"
 
-#: g10/pkclist.c:662
+#: g10/pkclist.c:697
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1095,34 +1102,34 @@ msgstr ""
 "Non hai specificato un user ID. (puoi usare \"-r\")\n"
 "\n"
 
-#: g10/pkclist.c:672
+#: g10/pkclist.c:707
 msgid "Enter the user ID: "
 msgstr "Inserisci l'user ID: "
 
-#: g10/pkclist.c:684
+#: g10/pkclist.c:719
 msgid "No such user ID.\n"
 msgstr "User ID inesistente.\n"
 
-#: g10/pkclist.c:704
+#: g10/pkclist.c:739
 #, fuzzy
 msgid "Public key is disabled.\n"
 msgstr "la chiave pubblica � %08lX\n"
 
-#: g10/pkclist.c:733
+#: g10/pkclist.c:768
 msgid "unknown default recipient `s'\n"
 msgstr ""
 
-#: g10/pkclist.c:766
+#: g10/pkclist.c:801
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: errore nel controllare la chiave: %s\n"
 
-#: g10/pkclist.c:771
+#: g10/pkclist.c:806
 #, fuzzy, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: saltato: chiave pubblica gi� presente\n"
 
-#: g10/pkclist.c:809
+#: g10/pkclist.c:844
 msgid "no valid addressees\n"
 msgstr "nessun indirizzo valido\n"
 
@@ -1505,243 +1512,248 @@ msgstr "troppe voci nella pk cache - disabilitata\n"
 msgid "too many entries in unk cache - disabled\n"
 msgstr "troppe voci nella unk cache - disabilitata\n"
 
-#: g10/getkey.c:1535 g10/getkey.c:1591
+#: g10/getkey.c:1565 g10/getkey.c:1621
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "uso la chiave secondaria %08lX invece della chiave primaria %08lX\n"
 
-#: g10/import.c:117
+#: g10/import.c:118
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossibile aprire `%s': %s\n"
 
-#: g10/import.c:161
+#: g10/import.c:162
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "salto un blocco di tipo %d\n"
 
-#: g10/import.c:168 g10/trustdb.c:1658 g10/trustdb.c:1697
+#: g10/import.c:169 g10/trustdb.c:1658 g10/trustdb.c:1697
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "Per ora sono state esaminate %lu chiavi\n"
 
-#: g10/import.c:173
+#: g10/import.c:174
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: g10/import.c:176
+#: g10/import.c:177
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Numero totale esaminato: %lu\n"
 
-#: g10/import.c:178
+#: g10/import.c:179
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "senza user ID: %lu\n"
 
-#: g10/import.c:180
+#: g10/import.c:181
 #, c-format
 msgid "              imported: %lu"
 msgstr "importate: %lu"
 
-#: g10/import.c:186
+#: g10/import.c:187
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "non modificate: %lu\n"
 
-#: g10/import.c:188
+#: g10/import.c:189
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "nuovi user ID: %lu\n"
 
-#: g10/import.c:190
+#: g10/import.c:191
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "nuove subchiavi: %lu\n"
 
-#: g10/import.c:192
+#: g10/import.c:193
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "nuove firme: %lu\n"
 
-#: g10/import.c:194
+#: g10/import.c:195
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "nuove revoche di chiavi: %lu\n"
 
-#: g10/import.c:196
+#: g10/import.c:197
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "chiavi segrete lette: %lu\n"
 
-#: g10/import.c:198
+#: g10/import.c:199
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "chiavi segrete importate %lu\n"
 
-#: g10/import.c:200
+#: g10/import.c:201
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "chiavi segrete non cambiate %lu\n"
 
-#: g10/import.c:361 g10/import.c:550
+#: g10/import.c:362 g10/import.c:554
 #, c-format
 msgid "key %08lX: no user id\n"
 msgstr "chiave %08lX: nessun user id\n"
 
-#: g10/import.c:372
+#: g10/import.c:376
 #, c-format
 msgid "key %08lX: no valid user ids\n"
 msgstr "chiave %08lX: nessun user id valido\n"
 
-#: g10/import.c:374
+#: g10/import.c:378
 msgid "this may be caused by a missing self-signature\n"
 msgstr "questo pu� essere causato da una autofirma mancante\n"
 
-#: g10/import.c:385 g10/import.c:617
+#: g10/import.c:389 g10/import.c:621
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "chiave %08lX: chiave pubblica non trovata: %s\n"
 
-#: g10/import.c:391
+#: g10/import.c:395
 msgid "no default public keyring\n"
 msgstr "nessun portachiavi pubblico predefinito\n"
 
-#: g10/import.c:395 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:559
+#: g10/import.c:399 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:559
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "scrittura in `%s'\n"
 
-#: g10/import.c:398 g10/import.c:456 g10/import.c:565 g10/import.c:666
+#: g10/import.c:402 g10/import.c:460 g10/import.c:569 g10/import.c:670
 #, c-format
 msgid "can't lock keyring `%s': %s\n"
 msgstr "impossibile fare il lock del portachiavi `%s': %s\n"
 
-#: g10/import.c:401 g10/import.c:459 g10/import.c:568 g10/import.c:669
+#: g10/import.c:405 g10/import.c:463 g10/import.c:572 g10/import.c:673
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "errore scrivendo il portachiavi `%s': %s\n"
 
-#: g10/import.c:406
+#: g10/import.c:410
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "chiave %08lX: chiave pubblica importata\n"
 
-#: g10/import.c:423
+#: g10/import.c:427
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "chiave %08lX: non corrisponde alla nostra copia\n"
 
-#: g10/import.c:432 g10/import.c:625
+#: g10/import.c:436 g10/import.c:629
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "chiave %08lX: impossibile individuare il keyblock originale: %s\n"
 
-#: g10/import.c:438 g10/import.c:631
+#: g10/import.c:442 g10/import.c:635
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "chiave %08lX: impossibile leggere il keyblock originale: %s\n"
 
-#: g10/import.c:465
+#: g10/import.c:469
 #, c-format
 msgid "key %08lX: 1 new user-id\n"
 msgstr "chiave %08lX: un nuovo user id\n"
 
-#: g10/import.c:468
+#: g10/import.c:472
 #, c-format
 msgid "key %08lX: %d new user-ids\n"
 msgstr "chiave %08lX: %d nuovi user id\n"
 
-#: g10/import.c:471
+#: g10/import.c:475
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "chiave %08lX: una nuova firma\n"
 
-#: g10/import.c:474
+#: g10/import.c:478
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "chiave %08lX: %d nuove firme\n"
 
-#: g10/import.c:477
+#: g10/import.c:481
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "chiave %08lX: una nuova subchiave\n"
 
-#: g10/import.c:480
+#: g10/import.c:484
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "chiave %08lX: %d nuove subchiavi\n"
 
-#: g10/import.c:490
+#: g10/import.c:494
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "chiave %08lX: non cambiata\n"
 
-#: g10/import.c:573
+#: g10/import.c:577
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "chiave %08lX: chiave segreta importata\n"
 
 #. we can't merge secret keys
-#: g10/import.c:577
+#: g10/import.c:581
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "chiave %08lX: gi� nel portachiavi segreto\n"
 
-#: g10/import.c:582
+#: g10/import.c:586
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "chiave %08lX: chiave segreta non trovata: %s\n"
 
-#: g10/import.c:611
+#: g10/import.c:615
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "chiave %08lX: manca la chiave pubblica - impossibile applicare il\n"
 "certificato di revoca\n"
 
-#: g10/import.c:642
+#: g10/import.c:646
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "chiave %08lX: certificato di revoca non valido: %s - rifiutato\n"
 
-#: g10/import.c:674
+#: g10/import.c:678
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "chiave %08lX: certificato di revoca importato\n"
 
-#: g10/import.c:707
+#: g10/import.c:711
 #, c-format
 msgid "key %08lX: no user-id for signature\n"
 msgstr "chiave %08lX: nessun user id per la firma\n"
 
-#: g10/import.c:714 g10/import.c:738
+#: g10/import.c:718 g10/import.c:742
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "chiave %08lX: algoritmo a chiave pubblica non gestito\n"
 
-#: g10/import.c:715
+#: g10/import.c:719
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "chiave %08lX: autofirma non valida\n"
 
-#: g10/import.c:730
+#: g10/import.c:734
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "chiave %08lX: non ci sono subchiavi per il legame con la chiave\n"
 
-#: g10/import.c:739
+#: g10/import.c:743
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "chiave %08lX: legame con la subchiave non valido:\n"
 
-#: g10/import.c:771
+#: g10/import.c:769
+#, fuzzy, c-format
+msgid "key %08lX: accepted non self-signed userid '"
+msgstr "chiave %08lX: saltato l'user id '"
+
+#: g10/import.c:798
 #, c-format
 msgid "key %08lX: skipped userid '"
 msgstr "chiave %08lX: saltato l'user id '"
 
-#: g10/import.c:794
+#: g10/import.c:821
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "chiave %08lX: saltata la subchiave\n"
@@ -1750,32 +1762,32 @@ msgstr "chiave %08lX: saltata la subchiave\n"
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:819
+#: g10/import.c:846
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "chiave %08lX: firma non esportabile (chiave %02x) - saltata\n"
 
-#: g10/import.c:828
+#: g10/import.c:855
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "chiave %08lX: certificato di revoca nel posto sbagliato - saltato\n"
 
-#: g10/import.c:836
+#: g10/import.c:863
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "chiave %08lX: certificato di revoca non valido: %s - saltato\n"
 
-#: g10/import.c:936
+#: g10/import.c:963
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "chiave %08lX: trovato un user ID duplicato - unito\n"
 
-#: g10/import.c:987
+#: g10/import.c:1014
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "chiave %08lX: certificato di revoca aggiunto\n"
 
-#: g10/import.c:1100 g10/import.c:1155
+#: g10/import.c:1127 g10/import.c:1182
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "chiave %08lX: la nostra copia non ha autofirma\n"
@@ -2329,77 +2341,77 @@ msgstr "Firma fatta %.*s usando la chiave %s con ID %08lX\n"
 msgid "no secret key for decryption available\n"
 msgstr "la chiave segreta non � disponibile"
 
-#: g10/mainproc.c:293
+#: g10/mainproc.c:300
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "decifratura della chiave pubblica fallita: %s\n"
 
-#: g10/mainproc.c:323
+#: g10/mainproc.c:330
 msgid "decryption okay\n"
 msgstr "decifratura corretta\n"
 
-#: g10/mainproc.c:328
+#: g10/mainproc.c:335
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATTENZIONE: il messaggio cifrato � stato manipolato!\n"
 
-#: g10/mainproc.c:333
+#: g10/mainproc.c:340
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decifratura fallita: %s\n"
 
-#: g10/mainproc.c:351
+#: g10/mainproc.c:358
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: il mittente ha richiesto \"solo-per-i-tuoi-occhi\"\n"
 
-#: g10/mainproc.c:353
+#: g10/mainproc.c:360
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome del file originale='%.*s'\n"
 
-#: g10/mainproc.c:580 g10/mainproc.c:589
+#: g10/mainproc.c:587 g10/mainproc.c:596
 msgid "WARNING: invalid notation data found\n"
 msgstr "ATTENZIONE: trovati dati di una nota non validi\n"
 
-#: g10/mainproc.c:592
+#: g10/mainproc.c:599
 msgid "Notation: "
 msgstr "Nota: "
 
-#: g10/mainproc.c:599
+#: g10/mainproc.c:606
 msgid "Policy: "
 msgstr "Policy: "
 
-#: g10/mainproc.c:1018
+#: g10/mainproc.c:1025
 msgid "signature verification suppressed\n"
 msgstr "verifica della firma soppressa\n"
 
-#: g10/mainproc.c:1024
+#: g10/mainproc.c:1031
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Firma fatta %.*s usando la chiave %s con ID %08lX\n"
 
 #. just in case that we have no userid
-#: g10/mainproc.c:1050 g10/mainproc.c:1061
+#: g10/mainproc.c:1057 g10/mainproc.c:1068
 msgid "BAD signature from \""
 msgstr "Firma NON corretta da \""
 
-#: g10/mainproc.c:1051 g10/mainproc.c:1062
+#: g10/mainproc.c:1058 g10/mainproc.c:1069
 msgid "Good signature from \""
 msgstr "Firma valida da \""
 
-#: g10/mainproc.c:1053
+#: g10/mainproc.c:1060
 msgid "                aka \""
 msgstr "    anche noto come \""
 
-#: g10/mainproc.c:1104
+#: g10/mainproc.c:1115
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossibile controllare la firma: %s\n"
 
-#: g10/mainproc.c:1198
+#: g10/mainproc.c:1209
 msgid "old style (PGP 2.x) signature\n"
 msgstr "firma vecchio stile (PGP 2.x)\n"
 
-#: g10/mainproc.c:1203
+#: g10/mainproc.c:1214
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "individuato un pacchetto radice non valido in proc_tree()\n"
 
@@ -2617,7 +2629,7 @@ msgstr "%s: directory creata\n"
 msgid "%s: directory does not exist!\n"
 msgstr "%s: la directory non esiste!\n"
 
-#: g10/openfile.c:182 g10/openfile.c:253 g10/ringedit.c:1344 g10/tdbio.c:457
+#: g10/openfile.c:182 g10/openfile.c:253 g10/ringedit.c:1346 g10/tdbio.c:457
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: impossibile creare: %s\n"
@@ -3011,26 +3023,26 @@ msgstr "ATTENZIONE: non � ancora possibile gestire record pref lunghi\n"
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s: impossibile creare il portachiavi: %s\n"
 
-#: g10/ringedit.c:333 g10/ringedit.c:1349
+#: g10/ringedit.c:333 g10/ringedit.c:1351
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: portachiavi creato\n"
 
-#: g10/ringedit.c:1526
+#: g10/ringedit.c:1528
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "ATTENZIONE: esistono due file con informazioni confidenziali.\n"
 
-#: g10/ringedit.c:1527
+#: g10/ringedit.c:1529
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s � quello non modificato\n"
 
-#: g10/ringedit.c:1528
+#: g10/ringedit.c:1530
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s � quello nuovo\n"
 
-#: g10/ringedit.c:1529
+#: g10/ringedit.c:1531
 msgid "Please fix this possible security flaw\n"
 msgstr "Per favore risolvete questo possibile problema di sicurezza\n"
 
diff --git a/po/pl.po b/po/pl.po
index f7e2fa312..e27477902 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-0.9.7\n"
-"POT-Creation-Date: 1999-07-14 11:47+0200\n"
+"POT-Creation-Date: 1999-07-23 12:13+0200\n"
 "PO-Revision-Date: 1999-05-30 19:08+02:00\n"
 "Last-Translator: Janusz A. Urbanowicz <[email protected]>\n"
 "Language-Team: Polish <[email protected]>\n"
@@ -285,7 +285,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:180
+#: g10/g10.c:183
 msgid ""
 "@Commands:\n"
 " "
@@ -293,138 +293,138 @@ msgstr ""
 "@Polecenia:\n"
 " "
 
-#: g10/g10.c:182
+#: g10/g10.c:185
 msgid "|[file]|make a signature"
 msgstr "|[plik]|z�o�enie podpisu"
 
-#: g10/g10.c:183
+#: g10/g10.c:186
 msgid "|[file]|make a clear text signature"
 msgstr "|[plik]|z�o�enie podpisu na czytelnym dokumencie"
 
-#: g10/g10.c:184
+#: g10/g10.c:187
 msgid "make a detached signature"
 msgstr "sporz�dzenie podpisu oddzielonego od dokumentu"
 
-#: g10/g10.c:185
+#: g10/g10.c:188
 msgid "encrypt data"
 msgstr "szyfrowanie danych"
 
-#: g10/g10.c:186
+#: g10/g10.c:189
 msgid "encryption only with symmetric cipher"
 msgstr "szyfrowanie tylko szyfrem symetrycznym"
 
-#: g10/g10.c:187
+#: g10/g10.c:190
 msgid "store only"
 msgstr "tylko zapis"
 
-#: g10/g10.c:188
+#: g10/g10.c:191
 msgid "decrypt data (default)"
 msgstr "odszyfrowywanie danych (domy�lnie)"
 
-#: g10/g10.c:189
+#: g10/g10.c:192
 msgid "verify a signature"
 msgstr "sprawdzenie podpisu"
 
-#: g10/g10.c:190
+#: g10/g10.c:193
 msgid "list keys"
 msgstr "lista kluczy"
 
-#: g10/g10.c:192
+#: g10/g10.c:195
 msgid "list keys and signatures"
 msgstr "lista kluczy i podpis�w"
 
-#: g10/g10.c:193
+#: g10/g10.c:196
 msgid "check key signatures"
 msgstr "sprawdzenie podpis�w kluczy"
 
-#: g10/g10.c:194
+#: g10/g10.c:197
 msgid "list keys and fingerprints"
 msgstr "lista kluczy i ich odcisk�w"
 
-#: g10/g10.c:195
+#: g10/g10.c:198
 msgid "list secret keys"
 msgstr "lista kluczy tajnych"
 
-#: g10/g10.c:196
+#: g10/g10.c:199
 msgid "generate a new key pair"
 msgstr "generacja nowej pary klucza"
 
-#: g10/g10.c:197
+#: g10/g10.c:200
 msgid "remove key from the public keyring"
 msgstr "usuni�cie klucza ze zbioru kluczy publicznych"
 
-#: g10/g10.c:198
+#: g10/g10.c:201
 #, fuzzy
 msgid "sign a key"
 msgstr "z�o�enie podpisu na kluczu"
 
-#: g10/g10.c:199
+#: g10/g10.c:202
 #, fuzzy
 msgid "sign a key locally"
 msgstr "z�o�enie lokalnego podpisu na kluczu"
 
-#: g10/g10.c:200
+#: g10/g10.c:203
 msgid "sign or edit a key"
 msgstr "podpisanie lub modyfikacja klucza"
 
-#: g10/g10.c:201
+#: g10/g10.c:204
 msgid "generate a revocation certificate"
 msgstr "generacja certyfikatu uniewa�nienia klucza"
 
-#: g10/g10.c:202
+#: g10/g10.c:205
 msgid "export keys"
 msgstr "eksport kluczy do pliku"
 
-#: g10/g10.c:203
+#: g10/g10.c:206
 msgid "export keys to a key server"
 msgstr "eksport kluczy do serwera kluczy"
 
-#: g10/g10.c:204
+#: g10/g10.c:207
 msgid "import keys from a key server"
 msgstr "import kluczy z serwera kluczy"
 
-#: g10/g10.c:207
+#: g10/g10.c:210
 msgid "import/merge keys"
 msgstr "import/do��czenie kluczy"
 
-#: g10/g10.c:209
+#: g10/g10.c:212
 msgid "list only the sequence of packets"
 msgstr "wypisane sekwencji pakiet�w"
 
-#: g10/g10.c:211
+#: g10/g10.c:214
 msgid "export the ownertrust values"
 msgstr "eksport warto�ci zaufania"
 
-#: g10/g10.c:213
+#: g10/g10.c:216
 msgid "import ownertrust values"
 msgstr "wczytanie warto��i zaufania"
 
-#: g10/g10.c:215
+#: g10/g10.c:218
 #, fuzzy
 msgid "update the trust database"
 msgstr "|[NAZWY]|naniesienie poprawek do bazy zaufania"
 
-#: g10/g10.c:217
+#: g10/g10.c:220
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NAZWY]|sprawdzenie bazy zaufania"
 
-#: g10/g10.c:218
+#: g10/g10.c:221
 msgid "fix a corrupted trust database"
 msgstr "naprawa uszkodzonej Bazy Zaufania"
 
-#: g10/g10.c:219
+#: g10/g10.c:222
 msgid "De-Armor a file or stdin"
 msgstr "zdj�cie opakowania ASCII pliku lub potoku"
 
-#: g10/g10.c:220
+#: g10/g10.c:223
 msgid "En-Armor a file or stdin"
 msgstr "opakowanie ASCII pliku lub potoku"
 
-#: g10/g10.c:221
+#: g10/g10.c:224
 msgid "|algo [files]|print message digests"
 msgstr "|algo [pliki]|skr�ty wiadomo�ci"
 
-#: g10/g10.c:225
+#: g10/g10.c:228
 msgid ""
 "@\n"
 "Options:\n"
@@ -434,169 +434,169 @@ msgstr ""
 "Opcje:\n"
 " "
 
-#: g10/g10.c:227
+#: g10/g10.c:230
 msgid "create ascii armored output"
 msgstr "plik wynikowy w opakowaniu ASCII"
 
-#: g10/g10.c:228
+#: g10/g10.c:231
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAZWA|szyfrowanie dla odbiorcy NAZWA"
 
-#: g10/g10.c:231
+#: g10/g10.c:234
 #, fuzzy
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NAZWA|u�ycie NAZWA jako domy�lnego klucza tajnego"
 
-#: g10/g10.c:233
+#: g10/g10.c:236
 msgid "use the default key as default recipient"
 msgstr ""
 
-#: g10/g10.c:237
+#: g10/g10.c:240
 msgid "use this user-id to sign or decrypt"
 msgstr "identyfikator do podpisania lub odszyfrowania"
 
-#: g10/g10.c:238
+#: g10/g10.c:241
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|poziom kompresji N (0 - brak)"
 
-#: g10/g10.c:240
+#: g10/g10.c:243
 msgid "use canonical text mode"
 msgstr "kanoniczny format tekstowy"
 
-#: g10/g10.c:241
+#: g10/g10.c:244
 msgid "use as output file"
 msgstr "plik wyj�ciowy"
 
-#: g10/g10.c:242
+#: g10/g10.c:245
 msgid "verbose"
 msgstr "z informacjami dodatkowymi"
 
-#: g10/g10.c:243
+#: g10/g10.c:246
 msgid "be somewhat more quiet"
 msgstr "mniej komunikat�ww"
 
-#: g10/g10.c:244
+#: g10/g10.c:247
 msgid "don't use the terminal at all"
 msgstr ""
 
-#: g10/g10.c:245
+#: g10/g10.c:248
 msgid "force v3 signatures"
 msgstr "wymuszenie trzeciej wersji formatu podpis�w"
 
-#: g10/g10.c:246
+#: g10/g10.c:249
 msgid "always use a MDC for encryption"
 msgstr "do szyfrowania b�dzie u�ywany MDC"
 
-#: g10/g10.c:247
+#: g10/g10.c:250
 msgid "do not make any changes"
 msgstr "pozostawienie bez zmian"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:249
+#: g10/g10.c:252
 msgid "batch mode: never ask"
 msgstr "tryb wsadowy: �adnych pyta�"
 
-#: g10/g10.c:250
+#: g10/g10.c:253
 msgid "assume yes on most questions"
 msgstr "automatyczna odpowied� tak na wi�kszo�� pyta�"
 
-#: g10/g10.c:251
+#: g10/g10.c:254
 msgid "assume no on most questions"
 msgstr "automatyczna odpowied� nie na wi�kszo�� pyta�"
 
-#: g10/g10.c:252
+#: g10/g10.c:255
 msgid "add this keyring to the list of keyrings"
 msgstr "doda� zbi�r kluczy do listy u�ywanych"
 
-#: g10/g10.c:253
+#: g10/g10.c:256
 msgid "add this secret keyring to the list"
 msgstr "doda� zbi�r kluczy tajnych do listy"
 
-#: g10/g10.c:254
+#: g10/g10.c:257
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAZWA|u�ycie NAZWA jako domy�lnego klucza tajnego"
 
-#: g10/g10.c:255
+#: g10/g10.c:258
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|HOST|serwer kluczy w kt�rym b�d� poszukiwane"
 
-#: g10/g10.c:256
+#: g10/g10.c:259
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NAZWA|zestaw znak�w terminala NAZWA"
 
-#: g10/g10.c:257
+#: g10/g10.c:260
 msgid "read options from file"
 msgstr "wczytanie opcji z pliku"
 
-#: g10/g10.c:259
+#: g10/g10.c:262
 msgid "set debugging flags"
 msgstr "ustawienie opcji �ledzenia wykonania programu"
 
-#: g10/g10.c:260
+#: g10/g10.c:263
 msgid "enable full debugging"
 msgstr "umo�liwienie pe�nego �ledzenia programu"
 
-#: g10/g10.c:261
+#: g10/g10.c:264
 msgid "|FD|write status info to this FD"
 msgstr "|FD|zapisa� opis stanu do FD"
 
-#: g10/g10.c:262
+#: g10/g10.c:265
 msgid "do not write comment packets"
 msgstr "nie zapisywa� pakiet�w z komentarzem"
 
-#: g10/g10.c:263
+#: g10/g10.c:266
 msgid "(default is 1)"
 msgstr "(domy�lnie 1)"
 
-#: g10/g10.c:264
+#: g10/g10.c:267
 msgid "(default is 3)"
 msgstr "(domy�lnie 3)"
 
-#: g10/g10.c:266
+#: g10/g10.c:269
 msgid "|FILE|load extension module FILE"
 msgstr "|PLIK|�adowanie modu�u rozszerzenia z PLIK"
 
-#: g10/g10.c:267
+#: g10/g10.c:270
 msgid "emulate the mode described in RFC1991"
 msgstr "emulacja trybu opisanego w RFC1991"
 
-#: g10/g10.c:268
+#: g10/g10.c:271
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:269
+#: g10/g10.c:272
 msgid "|N|use passphrase mode N"
 msgstr "|N|N-ty tryb wprowadzania wyra�enia przej�ciowego"
 
-#: g10/g10.c:271
+#: g10/g10.c:274
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|ALG|algorytm obliczania skr�t�w wiadomo�ci ALG"
 
-#: g10/g10.c:273
+#: g10/g10.c:276
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|ALG|algorytmu szyfruj�cy ALG dla has�a"
 
-#: g10/g10.c:274
+#: g10/g10.c:277
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAZWA|algorytm szyfruj�cy NAZWA"
 
-#: g10/g10.c:275
+#: g10/g10.c:278
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAZWA|algorytm obliczania skr�t�w wiadomo�ci NAZWA"
 
-#: g10/g10.c:276
+#: g10/g10.c:279
 msgid "|N|use compress algorithm N"
 msgstr "|N|algorytm kompresji N"
 
-#: g10/g10.c:277
+#: g10/g10.c:280
 msgid "throw keyid field of encrypted packets"
 msgstr "usuni�cie identyfikator�w kluczy z pakiet�w"
 
-#: g10/g10.c:278
+#: g10/g10.c:281
 msgid "|NAME=VALUE|use this notation data"
 msgstr ""
 
-#: g10/g10.c:280
+#: g10/g10.c:283
 msgid ""
 "@\n"
 "Examples:\n"
@@ -617,15 +617,15 @@ msgstr ""
 " --list-keys [nazwy]        pokazuje klucze\n"
 " --fingerprint [nazwy]      pokazuje odciski kluczy\n"
 
-#: g10/g10.c:360
+#: g10/g10.c:366
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "B��dy prosimy zg�asza� na adres <[email protected]>.\n"
 
-#: g10/g10.c:364
+#: g10/g10.c:370
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Wywo�anie: gpg [opcje] [pliki] (-h podaje pomoc)"
 
-#: g10/g10.c:367
+#: g10/g10.c:373
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -635,7 +635,7 @@ msgstr ""
 "podpisywanie, sprawdzanie podpis�w, szyfrowanie, deszyfrowanie\n"
 "domy�lnie wykonywana operacja zale�y od danych wej�ciowych\n"
 
-#: g10/g10.c:372
+#: g10/g10.c:378
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -643,181 +643,181 @@ msgstr ""
 "\n"
 "Obs�ugiwane algorytmy:\n"
 
-#: g10/g10.c:446
+#: g10/g10.c:452
 msgid "usage: gpg [options] "
 msgstr "wywo�anie: gpg [opcje]"
 
-#: g10/g10.c:499
+#: g10/g10.c:505
 msgid "conflicting commands\n"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/g10.c:633
+#: g10/g10.c:640
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "UWAGA: brak domy�lnego pliku opcji '%s'\n"
 
-#: g10/g10.c:637
+#: g10/g10.c:644
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "plik opcji '%s': %s\n"
 
-#: g10/g10.c:644
+#: g10/g10.c:651
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "odczyt opcji z '%s'\n"
 
-#: g10/g10.c:824
+#: g10/g10.c:831
 #, c-format
 msgid "%s is not a valid character set\n"
 msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
 
-#: g10/g10.c:872 g10/g10.c:884
+#: g10/g10.c:895 g10/g10.c:907
 msgid "selected cipher algorithm is invalid\n"
 msgstr "wybrany algorytm szyfruj�cy jest niepoprawny\n"
 
-#: g10/g10.c:878 g10/g10.c:890
+#: g10/g10.c:901 g10/g10.c:913
 msgid "selected digest algorithm is invalid\n"
 msgstr "wybrany algorytm geenracji skr�t�w wiadomo�ci jest niepoprawny\n"
 
-#: g10/g10.c:894
+#: g10/g10.c:917
 msgid "the given policy URL is invalid\n"
 msgstr ""
 
-#: g10/g10.c:897
+#: g10/g10.c:920
 #, 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:899
+#: g10/g10.c:922
 msgid "completes-needed must be greater than 0\n"
 msgstr "warto�� completes-needed musi by� wi�ksza od 0\n"
 
-#: g10/g10.c:901
+#: g10/g10.c:924
 msgid "marginals-needed must be greater than 1\n"
 msgstr "warto�� marginals-needed musi by� wi�ksza od 1\n"
 
-#: g10/g10.c:903
+#: g10/g10.c:926
 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:906
+#: g10/g10.c:929
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "UWAGA: prosty tryb S2K (0) jest stanowczo odradzany\n"
 
-#: g10/g10.c:910
+#: g10/g10.c:933
 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:987
+#: g10/g10.c:1010
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
 
-#: g10/g10.c:993
+#: g10/g10.c:1016
 msgid "--store [filename]"
 msgstr "--store [plik]"
 
-#: g10/g10.c:1000
+#: g10/g10.c:1023
 msgid "--symmetric [filename]"
 msgstr "--symmetric [plik]"
 
-#: g10/g10.c:1008
+#: g10/g10.c:1031
 msgid "--encrypt [filename]"
 msgstr "--encrypt [plik]"
 
-#: g10/g10.c:1021
+#: g10/g10.c:1044
 msgid "--sign [filename]"
 msgstr "--sign [plik]"
 
-#: g10/g10.c:1034
+#: g10/g10.c:1057
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/g10.c:1048
+#: g10/g10.c:1071
 msgid "--clearsign [filename]"
 msgstr "--clearsign [plik]\""
 
-#: g10/g10.c:1060
+#: g10/g10.c:1083
 msgid "--decrypt [filename]"
 msgstr "--decrypt [plik]"
 
-#: g10/g10.c:1068
+#: g10/g10.c:1091
 msgid "--sign-key user-id"
 msgstr ""
 
-#: g10/g10.c:1076
+#: g10/g10.c:1099
 #, fuzzy
 msgid "--lsign-key user-id"
 msgstr "--delete-key nazwa u�ytkownika"
 
-#: g10/g10.c:1084
+#: g10/g10.c:1107
 #, fuzzy
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key nazwa u�ytkownika [polecenia]"
 
-#: g10/g10.c:1100
+#: g10/g10.c:1123
 #, fuzzy
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key nazwa u�ytkownika"
 
-#: g10/g10.c:1103
+#: g10/g10.c:1126
 #, fuzzy
 msgid "--delete-key user-id"
 msgstr "--delete-key nazwa u�ytkownika"
 
-#: g10/encode.c:231 g10/g10.c:1127 g10/sign.c:366
+#: g10/encode.c:231 g10/g10.c:1150 g10/sign.c:366
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "nie mog� otworzy� %s: %s\n"
 
-#: g10/g10.c:1138
+#: g10/g10.c:1161
 msgid "-k[v][v][v][c] [userid] [keyring]"
 msgstr "-k[v][v][v][c] [identyfikator] [zbi�r kluczy]"
 
-#: g10/g10.c:1199
+#: g10/g10.c:1222
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "usuni�cie opakowania ASCII nie powiod�o si�: %s\n"
 
-#: g10/g10.c:1207
+#: g10/g10.c:1230
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "opakowywanie ASCII nie powiod�o si�: %s\n"
 
-#: g10/g10.c:1275
+#: g10/g10.c:1298
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "niew�a�ciwy algorytm skr�tu '%s'\n"
 
-#: g10/g10.c:1356
+#: g10/g10.c:1379
 msgid "[filename]"
 msgstr "[nazwa pliku]"
 
-#: g10/g10.c:1360
+#: g10/g10.c:1383
 msgid "Go ahead and type your message ...\n"
 msgstr "Wpisz tutaj swoj� wiadomo�� ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1363 g10/verify.c:66
+#: g10/decrypt.c:59 g10/g10.c:1386 g10/verify.c:66
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nie mog� otworzy� '%s'\n"
 
-#: g10/g10.c:1532
+#: g10/g10.c:1555
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr ""
 
-#: g10/g10.c:1538
+#: g10/g10.c:1561
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
 msgstr ""
 
-#: g10/g10.c:1544
+#: g10/g10.c:1567
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr ""
 
-#: g10/g10.c:1552
+#: g10/g10.c:1575
 msgid "a notation value must not use any control characters\n"
 msgstr ""
 
@@ -896,12 +896,19 @@ msgstr ""
 "znak kodowania quoted-printable w opakowaniu ASCII - prawdopodobnie\n"
 "przek�amanie wprowadzone przez program transportowy poczty\n"
 
+#. Translators: this shoud fit into 24 bytes to that the fingerprint
+#. * data is properly aligned with the user ID
+#: g10/pkclist.c:53
+#, fuzzy
+msgid "             Fingerprint:"
+msgstr "         do��czono do zbioru: %lu"
+
 #. a string with valid answers
-#: g10/pkclist.c:140
+#: g10/pkclist.c:170
 msgid "sSmMqQ"
 msgstr "iIpPwW"
 
-#: g10/pkclist.c:144
+#: g10/pkclist.c:174
 #, c-format
 msgid ""
 "No trust value assigned to %lu:\n"
@@ -910,7 +917,7 @@ msgstr ""
 "Brak warto�ci zaufania dla %lu:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:154
+#: g10/pkclist.c:186
 msgid ""
 "Please decide how far you trust this user to correctly\n"
 "verify other users' keys (by looking at passports,\n"
@@ -933,23 +940,23 @@ msgstr ""
 " 4 = W pe�ni mu ufam.\n"
 " i = potrzebuj� wi�cej informacji\n"
 
-#: g10/pkclist.c:163
+#: g10/pkclist.c:195
 msgid " m = back to the main menu\n"
 msgstr " p = powr�t do g��wnego menu\n"
 
-#: g10/pkclist.c:165
+#: g10/pkclist.c:197
 msgid " q = quit\n"
 msgstr "w = wyj�cie\n"
 
-#: g10/pkclist.c:171
+#: g10/pkclist.c:203
 msgid "Your decision? "
 msgstr "Twoja decyzja? "
 
-#: g10/pkclist.c:193
+#: g10/pkclist.c:225
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certyfikaty prowadz�ce do ostatecznie zaufanego klucza:\n"
 
-#: g10/pkclist.c:264
+#: g10/pkclist.c:296
 msgid ""
 "Could not find a valid trust path to the key.  Let's see whether we\n"
 "can assign some missing owner trust values.\n"
@@ -959,7 +966,7 @@ msgstr ""
 "Sprawd�my czy mo�na przypisa� brakuj�ce warto�ci zaufania.\n"
 "\n"
 
-#: g10/pkclist.c:270
+#: g10/pkclist.c:302
 msgid ""
 "No path leading to one of our keys found.\n"
 "\n"
@@ -967,7 +974,7 @@ msgstr ""
 "Brak �cie�ki prowadz�cej do kt�rego� z naszych kluczy.\n"
 "\n"
 
-#: g10/pkclist.c:272
+#: g10/pkclist.c:304
 msgid ""
 "No certificates with undefined trust found.\n"
 "\n"
@@ -975,7 +982,7 @@ msgstr ""
 "Brak certyfikat�w o niezdefiniowanym poziomie zaufania.\n"
 "\n"
 
-#: g10/pkclist.c:274
+#: g10/pkclist.c:306
 msgid ""
 "No trust values changed.\n"
 "\n"
@@ -983,36 +990,36 @@ msgstr ""
 "Parametry zaufania nie zosta�y zmienione.\n"
 "\n"
 
-#: g10/pkclist.c:291
+#: g10/pkclist.c:323
 #, c-format
 msgid "key %08lX: key has been revoked!\n"
 msgstr "klucz %08lX: klucz zosta� uniewa�niony!\n"
 
-#: g10/pkclist.c:297 g10/pkclist.c:307 g10/pkclist.c:413
+#: g10/pkclist.c:329 g10/pkclist.c:339 g10/pkclist.c:448
 msgid "Use this key anyway? "
 msgstr "U�y� tego klucza pomimo to? "
 
-#: g10/pkclist.c:301
+#: g10/pkclist.c:333
 #, c-format
 msgid "key %08lX: subkey has been revoked!\n"
 msgstr "klucz %08lX: podklucz zosta� uniewa�niony!\n"
 
-#: g10/pkclist.c:331
+#: g10/pkclist.c:363
 #, c-format
 msgid "%08lX: key has expired\n"
 msgstr "%08lX: data wa�no�ci klucza up�yn�a\n"
 
-#: g10/pkclist.c:337
+#: g10/pkclist.c:369
 #, c-format
 msgid "%08lX: no info to calculate a trust probability\n"
 msgstr "%08lX: brak informacji aby obliczy� prawdopodobie�stwo zaufania\n"
 
-#: g10/pkclist.c:351
+#: g10/pkclist.c:383
 #, c-format
 msgid "%08lX: We do NOT trust this key\n"
 msgstr "%08lX: NIE UFAMY temu kluczowi\n"
 
-#: g10/pkclist.c:357
+#: g10/pkclist.c:389
 #, c-format
 msgid ""
 "%08lX: It is not sure that this key really belongs to the owner\n"
@@ -1021,16 +1028,16 @@ msgstr ""
 "%08lX: Nie ma pewno��i �e ten klucz faktycznie nale�y do odoby podaj�cej\n"
 "si� za jego w�a�ciciela, ale jest akceptowalny.\n"
 
-#: g10/pkclist.c:363
+#: g10/pkclist.c:395
 msgid "This key probably belongs to the owner\n"
 msgstr ""
 "Ten klucz prawdopodobnie nale�y do osoby podaj�cej si� za jego w�a�ciciela.\n"
 
-#: g10/pkclist.c:368
+#: g10/pkclist.c:400
 msgid "This key belongs to us\n"
 msgstr "Ten klucz nale�y do nas\n"
 
-#: g10/pkclist.c:408
+#: g10/pkclist.c:443
 msgid ""
 "It is NOT certain that the key belongs to its owner.\n"
 "If you *really* know what you are doing, you may answer\n"
@@ -1041,67 +1048,67 @@ msgstr ""
 "w�a�ciciela. Je�li nie masz co do tego �adnych w�tpliwo�ci i *naprawd�*\n"
 "wiesz co robisz mo�esz odpowiedzie� \"tak\" na nast�pne pytanie.\n"
 
-#: g10/pkclist.c:421 g10/pkclist.c:443
+#: g10/pkclist.c:456 g10/pkclist.c:478
 msgid "WARNING: Using untrusted key!\n"
 msgstr "OSTRZE�ENIE: u�ywany jest klucz nie obdarzony zaufaniem!\n"
 
-#: g10/pkclist.c:464
+#: g10/pkclist.c:499
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "OSTRZE�ENIE: Ten klucz zosta� uniewa�niony przez w�a�ciciela!\n"
 
-#: g10/pkclist.c:465
+#: g10/pkclist.c:500
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "         To mo�e oznacza� �e podpis jest fa�szerstwem.\n"
 
-#: g10/pkclist.c:469
+#: g10/pkclist.c:504
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "OSTRZE�ENIE: Ten podklucz zosta� uniewa�niony przez w�a�ciciela!\n"
 
-#: g10/pkclist.c:490
+#: g10/pkclist.c:525
 msgid "Note: This key has expired!\n"
 msgstr "Uwaga: Data wa�no�ci tego klucza up�yn�a!\n"
 
-#: g10/pkclist.c:497
+#: g10/pkclist.c:532
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "OSTRZE�ENIE: Ten klucz nie jest po�wiadczony zaufanym podpisem!\n"
 
-#: g10/pkclist.c:499
+#: g10/pkclist.c:534
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "          Nic nie wskazuje na to �e ten podpis z�o�y� w�a�ciciel klucza.\n"
 
-#: g10/pkclist.c:515
+#: g10/pkclist.c:550
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "OSTRZE�ENIE: NIE UFAMY temu kluczowi!\n"
 
-#: g10/pkclist.c:516
+#: g10/pkclist.c:551
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         Ten podpis prawdopodobnie jest FA�SZERSTWEM.\n"
 
-#: g10/pkclist.c:523
+#: g10/pkclist.c:558
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "OSTRZE�ENIE: Ten klucz nie jest po�wiadczony wystarczaj�co zaufanymi "
 "podpisami!\n"
 
-#: g10/pkclist.c:526
+#: g10/pkclist.c:561
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr ""
 "         Nie ma pewno�ci �e ten podpis zosta� z�o�nony przez w�a�ciciela.\n"
 
-#: g10/pkclist.c:627 g10/pkclist.c:649 g10/pkclist.c:758 g10/pkclist.c:803
+#: g10/pkclist.c:662 g10/pkclist.c:684 g10/pkclist.c:793 g10/pkclist.c:838
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: pomini�ty: %s\n"
 
-#: g10/pkclist.c:635 g10/pkclist.c:785
+#: g10/pkclist.c:670 g10/pkclist.c:820
 #, fuzzy, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: problem przy odczycie bloku klucza: %s\n"
 
-#: g10/pkclist.c:662
+#: g10/pkclist.c:697
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1109,34 +1116,34 @@ msgstr ""
 "Nie poda�e� identyfikatora u�ytkownika (user ID). \n"
 "Mo�na to zrobi� za pomoc� opcji \"-r\".\n"
 
-#: g10/pkclist.c:672
+#: g10/pkclist.c:707
 msgid "Enter the user ID: "
 msgstr "Wprowad� identyfikator u�ytkownika (user ID): "
 
-#: g10/pkclist.c:684
+#: g10/pkclist.c:719
 msgid "No such user ID.\n"
 msgstr "Brak takiego identyfikatora u�ytkownika.\n"
 
-#: g10/pkclist.c:704
+#: g10/pkclist.c:739
 #, fuzzy
 msgid "Public key is disabled.\n"
 msgstr "klucz publiczny %08lX\n"
 
-#: g10/pkclist.c:733
+#: g10/pkclist.c:768
 msgid "unknown default recipient `s'\n"
 msgstr ""
 
-#: g10/pkclist.c:766
+#: g10/pkclist.c:801
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: b��d podczas sprawdzania klucza: %s\n"
 
-#: g10/pkclist.c:771
+#: g10/pkclist.c:806
 #, fuzzy, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: problem przy odczycie bloku klucza: %s\n"
 
-#: g10/pkclist.c:809
+#: g10/pkclist.c:844
 msgid "no valid addressees\n"
 msgstr "brak poprawnych adres�w\n"
 
@@ -1527,246 +1534,251 @@ msgstr "zbyt wiele wpis�w w buforze kluczy publicznych - wy��czony\n"
 msgid "too many entries in unk cache - disabled\n"
 msgstr "zbyt wiele wpis�w w buforze nieznanych kluczy - wy��czony\n"
 
-#: g10/getkey.c:1535 g10/getkey.c:1591
+#: g10/getkey.c:1565 g10/getkey.c:1621
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "u�ywany jest podklucz %08lX zamiast klucza g��wnego %08lX\n"
 
-#: g10/import.c:117
+#: g10/import.c:118
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nie mo�na otworzy� %s: %s\n"
 
-#: g10/import.c:161
+#: g10/import.c:162
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "pomijam blok typu %d\n"
 
-#: g10/import.c:168 g10/trustdb.c:1658 g10/trustdb.c:1697
+#: g10/import.c:169 g10/trustdb.c:1658 g10/trustdb.c:1697
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu kluczy przetworzonych do tej chwili\n"
 
-#: g10/import.c:173
+#: g10/import.c:174
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "b��d odczytu '%s': %s\n"
 
-#: g10/import.c:176
+#: g10/import.c:177
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "Og�em przetworzonych kluczy: %lu\n"
 
-#: g10/import.c:178
+#: g10/import.c:179
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          bez identyfikatora: %lu\n"
 
-#: g10/import.c:180
+#: g10/import.c:181
 #, c-format
 msgid "              imported: %lu"
 msgstr "         do��czono do zbioru: %lu"
 
-#: g10/import.c:186
+#: g10/import.c:187
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "                   bez zmian: %lu\n"
 
-#: g10/import.c:188
+#: g10/import.c:189
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "      nowych identyfikator�w: %lu\n"
 
-#: g10/import.c:190
+#: g10/import.c:191
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "            nowych podkluczy: %lu\n"
 
-#: g10/import.c:192
+#: g10/import.c:193
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "             nowych podpis�w: %lu\n"
 
-#: g10/import.c:194
+#: g10/import.c:195
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   nowych uniewa�nie� kluczy: %lu\n"
 
-#: g10/import.c:196
+#: g10/import.c:197
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "   tajnych kluczy wczytanych: %lu\n"
 
-#: g10/import.c:198
+#: g10/import.c:199
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "     tajnych kluczy dodanych: %lu\n"
 
-#: g10/import.c:200
+#: g10/import.c:201
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "    tajnych kluczy bez zmian: %lu\n"
 
-#: g10/import.c:361 g10/import.c:550
+#: g10/import.c:362 g10/import.c:554
 #, c-format
 msgid "key %08lX: no user id\n"
 msgstr "klucz %08lX: brak identyfikatora u�ytkownika\n"
 
-#: g10/import.c:372
+#: g10/import.c:376
 #, c-format
 msgid "key %08lX: no valid user ids\n"
 msgstr "klucz %08lX: brak poprawnych identyfikator�w u�ytkownika\n"
 
-#: g10/import.c:374
+#: g10/import.c:378
 msgid "this may be caused by a missing self-signature\n"
 msgstr "to mo�e by� spowodowane brakiem podpisu w�a�ciciela klucza\n"
 
-#: g10/import.c:385 g10/import.c:617
+#: g10/import.c:389 g10/import.c:621
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "klucz %08lX: brak klucza publicznego: %s\n"
 
-#: g10/import.c:391
+#: g10/import.c:395
 msgid "no default public keyring\n"
 msgstr "brak domy�lnego zbioru kluczy publicznych\n"
 
-#: g10/import.c:395 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:559
+#: g10/import.c:399 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:559
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "zapis do '%s'\n"
 
-#: g10/import.c:398 g10/import.c:456 g10/import.c:565 g10/import.c:666
+#: g10/import.c:402 g10/import.c:460 g10/import.c:569 g10/import.c:670
 #, c-format
 msgid "can't lock keyring `%s': %s\n"
 msgstr "nie mo�na zablokowa� zbioru kluczy publicznych '%s': %s\n"
 
-#: g10/import.c:401 g10/import.c:459 g10/import.c:568 g10/import.c:669
+#: g10/import.c:405 g10/import.c:463 g10/import.c:572 g10/import.c:673
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "b��d zapisu zbioru kluczy '%s': %s\n"
 
-#: g10/import.c:406
+#: g10/import.c:410
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "klucz %08lX: klucz publiczny wczytany do zbioru\n"
 
-#: g10/import.c:423
+#: g10/import.c:427
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "klucz %08lX: nie zgadza si� z lokalnie posiadan� kopi�\n"
 
-#: g10/import.c:432 g10/import.c:625
+#: g10/import.c:436 g10/import.c:629
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "klucz %08lX: brak oryginalnego bloku klucza; %s\n"
 
-#: g10/import.c:438 g10/import.c:631
+#: g10/import.c:442 g10/import.c:635
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "klucz %08lX: nie mo�na odczyta� oryginalnego bloku klucza; %s\n"
 
-#: g10/import.c:465
+#: g10/import.c:469
 #, c-format
 msgid "key %08lX: 1 new user-id\n"
 msgstr "klucz %08lX: 1 nowy identyfikator u�ytkownika\n"
 
-#: g10/import.c:468
+#: g10/import.c:472
 #, c-format
 msgid "key %08lX: %d new user-ids\n"
 msgstr "klucz %08lX: %d nowych identyfikator�w u�ytkownika\n"
 
-#: g10/import.c:471
+#: g10/import.c:475
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "klucz %08lX: 1 nowy podpis\n"
 
-#: g10/import.c:474
+#: g10/import.c:478
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "klucz %08lX: %d nowych podpis�w\n"
 
-#: g10/import.c:477
+#: g10/import.c:481
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "klucz %08lX: 1 nowy podklucz\n"
 
-#: g10/import.c:480
+#: g10/import.c:484
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "klucz %08lX: %d nowych podkluczy\n"
 
-#: g10/import.c:490
+#: g10/import.c:494
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "klucz %08lX: bez zmian\n"
 
-#: g10/import.c:573
+#: g10/import.c:577
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "Klucz %08lX: klucz tajny wczytany do zbioru\n"
 
 #. we can't merge secret keys
-#: g10/import.c:577
+#: g10/import.c:581
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "Klucz %08lX: ten klucz ju� znajduje si� w zbiorze\n"
 
-#: g10/import.c:582
+#: g10/import.c:586
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "klucz %08lX: brak klucza tajnego: %s\n"
 
-#: g10/import.c:611
+#: g10/import.c:615
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "klucz %08lX: brak klucza publicznego - wczytany certyfikat \n"
 "uniwa�nienia nie mo�e by� zastosowany\n"
 
-#: g10/import.c:642
+#: g10/import.c:646
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr ""
 "klucz %08lX: niepoprawny certyfikat uniewa�nienia:\n"
 "%s - odrzucony\n"
 
-#: g10/import.c:674
+#: g10/import.c:678
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "klucz %08lX: wczytany certyfikat uniewa�nienia\n"
 
-#: g10/import.c:707
+#: g10/import.c:711
 #, c-format
 msgid "key %08lX: no user-id for signature\n"
 msgstr "klucz %08lX: brak identyfikatora u�ytkownika do podpisu\n"
 
-#: g10/import.c:714 g10/import.c:738
+#: g10/import.c:718 g10/import.c:742
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr ""
 "klucz %08lX: nie obs�ugiwany algorytm szyfrowania z kluczem publicznym\n"
 
-#: g10/import.c:715
+#: g10/import.c:719
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "klucz %08lX: niepoprawny podpis w�a�ciciela klucza\n"
 
-#: g10/import.c:730
+#: g10/import.c:734
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "klucz %08lX: brak podklucza do dowi�zania\n"
 
-#: g10/import.c:739
+#: g10/import.c:743
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "klucz %08lX: niepoprawne dowi�zanie podklucza\n"
 
-#: g10/import.c:771
+#: g10/import.c:769
+#, fuzzy, c-format
+msgid "key %08lX: accepted non self-signed userid '"
+msgstr "klucz %08lX: zosta� pomini�ty identyfikator u�ytkownika '"
+
+#: g10/import.c:798
 #, c-format
 msgid "key %08lX: skipped userid '"
 msgstr "klucz %08lX: zosta� pomini�ty identyfikator u�ytkownika '"
 
-#: g10/import.c:794
+#: g10/import.c:821
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "klucz %08lX: podklucz pomini�ty\n"
@@ -1775,34 +1787,34 @@ msgstr "klucz %08lX: podklucz pomini�ty\n"
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:819
+#: g10/import.c:846
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "klucz %08lX: podpis nieeksportowalny (klasa %02x) - pomini�ty\n"
 
-#: g10/import.c:828
+#: g10/import.c:855
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "klucz %08lX: certyfikat uniewa�nienia umieszczony w niew�a�ciwym \n"
 "miejscu - zosta� pomini�ty\n"
 
-#: g10/import.c:836
+#: g10/import.c:863
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "klucz %08lX: niepoprawny certyfikat uniewa�nienia: %s - pomini�ty\n"
 
-#: g10/import.c:936
+#: g10/import.c:963
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "key %08lX: powt�rzony identyfikator u�ytkownika - do��czony\n"
 
-#: g10/import.c:987
+#: g10/import.c:1014
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "klucz %08lX: dodany certyfikat uniewa�nienia\n"
 
-#: g10/import.c:1100 g10/import.c:1155
+#: g10/import.c:1127 g10/import.c:1182
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "klucz %08lX: dost�pna kopia nie jest podpisana ni� sam�\n"
@@ -2366,51 +2378,51 @@ msgstr ""
 msgid "no secret key for decryption available\n"
 msgstr "klucz tajny jest niedost�pny"
 
-#: g10/mainproc.c:293
+#: g10/mainproc.c:300
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "b��d odszyfrowywania kluczem publicznym: %s\n"
 
-#: g10/mainproc.c:323
+#: g10/mainproc.c:330
 msgid "decryption okay\n"
 msgstr "odszyfrowane poprawnie\n"
 
-#: g10/mainproc.c:328
+#: g10/mainproc.c:335
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "OSTRZE�ENIE: zaszyfrowana wiadomo�� by�a manipulowana!\n"
 
-#: g10/mainproc.c:333
+#: g10/mainproc.c:340
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "b��d odszyfrowywania: %s\n"
 
-#: g10/mainproc.c:351
+#: g10/mainproc.c:358
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "UWAGA: nadawca zaznaczy� �e wiadomo�� nie powinna by� zapisywana\n"
 
-#: g10/mainproc.c:353
+#: g10/mainproc.c:360
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "pierwotna nazwa pliku='%.*s'\n"
 
-#: g10/mainproc.c:580 g10/mainproc.c:589
+#: g10/mainproc.c:587 g10/mainproc.c:596
 #, fuzzy
 msgid "WARNING: invalid notation data found\n"
 msgstr "nie odnaleziono poprawnych danych w formacie OpenPGP.\n"
 
-#: g10/mainproc.c:592
+#: g10/mainproc.c:599
 msgid "Notation: "
 msgstr ""
 
-#: g10/mainproc.c:599
+#: g10/mainproc.c:606
 msgid "Policy: "
 msgstr ""
 
-#: g10/mainproc.c:1018
+#: g10/mainproc.c:1025
 msgid "signature verification suppressed\n"
 msgstr "wymuszono pomini�cie sprawdzenia podpisu\n"
 
-#: g10/mainproc.c:1024
+#: g10/mainproc.c:1031
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr ""
@@ -2418,28 +2430,28 @@ msgstr ""
 "z u�yciem klucza o identyfikatorze %08lX\n"
 
 #. just in case that we have no userid
-#: g10/mainproc.c:1050 g10/mainproc.c:1061
+#: g10/mainproc.c:1057 g10/mainproc.c:1068
 msgid "BAD signature from \""
 msgstr "NIEPOPRAWNY podpis z�o�ony przez \""
 
-#: g10/mainproc.c:1051 g10/mainproc.c:1062
+#: g10/mainproc.c:1058 g10/mainproc.c:1069
 msgid "Good signature from \""
 msgstr "Poprawny podpis z�o�ony przez \""
 
-#: g10/mainproc.c:1053
+#: g10/mainproc.c:1060
 msgid "                aka \""
 msgstr "                        alias \""
 
-#: g10/mainproc.c:1104
+#: g10/mainproc.c:1115
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nie mog� sprawdzi� podpisu: %s\n"
 
-#: g10/mainproc.c:1198
+#: g10/mainproc.c:1209
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis starego typu (PGP 2.x)\n"
 
-#: g10/mainproc.c:1203
+#: g10/mainproc.c:1214
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "wykryto niepoprawny pakiet pierwotny w proc_tree()\n"
 
@@ -2660,7 +2672,7 @@ msgstr "%s: katalog utworzony\n"
 msgid "%s: directory does not exist!\n"
 msgstr "%s: katalog nie istnieje!\n"
 
-#: g10/openfile.c:182 g10/openfile.c:253 g10/ringedit.c:1344 g10/tdbio.c:457
+#: g10/openfile.c:182 g10/openfile.c:253 g10/ringedit.c:1346 g10/tdbio.c:457
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: nie mog� utworzy�: %s\n"
@@ -3055,26 +3067,26 @@ msgstr "OSTRZE�ENIE: d�ugie wpisy ustawie� jeszcze nie s� obs�ugiwane.\n"
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s: stworzenie zbioru kluczy jest niemo�liwe: %s\n"
 
-#: g10/ringedit.c:333 g10/ringedit.c:1349
+#: g10/ringedit.c:333 g10/ringedit.c:1351
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: zbi�r kluczy utworzony\n"
 
-#: g10/ringedit.c:1526
+#: g10/ringedit.c:1528
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "OSTRZE�ENIE: Istniej� dwa pliki z poufnymi informacjami.\n"
 
-#: g10/ringedit.c:1527
+#: g10/ringedit.c:1529
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s pozosta� bez zmian\n"
 
-#: g10/ringedit.c:1528
+#: g10/ringedit.c:1530
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s zosta� utworzony\n"
 
-#: g10/ringedit.c:1529
+#: g10/ringedit.c:1531
 msgid "Please fix this possible security flaw\n"
 msgstr "Prosz� usun�� to naruszenie zasad bezpiecze�stwa\n"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index ad6f33fac..2be312fd2 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"POT-Creation-Date: 1999-07-14 11:47+0200\n"
+"POT-Creation-Date: 1999-07-23 12:13+0200\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Date: 1998-11-20 23:46:36-0200\n"
 "From: Thiago Jung Bauermann <[email protected]>\n"
@@ -285,7 +285,7 @@ msgstr ""
 "para que o sistema possa coletar mais entropia!\n"
 "(S�o necess�rios mais %d bytes)\n"
 
-#: g10/g10.c:180
+#: g10/g10.c:183
 msgid ""
 "@Commands:\n"
 " "
@@ -293,141 +293,141 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/g10.c:182
+#: g10/g10.c:185
 msgid "|[file]|make a signature"
 msgstr "|[arquivo]|faz uma assinatura"
 
-#: g10/g10.c:183
+#: g10/g10.c:186
 msgid "|[file]|make a clear text signature"
 msgstr "|[arquivo]|faz uma assinatura em texto puro"
 
-#: g10/g10.c:184
+#: g10/g10.c:187
 msgid "make a detached signature"
 msgstr "faz uma assinatura separada"
 
-#: g10/g10.c:185
+#: g10/g10.c:188
 msgid "encrypt data"
 msgstr "criptografa dados"
 
-#: g10/g10.c:186
+#: g10/g10.c:189
 msgid "encryption only with symmetric cipher"
 msgstr "criptografa apenas com criptografia sim�trica"
 
-#: g10/g10.c:187
+#: g10/g10.c:190
 msgid "store only"
 msgstr "apenas armazena"
 
-#: g10/g10.c:188
+#: g10/g10.c:191
 msgid "decrypt data (default)"
 msgstr "descriptografa dados (padr�o)"
 
-#: g10/g10.c:189
+#: g10/g10.c:192
 msgid "verify a signature"
 msgstr "verifica uma assinatura"
 
-#: g10/g10.c:190
+#: g10/g10.c:193
 msgid "list keys"
 msgstr "lista as chaves"
 
-#: g10/g10.c:192
+#: g10/g10.c:195
 msgid "list keys and signatures"
 msgstr "lista as chaves e as assinaturas"
 
-#: g10/g10.c:193
+#: g10/g10.c:196
 msgid "check key signatures"
 msgstr "confere as assinaturas das chaves"
 
-#: g10/g10.c:194
+#: g10/g10.c:197
 msgid "list keys and fingerprints"
 msgstr "lista as chaves e as impress�es digitais"
 
-#: g10/g10.c:195
+#: g10/g10.c:198
 msgid "list secret keys"
 msgstr "lista as chaves secretas"
 
-#: g10/g10.c:196
+#: g10/g10.c:199
 msgid "generate a new key pair"
 msgstr "gera um novo par de chaves"
 
-#: g10/g10.c:197
+#: g10/g10.c:200
 msgid "remove key from the public keyring"
 msgstr "remove a chave do chaveiro p�blico"
 
-#: g10/g10.c:198
+#: g10/g10.c:201
 #, fuzzy
 msgid "sign a key"
 msgstr "assina a chave"
 
-#: g10/g10.c:199
+#: g10/g10.c:202
 #, fuzzy
 msgid "sign a key locally"
 msgstr "assina a chave localmente"
 
-#: g10/g10.c:200
+#: g10/g10.c:203
 msgid "sign or edit a key"
 msgstr "assina ou edita uma chave"
 
-#: g10/g10.c:201
+#: g10/g10.c:204
 msgid "generate a revocation certificate"
 msgstr "gera um certificado de revoga��o"
 
-#: g10/g10.c:202
+#: g10/g10.c:205
 msgid "export keys"
 msgstr "exporta as chaves"
 
-#: g10/g10.c:203
+#: g10/g10.c:206
 msgid "export keys to a key server"
 msgstr "exporta chaves para um servidor"
 
-#: g10/g10.c:204
+#: g10/g10.c:207
 msgid "import keys from a key server"
 msgstr "importa chaves de um servidor"
 
-#: g10/g10.c:207
+#: g10/g10.c:210
 msgid "import/merge keys"
 msgstr "importa/funde as chaves"
 
-#: g10/g10.c:209
+#: g10/g10.c:212
 msgid "list only the sequence of packets"
 msgstr "lista apenas as seq��ncias de pacotes"
 
 # ownertrust ???
-#: g10/g10.c:211
+#: g10/g10.c:214
 msgid "export the ownertrust values"
 msgstr "exporta os valores de confian�a"
 
-#: g10/g10.c:213
+#: g10/g10.c:216
 msgid "import ownertrust values"
 msgstr "importa os valores de confian�a"
 
-#: g10/g10.c:215
+#: g10/g10.c:218
 #, fuzzy
 msgid "update the trust database"
 msgstr "|[NOMES]|atualiza o banco de dados de confiabilidade"
 
-#: g10/g10.c:217
+#: g10/g10.c:220
 msgid "|[NAMES]|check the trust database"
 msgstr "|[NOMES]|confere o banco de dados de confiabilidade"
 
-#: g10/g10.c:218
+#: g10/g10.c:221
 msgid "fix a corrupted trust database"
 msgstr ""
 "conserta um banco de dados de confiabilidade\n"
 "danificado"
 
-#: g10/g10.c:219
+#: g10/g10.c:222
 msgid "De-Armor a file or stdin"
 msgstr "Retira a armadura de um arquivo ou de \"stdin\""
 
-#: g10/g10.c:220
+#: g10/g10.c:223
 msgid "En-Armor a file or stdin"
 msgstr "Cria armadura para um arquivo ou \"stdin\""
 
-#: g10/g10.c:221
+#: g10/g10.c:224
 msgid "|algo [files]|print message digests"
 msgstr "|algo [arquivos]|imprime \"digests\" de mensagens"
 
-#: g10/g10.c:225
+#: g10/g10.c:228
 msgid ""
 "@\n"
 "Options:\n"
@@ -437,177 +437,177 @@ msgstr ""
 "Op��es:\n"
 " "
 
-#: g10/g10.c:227
+#: g10/g10.c:230
 msgid "create ascii armored output"
 msgstr "cria uma sa�da com armadura ascii"
 
-#: g10/g10.c:228
+#: g10/g10.c:231
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|criptografa para NOME"
 
-#: g10/g10.c:231
+#: g10/g10.c:234
 #, fuzzy
 msgid "|NAME|use NAME as default recipient"
 msgstr "|NOME|usa NOME como chave secreta padr�o"
 
-#: g10/g10.c:233
+#: g10/g10.c:236
 msgid "use the default key as default recipient"
 msgstr ""
 
-#: g10/g10.c:237
+#: g10/g10.c:240
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "usa este identificador de usu�rio para assinar\n"
 "ou descriptografar"
 
-#: g10/g10.c:238
+#: g10/g10.c:241
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|estabelece n�vel de compress�o N (0 desabilita)"
 
-#: g10/g10.c:240
+#: g10/g10.c:243
 msgid "use canonical text mode"
 msgstr "usa modo de texto can�nico"
 
-#: g10/g10.c:241
+#: g10/g10.c:244
 msgid "use as output file"
 msgstr "usa como arquivo de sa�da"
 
-#: g10/g10.c:242
+#: g10/g10.c:245
 msgid "verbose"
 msgstr "detalhado"
 
-#: g10/g10.c:243
+#: g10/g10.c:246
 msgid "be somewhat more quiet"
 msgstr "ser mais silencioso"
 
-#: g10/g10.c:244
+#: g10/g10.c:247
 msgid "don't use the terminal at all"
 msgstr ""
 
-#: g10/g10.c:245
+#: g10/g10.c:248
 msgid "force v3 signatures"
 msgstr "for�a assinaturas v3"
 
-#: g10/g10.c:246
+#: g10/g10.c:249
 msgid "always use a MDC for encryption"
 msgstr "sempre usar um MDC para criptografar"
 
-#: g10/g10.c:247
+#: g10/g10.c:250
 msgid "do not make any changes"
 msgstr "n�o fazer altera��es"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:249
+#: g10/g10.c:252
 msgid "batch mode: never ask"
 msgstr "modo n�o-interativo: nunca perguntar"
 
-#: g10/g10.c:250
+#: g10/g10.c:253
 msgid "assume yes on most questions"
 msgstr "assumir sim para a maioria das perguntas"
 
-#: g10/g10.c:251
+#: g10/g10.c:254
 msgid "assume no on most questions"
 msgstr "assumir n�o para a maioria das perguntas"
 
-#: g10/g10.c:252
+#: g10/g10.c:255
 msgid "add this keyring to the list of keyrings"
 msgstr "adiciona este chaveiro � lista de chaveiros"
 
-#: g10/g10.c:253
+#: g10/g10.c:256
 msgid "add this secret keyring to the list"
 msgstr "adiciona este chaveiro secreto � lista"
 
-#: g10/g10.c:254
+#: g10/g10.c:257
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NOME|usa NOME como chave secreta padr�o"
 
-#: g10/g10.c:255
+#: g10/g10.c:258
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr "|ENDERE�O|usa este servidor para buscar chaves"
 
-#: g10/g10.c:256
+#: g10/g10.c:259
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|NOME|define mapa de caracteres do terminal como NOME"
 
-#: g10/g10.c:257
+#: g10/g10.c:260
 msgid "read options from file"
 msgstr "l� op��es do arquivo"
 
-#: g10/g10.c:259
+#: g10/g10.c:262
 msgid "set debugging flags"
 msgstr "define par�metros de depura��o"
 
-#: g10/g10.c:260
+#: g10/g10.c:263
 msgid "enable full debugging"
 msgstr "habilita depura��o completa"
 
-#: g10/g10.c:261
+#: g10/g10.c:264
 msgid "|FD|write status info to this FD"
 msgstr ""
 "|DA|escreve informa��es de status para o descritor\n"
 "de arquivo DA"
 
-#: g10/g10.c:262
+#: g10/g10.c:265
 msgid "do not write comment packets"
 msgstr "n�o escreve pacotes de coment�rio"
 
-#: g10/g10.c:263
+#: g10/g10.c:266
 msgid "(default is 1)"
 msgstr "(o padr�o � 1)"
 
-#: g10/g10.c:264
+#: g10/g10.c:267
 msgid "(default is 3)"
 msgstr "(o padr�o � 3)"
 
-#: g10/g10.c:266
+#: g10/g10.c:269
 msgid "|FILE|load extension module FILE"
 msgstr "|ARQUIVO|carrega m�dulo de extens�o ARQUIVO"
 
-#: g10/g10.c:267
+#: g10/g10.c:270
 msgid "emulate the mode described in RFC1991"
 msgstr "emula o modo descrito no RFC1991"
 
-#: g10/g10.c:268
+#: g10/g10.c:271
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:269
+#: g10/g10.c:272
 msgid "|N|use passphrase mode N"
 msgstr "|N|usa frase secreta modo N"
 
-#: g10/g10.c:271
+#: g10/g10.c:274
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr ""
 "|NOME|usa algoritmo de \"digest\" de mensagens NOME para\n"
 "frases secretas"
 
-#: g10/g10.c:273
+#: g10/g10.c:276
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr ""
 "|NOME|usa algoritmo de criptografia NOME para\n"
 "frases secretas"
 
-#: g10/g10.c:274
+#: g10/g10.c:277
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usa algoritmo de criptografia NOME"
 
-#: g10/g10.c:275
+#: g10/g10.c:278
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usa algoritmo de \"digest\" de mensagens NOME"
 
-#: g10/g10.c:276
+#: g10/g10.c:279
 msgid "|N|use compress algorithm N"
 msgstr "|N|usa algoritmo de compress�o N"
 
-#: g10/g10.c:277
+#: g10/g10.c:280
 msgid "throw keyid field of encrypted packets"
 msgstr "elimina o campo keyid dos pacotes criptografados"
 
-#: g10/g10.c:278
+#: g10/g10.c:281
 msgid "|NAME=VALUE|use this notation data"
 msgstr ""
 
-#: g10/g10.c:280
+#: g10/g10.c:283
 msgid ""
 "@\n"
 "Examples:\n"
@@ -627,16 +627,16 @@ msgstr ""
 " --list-keys [nomes]        mostra chaves\n"
 " --fingerprint [nomes]      mostra impress�es digitais\n"
 
-#: g10/g10.c:360
+#: g10/g10.c:366
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr "Por favor comunique bugs para <[email protected]>.\n"
 
-#: g10/g10.c:364
+#: g10/g10.c:370
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
 
 # em cima, "check" est� como "conferir"
-#: g10/g10.c:367
+#: g10/g10.c:373
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -646,7 +646,7 @@ msgstr ""
 "assina, verifica, criptografa ou descriptografa\n"
 "a opera��o padr�o depende dos dados de entrada\n"
 
-#: g10/g10.c:372
+#: g10/g10.c:378
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -654,182 +654,182 @@ msgstr ""
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/g10.c:446
+#: g10/g10.c:452
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [op��es] "
 
-#: g10/g10.c:499
+#: g10/g10.c:505
 msgid "conflicting commands\n"
 msgstr "comandos conflitantes\n"
 
-#: g10/g10.c:633
+#: g10/g10.c:640
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: arquivo de op��es padr�o `%s' inexistente\n"
 
-#: g10/g10.c:637
+#: g10/g10.c:644
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "arquivo de op��es `%s': %s\n"
 
-#: g10/g10.c:644
+#: g10/g10.c:651
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo op��es de `%s'\n"
 
-#: g10/g10.c:824
+#: g10/g10.c:831
 #, 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:872 g10/g10.c:884
+#: g10/g10.c:895 g10/g10.c:907
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/g10.c:878 g10/g10.c:890
+#: g10/g10.c:901 g10/g10.c:913
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/g10.c:894
+#: g10/g10.c:917
 msgid "the given policy URL is invalid\n"
 msgstr ""
 
-#: g10/g10.c:897
+#: g10/g10.c:920
 #, 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:899
+#: g10/g10.c:922
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/g10.c:901
+#: g10/g10.c:924
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/g10.c:903
+#: g10/g10.c:926
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr "max-cert-depth deve estar na faixa 1 a 255\n"
 
-#: g10/g10.c:906
+#: g10/g10.c:929
 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:910
+#: g10/g10.c:933
 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:987
+#: g10/g10.c:1010
 #, 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:993
+#: g10/g10.c:1016
 msgid "--store [filename]"
 msgstr "--store [nome_do_arquivo]"
 
-#: g10/g10.c:1000
+#: g10/g10.c:1023
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/g10.c:1008
+#: g10/g10.c:1031
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_arquivo]"
 
-#: g10/g10.c:1021
+#: g10/g10.c:1044
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_arquivo]"
 
-#: g10/g10.c:1034
+#: g10/g10.c:1057
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/g10.c:1048
+#: g10/g10.c:1071
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_arquivo]"
 
-#: g10/g10.c:1060
+#: g10/g10.c:1083
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_arquivo]"
 
-#: g10/g10.c:1068
+#: g10/g10.c:1091
 msgid "--sign-key user-id"
 msgstr ""
 
-#: g10/g10.c:1076
+#: g10/g10.c:1099
 #, fuzzy
 msgid "--lsign-key user-id"
 msgstr "--delete-key nome_do_usu�rio"
 
-#: g10/g10.c:1084
+#: g10/g10.c:1107
 #, fuzzy
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key nome_do_usu�rio [comandos]"
 
-#: g10/g10.c:1100
+#: g10/g10.c:1123
 #, fuzzy
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key nome_do_usu�rio"
 
-#: g10/g10.c:1103
+#: g10/g10.c:1126
 #, fuzzy
 msgid "--delete-key user-id"
 msgstr "--delete-key nome_do_usu�rio"
 
-#: g10/encode.c:231 g10/g10.c:1127 g10/sign.c:366
+#: g10/encode.c:231 g10/g10.c:1150 g10/sign.c:366
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "imposs�vel abrir %s: %s\n"
 
-#: g10/g10.c:1138
+#: g10/g10.c:1161
 msgid "-k[v][v][v][c] [userid] [keyring]"
 msgstr "-k[v][v][v][c] [id_do_usu�rio] [chaveiro]"
 
-#: g10/g10.c:1199
+#: g10/g10.c:1222
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/g10.c:1207
+#: g10/g10.c:1230
 #, 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:1275
+#: g10/g10.c:1298
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash inv�lido `%s'\n"
 
-#: g10/g10.c:1356
+#: g10/g10.c:1379
 msgid "[filename]"
 msgstr "[nome_do_arquivo]"
 
-#: g10/g10.c:1360
+#: g10/g10.c:1383
 msgid "Go ahead and type your message ...\n"
 msgstr "V� em frente e digite sua mensagem ...\n"
 
-#: g10/decrypt.c:59 g10/g10.c:1363 g10/verify.c:66
+#: g10/decrypt.c:59 g10/g10.c:1386 g10/verify.c:66
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "imposs�vel abrir `%s'\n"
 
-#: g10/g10.c:1532
+#: g10/g10.c:1555
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr ""
 
-#: g10/g10.c:1538
+#: g10/g10.c:1561
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
 msgstr ""
 
-#: g10/g10.c:1544
+#: g10/g10.c:1567
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr ""
 
-#: g10/g10.c:1552
+#: g10/g10.c:1575
 msgid "a notation value must not use any control characters\n"
 msgstr ""
 
@@ -908,14 +908,21 @@ msgstr ""
 "caracter \"quoted printable\" na armadura  - provavelmente um MTA com bugs "
 "foi usado\n"
 
+#. Translators: this shoud fit into 24 bytes to that the fingerprint
+#. * data is properly aligned with the user ID
+#: g10/pkclist.c:53
+#, fuzzy
+msgid "             Fingerprint:"
+msgstr "              importados: %lu"
+
 # ???
 #. a string with valid answers
-#: g10/pkclist.c:140
+#: g10/pkclist.c:170
 #, fuzzy
 msgid "sSmMqQ"
 msgstr "sSmMqQ"
 
-#: g10/pkclist.c:144
+#: g10/pkclist.c:174
 #, c-format
 msgid ""
 "No trust value assigned to %lu:\n"
@@ -924,7 +931,7 @@ msgstr ""
 "Nenhum valor de confian�a designado para %lu:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:154
+#: g10/pkclist.c:186
 msgid ""
 "Please decide how far you trust this user to correctly\n"
 "verify other users' keys (by looking at passports,\n"
@@ -947,23 +954,23 @@ msgstr ""
 " 4 = Eu confio completamente\n"
 " 5 = Mostrar mais informa��o\n"
 
-#: g10/pkclist.c:163
+#: g10/pkclist.c:195
 msgid " m = back to the main menu\n"
 msgstr " m = volta ao menu principal\n"
 
-#: g10/pkclist.c:165
+#: g10/pkclist.c:197
 msgid " q = quit\n"
 msgstr " q = sai\n"
 
-#: g10/pkclist.c:171
+#: g10/pkclist.c:203
 msgid "Your decision? "
 msgstr "Sua decis�o? "
 
-#: g10/pkclist.c:193
+#: g10/pkclist.c:225
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr "Certificados que levam a uma chave confiada plenamente:\n"
 
-#: g10/pkclist.c:264
+#: g10/pkclist.c:296
 msgid ""
 "Could not find a valid trust path to the key.  Let's see whether we\n"
 "can assign some missing owner trust values.\n"
@@ -973,13 +980,13 @@ msgstr ""
 "Vamos ver se � poss�vel designar alguns valores de confian�a ausentes.\n"
 "\n"
 
-#: g10/pkclist.c:270
+#: g10/pkclist.c:302
 msgid ""
 "No path leading to one of our keys found.\n"
 "\n"
 msgstr "Nenhuma rota encontrada que leve a uma de nossas chaves.\n"
 
-#: g10/pkclist.c:272
+#: g10/pkclist.c:304
 msgid ""
 "No certificates with undefined trust found.\n"
 "\n"
@@ -987,7 +994,7 @@ msgstr ""
 "Nenhum certificado com confian�a indefinida encontrado.\n"
 "\n"
 
-#: g10/pkclist.c:274
+#: g10/pkclist.c:306
 msgid ""
 "No trust values changed.\n"
 "\n"
@@ -995,36 +1002,36 @@ msgstr ""
 "Nenhum valor de confian�a modificado.\n"
 "\n"
 
-#: g10/pkclist.c:291
+#: g10/pkclist.c:323
 #, c-format
 msgid "key %08lX: key has been revoked!\n"
 msgstr "chave %08lX: a chave foi revogada!\n"
 
-#: g10/pkclist.c:297 g10/pkclist.c:307 g10/pkclist.c:413
+#: g10/pkclist.c:329 g10/pkclist.c:339 g10/pkclist.c:448
 msgid "Use this key anyway? "
 msgstr "Usa esta chave de qualquer modo? "
 
-#: g10/pkclist.c:301
+#: g10/pkclist.c:333
 #, c-format
 msgid "key %08lX: subkey has been revoked!\n"
 msgstr "chave %08lX: a subchave foi revogada!\n"
 
-#: g10/pkclist.c:331
+#: g10/pkclist.c:363
 #, c-format
 msgid "%08lX: key has expired\n"
 msgstr "%08lX: a chave expirou\n"
 
-#: g10/pkclist.c:337
+#: g10/pkclist.c:369
 #, c-format
 msgid "%08lX: no info to calculate a trust probability\n"
 msgstr "%08lX: sem informa��o para calcular probabilidade de confian�a\n"
 
-#: g10/pkclist.c:351
+#: g10/pkclist.c:383
 #, c-format
 msgid "%08lX: We do NOT trust this key\n"
 msgstr "%08lX: N�s N�O confiamos nesta chave\n"
 
-#: g10/pkclist.c:357
+#: g10/pkclist.c:389
 #, c-format
 msgid ""
 "%08lX: It is not sure that this key really belongs to the owner\n"
@@ -1033,15 +1040,15 @@ msgstr ""
 "%08lX: N�o se tem certeza de que esta chave realmente pertence ao dono,\n"
 "mas � aceita de qualquer modo\n"
 
-#: g10/pkclist.c:363
+#: g10/pkclist.c:395
 msgid "This key probably belongs to the owner\n"
 msgstr "Esta chave provavelmente pertence ao dono\n"
 
-#: g10/pkclist.c:368
+#: g10/pkclist.c:400
 msgid "This key belongs to us\n"
 msgstr "Esta chave pertence a n�s\n"
 
-#: g10/pkclist.c:408
+#: g10/pkclist.c:443
 msgid ""
 "It is NOT certain that the key belongs to its owner.\n"
 "If you *really* know what you are doing, you may answer\n"
@@ -1053,65 +1060,65 @@ msgstr ""
 "afirmativamente � pr�xima pergunta\n"
 "\n"
 
-#: g10/pkclist.c:421 g10/pkclist.c:443
+#: g10/pkclist.c:456 g10/pkclist.c:478
 msgid "WARNING: Using untrusted key!\n"
 msgstr "AVISO: Usando chave n�o confi�vel!\n"
 
-#: g10/pkclist.c:464
+#: g10/pkclist.c:499
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/pkclist.c:465
+#: g10/pkclist.c:500
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "         Isto pode significar que a assinatura � falsificada.\n"
 
-#: g10/pkclist.c:469
+#: g10/pkclist.c:504
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "AVISO: Esta subchave foi revogada pelo seu dono!\n"
 
-#: g10/pkclist.c:490
+#: g10/pkclist.c:525
 msgid "Note: This key has expired!\n"
 msgstr "Nota: Esta chave expirou!\n"
 
-#: g10/pkclist.c:497
+#: g10/pkclist.c:532
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "AVISO: Esta chave n�o est� certificada com uma assinatura confi�vel!\n"
 
-#: g10/pkclist.c:499
+#: g10/pkclist.c:534
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr "         N�o h� indica��o de que a assinatura pertence ao dono.\n"
 
-#: g10/pkclist.c:515
+#: g10/pkclist.c:550
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "AVISO: N�s N�O confiamos nesta chave!\n"
 
-#: g10/pkclist.c:516
+#: g10/pkclist.c:551
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         A assinatura � provavelmente uma FALSIFICA��O.\n"
 
-#: g10/pkclist.c:523
+#: g10/pkclist.c:558
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr ""
 "AVISO: Esta chave n�o est� certificada com assinaturas suficientemente\n"
 "       confi�veis!\n"
 
-#: g10/pkclist.c:526
+#: g10/pkclist.c:561
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         N�o se tem certeza de que a assinatura pertence ao dono.\n"
 
-#: g10/pkclist.c:627 g10/pkclist.c:649 g10/pkclist.c:758 g10/pkclist.c:803
+#: g10/pkclist.c:662 g10/pkclist.c:684 g10/pkclist.c:793 g10/pkclist.c:838
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ignorado: %s\n"
 
-#: g10/pkclist.c:635 g10/pkclist.c:785
+#: g10/pkclist.c:670 g10/pkclist.c:820
 #, fuzzy, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: erro de leitura de bloco de chaves: %s\n"
 
-#: g10/pkclist.c:662
+#: g10/pkclist.c:697
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1119,34 +1126,34 @@ msgstr ""
 "Voc� n�o especificou um ID de usu�rio. (pode-se usar \"-r\")\n"
 "\n"
 
-#: g10/pkclist.c:672
+#: g10/pkclist.c:707
 msgid "Enter the user ID: "
 msgstr "Digite o identificador de usu�rio: "
 
-#: g10/pkclist.c:684
+#: g10/pkclist.c:719
 msgid "No such user ID.\n"
 msgstr "Identificador de usu�rio inexistente.\n"
 
-#: g10/pkclist.c:704
+#: g10/pkclist.c:739
 #, fuzzy
 msgid "Public key is disabled.\n"
 msgstr "a chave p�blica � %08lX\n"
 
-#: g10/pkclist.c:733
+#: g10/pkclist.c:768
 msgid "unknown default recipient `s'\n"
 msgstr ""
 
-#: g10/pkclist.c:766
+#: g10/pkclist.c:801
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: erro na verifica��o da chave: %s\n"
 
-#: g10/pkclist.c:771
+#: g10/pkclist.c:806
 #, fuzzy, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr "%s: erro de leitura de bloco de chaves: %s\n"
 
-#: g10/pkclist.c:809
+#: g10/pkclist.c:844
 msgid "no valid addressees\n"
 msgstr "nenhum endere�o v�lido\n"
 
@@ -1531,243 +1538,248 @@ msgstr "entradas demais no cache pk - desabilitado\n"
 msgid "too many entries in unk cache - disabled\n"
 msgstr "entradas demais no cache unk - desabilitado\n"
 
-#: g10/getkey.c:1535 g10/getkey.c:1591
+#: g10/getkey.c:1565 g10/getkey.c:1621
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "usando chave secund�ria %08lX ao inv�s de chave prim�ria %08lX\n"
 
-#: g10/import.c:117
+#: g10/import.c:118
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: g10/import.c:161
+#: g10/import.c:162
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "ignorando bloco do tipo %d\n"
 
-#: g10/import.c:168 g10/trustdb.c:1658 g10/trustdb.c:1697
+#: g10/import.c:169 g10/trustdb.c:1658 g10/trustdb.c:1697
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr "%lu chaves processadas at� agora\n"
 
-#: g10/import.c:173
+#: g10/import.c:174
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/import.c:176
+#: g10/import.c:177
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "N�mero total processado: %lu\n"
 
-#: g10/import.c:178
+#: g10/import.c:179
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          sem IDs de usu�rios: %lu\n"
 
-#: g10/import.c:180
+#: g10/import.c:181
 #, c-format
 msgid "              imported: %lu"
 msgstr "              importados: %lu"
 
-#: g10/import.c:186
+#: g10/import.c:187
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             n�o modificados: %lu\n"
 
-#: g10/import.c:188
+#: g10/import.c:189
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          novos IDs de usu�rios: %lu\n"
 
-#: g10/import.c:190
+#: g10/import.c:191
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           novas subchaves: %lu\n"
 
-#: g10/import.c:192
+#: g10/import.c:193
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        novas assinaturas: %lu\n"
 
-#: g10/import.c:194
+#: g10/import.c:195
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   novas revoga��es de chaves: %lu\n"
 
-#: g10/import.c:196
+#: g10/import.c:197
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      chaves secretas lidas: %lu\n"
 
-#: g10/import.c:198
+#: g10/import.c:199
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  chaves secretas importadas: %lu\n"
 
-#: g10/import.c:200
+#: g10/import.c:201
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " chaves secretas n�o modificadas: %lu\n"
 
-#: g10/import.c:361 g10/import.c:550
+#: g10/import.c:362 g10/import.c:554
 #, c-format
 msgid "key %08lX: no user id\n"
 msgstr "chave %08lX: sem id de usu�rio\n"
 
-#: g10/import.c:372
+#: g10/import.c:376
 #, c-format
 msgid "key %08lX: no valid user ids\n"
 msgstr "chave %08lX: sem ids de usu�rios v�lidos\n"
 
-#: g10/import.c:374
+#: g10/import.c:378
 msgid "this may be caused by a missing self-signature\n"
 msgstr "isto pode ser causado por falta de auto-assinatura\n"
 
-#: g10/import.c:385 g10/import.c:617
+#: g10/import.c:389 g10/import.c:621
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "chave %08lX: chave p�blica n�o encontrada: %s\n"
 
-#: g10/import.c:391
+#: g10/import.c:395
 msgid "no default public keyring\n"
 msgstr "sem chaveiro p�blico padr�o\n"
 
-#: g10/import.c:395 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:559
+#: g10/import.c:399 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:559
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escrevendo para `%s'\n"
 
-#: g10/import.c:398 g10/import.c:456 g10/import.c:565 g10/import.c:666
+#: g10/import.c:402 g10/import.c:460 g10/import.c:569 g10/import.c:670
 #, fuzzy, c-format
 msgid "can't lock keyring `%s': %s\n"
 msgstr "imposs�vel bloquear chaveiro `%s': %s\n"
 
-#: g10/import.c:401 g10/import.c:459 g10/import.c:568 g10/import.c:669
+#: g10/import.c:405 g10/import.c:463 g10/import.c:572 g10/import.c:673
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "%s: erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/import.c:406
+#: g10/import.c:410
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "chave %08lX: chave p�blica importada\n"
 
-#: g10/import.c:423
+#: g10/import.c:427
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "chave %08lX: n�o corresponde � nossa c�pia\n"
 
-#: g10/import.c:432 g10/import.c:625
+#: g10/import.c:436 g10/import.c:629
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "chave %08lX: imposs�vel localizar bloco de chaves original: %s\n"
 
-#: g10/import.c:438 g10/import.c:631
+#: g10/import.c:442 g10/import.c:635
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "chave %08lX: imposs�vel ler bloco de chaves original: %s\n"
 
-#: g10/import.c:465
+#: g10/import.c:469
 #, c-format
 msgid "key %08lX: 1 new user-id\n"
 msgstr "chave %8lX: 1 novo id de usu�rio\n"
 
-#: g10/import.c:468
+#: g10/import.c:472
 #, c-format
 msgid "key %08lX: %d new user-ids\n"
 msgstr "chave %08lX: %d novos ids de usu�rios\n"
 
-#: g10/import.c:471
+#: g10/import.c:475
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "chave %08lX: 1 nova assinatura\n"
 
-#: g10/import.c:474
+#: g10/import.c:478
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "chave %08lX: %d novas assinaturas\n"
 
-#: g10/import.c:477
+#: g10/import.c:481
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "chave %08lX: 1 nova subchave\n"
 
-#: g10/import.c:480
+#: g10/import.c:484
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "chave %08lX: %d novas subchaves\n"
 
-#: g10/import.c:490
+#: g10/import.c:494
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "chave %08lX: n�o modificada\n"
 
-#: g10/import.c:573
+#: g10/import.c:577
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "chave %08lX: chave secreta importada\n"
 
 #. we can't merge secret keys
-#: g10/import.c:577
+#: g10/import.c:581
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "chave %08lX: j� existe no chaveiro secreto\n"
 
-#: g10/import.c:582
+#: g10/import.c:586
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "chave %08lX: chave secreta n�o encontrada: %s\n"
 
-#: g10/import.c:611
+#: g10/import.c:615
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "chave %08lX: sem chave p�blica - imposs�vel aplicar certificado\n"
 "de revoga��o\n"
 
-#: g10/import.c:642
+#: g10/import.c:646
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "chave %08lX: certificado de revoga��o inv�lido: %s - rejeitado\n"
 
-#: g10/import.c:674
+#: g10/import.c:678
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "chave %08lX: certificado de revoga��o importado\n"
 
-#: g10/import.c:707
+#: g10/import.c:711
 #, c-format
 msgid "key %08lX: no user-id for signature\n"
 msgstr "chave %08lX: sem id de usu�rio para assinatura\n"
 
-#: g10/import.c:714 g10/import.c:738
+#: g10/import.c:718 g10/import.c:742
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "chave %08lX: algoritmo de chave p�blica n�o suportado\n"
 
-#: g10/import.c:715
+#: g10/import.c:719
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "chave %08lX: auto-assinatura inv�lida\n"
 
-#: g10/import.c:730
+#: g10/import.c:734
 #, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
 
-#: g10/import.c:739
+#: g10/import.c:743
 #, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "chave %08lX: liga��o de subchave inv�lida\n"
 
-#: g10/import.c:771
+#: g10/import.c:769
+#, fuzzy, c-format
+msgid "key %08lX: accepted non self-signed userid '"
+msgstr "chave %08lX: id de usu�rio ignorado '"
+
+#: g10/import.c:798
 #, c-format
 msgid "key %08lX: skipped userid '"
 msgstr "chave %08lX: id de usu�rio ignorado '"
 
-#: g10/import.c:794
+#: g10/import.c:821
 #, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "chave %08lX: subchave ignorada\n"
@@ -1776,32 +1788,32 @@ msgstr "chave %08lX: subchave ignorada\n"
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:819
+#: g10/import.c:846
 #, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "chave %08lX: assinatura n�o export�vel (classe %02x) - ignorada\n"
 
-#: g10/import.c:828
+#: g10/import.c:855
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "chave %08lX: certificado de revoga��o no local errado - ignorada\n"
 
-#: g10/import.c:836
+#: g10/import.c:863
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "chave %08lX: certificado de revoga��o inv�lido: %s - ignorada\n"
 
-#: g10/import.c:936
+#: g10/import.c:963
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr "chave %08lX: detectado ID de usu�rio duplicado - unido\n"
 
-#: g10/import.c:987
+#: g10/import.c:1014
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "chave %08lX: certificado de revoga��o adicionado\n"
 
-#: g10/import.c:1100 g10/import.c:1155
+#: g10/import.c:1127 g10/import.c:1182
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "chave %08lX: nossa c�pia n�o tem auto-assinatura\n"
@@ -2368,79 +2380,79 @@ msgstr "Assinatura feita em %.*s usando %s, ID da chave %08lX\n"
 msgid "no secret key for decryption available\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: g10/mainproc.c:293
+#: g10/mainproc.c:300
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "descriptografia de chave p�blica falhou: %s\n"
 
-#: g10/mainproc.c:323
+#: g10/mainproc.c:330
 msgid "decryption okay\n"
 msgstr "descriptografia correta\n"
 
-#: g10/mainproc.c:328
+#: g10/mainproc.c:335
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "CUIDADO: a mensagem criptografada foi manipulada!\n"
 
-#: g10/mainproc.c:333
+#: g10/mainproc.c:340
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "descriptografia falhou: %s\n"
 
-#: g10/mainproc.c:351
+#: g10/mainproc.c:358
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: o remetente solicitou \"apenas-para-seus-olhos\"\n"
 
-#: g10/mainproc.c:353
+#: g10/mainproc.c:360
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome de arquivo original='%.*s'\n"
 
-#: g10/mainproc.c:580 g10/mainproc.c:589
+#: g10/mainproc.c:587 g10/mainproc.c:596
 #, fuzzy
 msgid "WARNING: invalid notation data found\n"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
 
-#: g10/mainproc.c:592
+#: g10/mainproc.c:599
 msgid "Notation: "
 msgstr ""
 
-#: g10/mainproc.c:599
+#: g10/mainproc.c:606
 msgid "Policy: "
 msgstr ""
 
-#: g10/mainproc.c:1018
+#: g10/mainproc.c:1025
 msgid "signature verification suppressed\n"
 msgstr "verifica��o de assinatura suprimida\n"
 
 # XXX Verificar
-#: g10/mainproc.c:1024
+#: g10/mainproc.c:1031
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "Assinatura feita em %.*s usando %s, ID da chave %08lX\n"
 
 #. just in case that we have no userid
-#: g10/mainproc.c:1050 g10/mainproc.c:1061
+#: g10/mainproc.c:1057 g10/mainproc.c:1068
 msgid "BAD signature from \""
 msgstr "Assinatura INCORRETA de \""
 
-#: g10/mainproc.c:1051 g10/mainproc.c:1062
+#: g10/mainproc.c:1058 g10/mainproc.c:1069
 msgid "Good signature from \""
 msgstr "Assinatura correta de \""
 
-#: g10/mainproc.c:1053
+#: g10/mainproc.c:1060
 msgid "                aka \""
 msgstr "                ou \""
 
-#: g10/mainproc.c:1104
+#: g10/mainproc.c:1115
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposs�vel verificar assinatura: %s\n"
 
-#: g10/mainproc.c:1198
+#: g10/mainproc.c:1209
 msgid "old style (PGP 2.x) signature\n"
 msgstr "assinatura antiga (PGP2.x)\n"
 
-#: g10/mainproc.c:1203
+#: g10/mainproc.c:1214
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pacote raiz inv�lido detectado em proc_tree()\n"
 
@@ -2655,7 +2667,7 @@ msgstr "%s: diret�rio criado\n"
 msgid "%s: directory does not exist!\n"
 msgstr "%s: diret�rio inexistente!\n"
 
-#: g10/openfile.c:182 g10/openfile.c:253 g10/ringedit.c:1344 g10/tdbio.c:457
+#: g10/openfile.c:182 g10/openfile.c:253 g10/ringedit.c:1346 g10/tdbio.c:457
 #, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: imposs�vel criar: %s\n"
@@ -3051,26 +3063,26 @@ msgstr "AVISO: ainda � imposs�vel manipular registros de prefer�ncias longos\n"
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s: imposs�vel criar chaveiro: %s\n"
 
-#: g10/ringedit.c:333 g10/ringedit.c:1349
+#: g10/ringedit.c:333 g10/ringedit.c:1351
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: chaveiro criado\n"
 
-#: g10/ringedit.c:1526
+#: g10/ringedit.c:1528
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "AVISO: existem 2 arquivos com informa��es confidenciais.\n"
 
-#: g10/ringedit.c:1527
+#: g10/ringedit.c:1529
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s � o n�o modificado\n"
 
-#: g10/ringedit.c:1528
+#: g10/ringedit.c:1530
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s � o novo\n"
 
-#: g10/ringedit.c:1529
+#: g10/ringedit.c:1531
 msgid "Please fix this possible security flaw\n"
 msgstr "Por favor conserte este poss�vel furo de seguran�a\n"
 
diff --git a/po/ru.po b/po/ru.po
index 2981e785f..a7a57b942 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -9,7 +9,7 @@
 # QingLong <qinglong@Bolizm> (couldn't send an email to let you know)
 msgid ""
 msgstr ""
-"POT-Creation-Date: 1999-07-14 11:47+0200\n"
+"POT-Creation-Date: 1999-07-23 12:13+0200\n"
 "Content-Type: text/plain; charset=\n"
 "Date: 1998-01-26 22:08:36+0100\n"
 "From: Gregory Steuck <[email protected]>\n"
@@ -330,7 +330,7 @@ msgstr ""
 "������������ ��������� ������. ����������, ��������� ���-������, �����\n"
 "�� ����� ������� �������������� ��������� �����! (����� ��� %d ����)\n"
 
-#: g10/g10.c:180
+#: g10/g10.c:183
 msgid ""
 "@Commands:\n"
 " "
@@ -338,142 +338,142 @@ msgstr ""
 "@�������:\n"
 " "
 
-#: g10/g10.c:182
+#: g10/g10.c:185
 #, fuzzy
 msgid "|[file]|make a signature"
 msgstr "|[����]|������� �������"
 
-#: g10/g10.c:183
+#: g10/g10.c:186
 #, fuzzy
 msgid "|[file]|make a clear text signature"
 msgstr "|[����]|������� ��������� �������"
 
-#: g10/g10.c:184
+#: g10/g10.c:187
 msgid "make a detached signature"
 msgstr "������� ��������� �������"
 
-#: g10/g10.c:185
+#: g10/g10.c:188
 msgid "encrypt data"
 msgstr "����������� ������"
 
-#: g10/g10.c:186
+#: g10/g10.c:189
 msgid "encryption only with symmetric cipher"
 msgstr "����������� ������������ ����������"
 
-#: g10/g10.c:187
+#: g10/g10.c:190
 msgid "store only"
 msgstr "������ ���������"
 
-#: g10/g10.c:188
+#: g10/g10.c:191
 msgid "decrypt data (default)"
 msgstr "������������ ������ (�� ���������)"
 
-#: g10/g10.c:189
+#: g10/g10.c:192
 msgid "verify a signature"
 msgstr "��������� �������"
 
-#: g10/g10.c:190
+#: g10/g10.c:193
 msgid "list keys"
 msgstr "������ ������"
 
-#: g10/g10.c:192
+#: g10/g10.c:195
 msgid "list keys and signatures"
 msgstr "������ ������ � ��������"
 
-#: g10/g10.c:193
+#: g10/g10.c:196
 msgid "check key signatures"
 msgstr "��������� ������� �� �����"
 
-#: g10/g10.c:194
+#: g10/g10.c:197
 msgid "list keys and fingerprints"
 msgstr "������ ������ � �� \"����������� �������\""
 
-#: g10/g10.c:195
+#: g10/g10.c:198
 msgid "list secret keys"
 msgstr "������ ��������� ������"
 
-#: g10/g10.c:196
+#: g10/g10.c:199
 msgid "generate a new key pair"
 msgstr "������������� ����� ���� ������ (�������� � ���������)"
 
-#: g10/g10.c:197
+#: g10/g10.c:200
 msgid "remove key from the public keyring"
 msgstr "������� ���� �� ������"
 
-#: g10/g10.c:198
+#: g10/g10.c:201
 #, fuzzy
 msgid "sign a key"
 msgstr "��������� ����"
 
-#: g10/g10.c:199
+#: g10/g10.c:202
 #, fuzzy
 msgid "sign a key locally"
 msgstr "��������� ����"
 
-#: g10/g10.c:200
+#: g10/g10.c:203
 msgid "sign or edit a key"
 msgstr "��������� ��� ������������� ����"
 
-#: g10/g10.c:201
+#: g10/g10.c:204
 msgid "generate a revocation certificate"
 msgstr "������������� ���������� ����������"
 
-#: g10/g10.c:202
+#: g10/g10.c:205
 msgid "export keys"
 msgstr "�������������� �����"
 
-#: g10/g10.c:203
+#: g10/g10.c:206
 msgid "export keys to a key server"
 msgstr ""
 
-#: g10/g10.c:204
+#: g10/g10.c:207
 msgid "import keys from a key server"
 msgstr ""
 
-#: g10/g10.c:207
+#: g10/g10.c:210
 msgid "import/merge keys"
 msgstr "�������������/�������� �����"
 
-#: g10/g10.c:209
+#: g10/g10.c:212
 msgid "list only the sequence of packets"
 msgstr "���������� ������ ������������������ �������"
 
-#: g10/g10.c:211
+#: g10/g10.c:214
 #, fuzzy
 msgid "export the ownertrust values"
 msgstr "�������������� ��������� �������\n"
 
-#: g10/g10.c:213
+#: g10/g10.c:216
 #, fuzzy
 msgid "import ownertrust values"
 msgstr "������������� ��������� �������\n"
 
-#: g10/g10.c:215
+#: g10/g10.c:218
 #, fuzzy
 msgid "update the trust database"
 msgstr "|[�����]|��������� ���� ������ �������"
 
-#: g10/g10.c:217
+#: g10/g10.c:220
 msgid "|[NAMES]|check the trust database"
 msgstr "|[�����]|��������� ���� ������ �������"
 
-#: g10/g10.c:218
+#: g10/g10.c:221
 msgid "fix a corrupted trust database"
 msgstr "��������� ����������� ���� ������ �������"
 
-#: g10/g10.c:219
+#: g10/g10.c:222
 msgid "De-Armor a file or stdin"
 msgstr "������������ stdin ��� ���� �� ASCII-�������������"
 
-#: g10/g10.c:220
+#: g10/g10.c:223
 msgid "En-Armor a file or stdin"
 msgstr "������������ stdin ��� ���� � ASCII-�������������"
 
-#: g10/g10.c:221
+#: g10/g10.c:224
 msgid "|algo [files]|print message digests"
 msgstr "|algo [files]|���������� �������� ���������"
 
-#: g10/g10.c:225
+#: g10/g10.c:228
 msgid ""
 "@\n"
 "Options:\n"
@@ -483,178 +483,178 @@ msgstr ""
 "���������:\n"
 " "
 
-#: g10/g10.c:227
+#: g10/g10.c:230
 msgid "create ascii armored output"
 msgstr "����� � ASCII-�������������"
 
-#: g10/g10.c:228
+#: g10/g10.c:231
 #, fuzzy
 msgid "|NAME|encrypt for NAME"
 msgstr "|���|������������ ������������ ���������� ���"
 
-#: g10/g10.c:231
+#: g10/g10.c:234
 #, fuzzy
 msgid "|NAME|use NAME as default recipient"
 msgstr "|���|������������ ��� � �������� ���������� ����� �� ���������"
 
-#: g10/g10.c:233
+#: g10/g10.c:236
 msgid "use the default key as default recipient"
 msgstr ""
 
-#: g10/g10.c:237
+#: g10/g10.c:240
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "������������ ��������� ������������� ������������ ��� ������� ��� �����������"
 
-#: g10/g10.c:238
+#: g10/g10.c:241
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|���������� ������� ������ (0 - �� �������)"
 
-#: g10/g10.c:240
+#: g10/g10.c:243
 msgid "use canonical text mode"
 msgstr "������������ ������������ ��������� �����"
 
-#: g10/g10.c:241
+#: g10/g10.c:244
 msgid "use as output file"
 msgstr "������������ � �������� ��������� �����"
 
-#: g10/g10.c:242
+#: g10/g10.c:245
 msgid "verbose"
 msgstr "������������"
 
-#: g10/g10.c:243
+#: g10/g10.c:246
 msgid "be somewhat more quiet"
 msgstr ""
 
-#: g10/g10.c:244
+#: g10/g10.c:247
 msgid "don't use the terminal at all"
 msgstr ""
 
-#: g10/g10.c:245
+#: g10/g10.c:248
 #, fuzzy
 msgid "force v3 signatures"
 msgstr "��������� ������� �� �����"
 
-#: g10/g10.c:246
+#: g10/g10.c:249
 #, fuzzy
 msgid "always use a MDC for encryption"
 msgstr "������������ ��������� ������������� ������������ ��� ����������"
 
-#: g10/g10.c:247
+#: g10/g10.c:250
 msgid "do not make any changes"
 msgstr "Keine wirklichen �nderungen durchf�hren"
 
 #. { oInteractive, "interactive", 0, N_("prompt before overwriting") },
-#: g10/g10.c:249
+#: g10/g10.c:252
 msgid "batch mode: never ask"
 msgstr "�������� �����: ������ �� ����������"
 
-#: g10/g10.c:250
+#: g10/g10.c:253
 msgid "assume yes on most questions"
 msgstr "�������� \"��\" �� ����������� ��������"
 
-#: g10/g10.c:251
+#: g10/g10.c:254
 msgid "assume no on most questions"
 msgstr "�������� \"���\" �� ����������� ��������"
 
-#: g10/g10.c:252
+#: g10/g10.c:255
 msgid "add this keyring to the list of keyrings"
 msgstr "�������� ��� ������ � ������ ������ ������"
 
-#: g10/g10.c:253
+#: g10/g10.c:256
 msgid "add this secret keyring to the list"
 msgstr "�������� ��� ��������� ������ � ������ ������ ������"
 
-#: g10/g10.c:254
+#: g10/g10.c:257
 msgid "|NAME|use NAME as default secret key"
 msgstr "|���|������������ ��� � �������� ���������� ����� �� ���������"
 
-#: g10/g10.c:255
+#: g10/g10.c:258
 msgid "|HOST|use this keyserver to lookup keys"
 msgstr ""
 
-#: g10/g10.c:256
+#: g10/g10.c:259
 #, fuzzy
 msgid "|NAME|set terminal charset to NAME"
 msgstr "|���|������������ ������������ ���������� ���"
 
-#: g10/g10.c:257
+#: g10/g10.c:260
 msgid "read options from file"
 msgstr "������ ��������� �� �����"
 
-#: g10/g10.c:259
+#: g10/g10.c:262
 msgid "set debugging flags"
 msgstr "���������� ���������� �����"
 
-#: g10/g10.c:260
+#: g10/g10.c:263
 msgid "enable full debugging"
 msgstr "��������� ��� �������"
 
-#: g10/g10.c:261
+#: g10/g10.c:264
 msgid "|FD|write status info to this FD"
 msgstr "|FD| ���������� ���������� � ��������� � ���������� (FD)"
 
-#: g10/g10.c:262
+#: g10/g10.c:265
 msgid "do not write comment packets"
 msgstr "�� ������ ������ � �������������"
 
-#: g10/g10.c:263
+#: g10/g10.c:266
 msgid "(default is 1)"
 msgstr "(�� ��������� 1)"
 
-#: g10/g10.c:264
+#: g10/g10.c:267
 msgid "(default is 3)"
 msgstr "(�� ��������� 3)"
 
-#: g10/g10.c:266
+#: g10/g10.c:269
 #, fuzzy
 msgid "|FILE|load extension module FILE"
 msgstr "|����|��������� ���� � ������������ ��������"
 
-#: g10/g10.c:267
+#: g10/g10.c:270
 msgid "emulate the mode described in RFC1991"
 msgstr "����������� ����� ��������� � RFC1991"
 
-#: g10/g10.c:268
+#: g10/g10.c:271
 msgid "set all packet, cipher and digest options to OpenPGP behavior"
 msgstr ""
 
-#: g10/g10.c:269
+#: g10/g10.c:272
 #, fuzzy
 msgid "|N|use passphrase mode N"
 msgstr "|N|������������ �������� ����� ������ N\n"
 
-#: g10/g10.c:271
+#: g10/g10.c:274
 #, fuzzy
 msgid "|NAME|use message digest algorithm NAME for passphrases"
 msgstr "|���|������������ ���-�������� ��� ��� �������� ����"
 
-#: g10/g10.c:273
+#: g10/g10.c:276
 #, fuzzy
 msgid "|NAME|use cipher algorithm NAME for passphrases"
 msgstr "|���|������������ ������������ ���������� ��� ��� �������� ����"
 
-#: g10/g10.c:274
+#: g10/g10.c:277
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|���|������������ ������������ ���������� ���"
 
-#: g10/g10.c:275
+#: g10/g10.c:278
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|���|������������ ���-�������� ���"
 
-#: g10/g10.c:276
+#: g10/g10.c:279
 msgid "|N|use compress algorithm N"
 msgstr "|N|������������ �������� ������ N"
 
-#: g10/g10.c:277
+#: g10/g10.c:280
 msgid "throw keyid field of encrypted packets"
 msgstr "����������� ���� keyid � ������������� �������"
 
-#: g10/g10.c:278
+#: g10/g10.c:281
 msgid "|NAME=VALUE|use this notation data"
 msgstr ""
 
-#: g10/g10.c:280
+#: g10/g10.c:283
 #, fuzzy
 msgid ""
 "@\n"
@@ -675,17 +675,17 @@ msgstr ""
 " --list-keys [names]        �������� ������ ������\n"
 " --fingerprint [names]      �������� \"��������� �������\" ������\n"
 
-#: g10/g10.c:360
+#: g10/g10.c:366
 msgid "Please report bugs to <[email protected]>.\n"
 msgstr ""
 "����������, ����������� ��������� �� ������� �� ������ "
 "<[email protected]>.\n"
 
-#: g10/g10.c:364
+#: g10/g10.c:370
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "�������������: gpg [���������] [�����] (-h ��� ������)"
 
-#: g10/g10.c:367
+#: g10/g10.c:373
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -695,7 +695,7 @@ msgstr ""
 "�����������, ��������� �������, ������� ��� ��������������\n"
 "����� ������ ������� �� ������� ������\n"
 
-#: g10/g10.c:372
+#: g10/g10.c:378
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -703,182 +703,182 @@ msgstr ""
 "\n"
 "�������������� ���������:\n"
 
-#: g10/g10.c:446
+#: g10/g10.c:452
 msgid "usage: gpg [options] "
 msgstr "�������������: gpg [���������] "
 
-#: g10/g10.c:499
+#: g10/g10.c:505
 msgid "conflicting commands\n"
 msgstr "Widerspr�chliche Kommandos\n"
 
-#: g10/g10.c:633
+#: g10/g10.c:640
 #, fuzzy, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "���������: ���� ���������� �� ��������� `%s' �����������\n"
 
-#: g10/g10.c:637
+#: g10/g10.c:644
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "���� ���������� `%s': %s\n"
 
-#: g10/g10.c:644
+#: g10/g10.c:651
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "�������� ��������� �� `%s'\n"
 
-#: g10/g10.c:824
+#: g10/g10.c:831
 #, fuzzy, c-format
 msgid "%s is not a valid character set\n"
 msgstr "������������ ������ � �����������.\n"
 
-#: g10/g10.c:872 g10/g10.c:884
+#: g10/g10.c:895 g10/g10.c:907
 msgid "selected cipher algorithm is invalid\n"
 msgstr "������ ������������ �������� ����������\n"
 
-#: g10/g10.c:878 g10/g10.c:890
+#: g10/g10.c:901 g10/g10.c:913
 msgid "selected digest algorithm is invalid\n"
 msgstr "������ ������������ ��������-��������\n"
 
-#: g10/g10.c:894
+#: g10/g10.c:917
 msgid "the given policy URL is invalid\n"
 msgstr ""
 
-#: g10/g10.c:897
+#: g10/g10.c:920
 #, c-format
 msgid "compress algorithm must be in range %d..%d\n"
 msgstr "�������� �������� ����� ����� �������� �� %d �� %d\n"
 
-#: g10/g10.c:899
+#: g10/g10.c:922
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ������ ���� ������ 0\n"
 
-#: g10/g10.c:901
+#: g10/g10.c:924
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ������ ���� ������ 1\n"
 
-#: g10/g10.c:903
+#: g10/g10.c:926
 msgid "max-cert-depth must be in range 1 to 255\n"
 msgstr ""
 
-#: g10/g10.c:906
+#: g10/g10.c:929
 #, fuzzy
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "���������: ������� S2K ����� (0) ����� �� �������������\n"
 
-#: g10/g10.c:910
+#: g10/g10.c:933
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "������������ ����� S2K: ������ ���� 0, 1 ��� 3\n"
 
-#: g10/g10.c:987
+#: g10/g10.c:1010
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "������ ������������� ���� ������ �������: %s\n"
 
-#: g10/g10.c:993
+#: g10/g10.c:1016
 msgid "--store [filename]"
 msgstr "--store [��� �����]"
 
-#: g10/g10.c:1000
+#: g10/g10.c:1023
 msgid "--symmetric [filename]"
 msgstr "--symmetric [��� �����]"
 
-#: g10/g10.c:1008
+#: g10/g10.c:1031
 msgid "--encrypt [filename]"
 msgstr "--encrypt [��� �����]"
 
-#: g10/g10.c:1021
+#: g10/g10.c:1044
 msgid "--sign [filename]"
 msgstr "--sign [��� �����]"
 
-#: g10/g10.c:1034
+#: g10/g10.c:1057
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [��� �����]"
 
-#: g10/g10.c:1048
+#: g10/g10.c:1071
 msgid "--clearsign [filename]"
 msgstr "--clearsign [��� �����]"
 
-#: g10/g10.c:1060
+#: g10/g10.c:1083
 msgid "--decrypt [filename]"
 msgstr "--decrypt [��� �����]"
 
-#: g10/g10.c:1068
+#: g10/g10.c:1091
 msgid "--sign-key user-id"
 msgstr ""
 
-#: g10/g10.c:1076
+#: g10/g10.c:1099
 #, fuzzy
 msgid "--lsign-key user-id"
 msgstr "--delete-key ���-������������"
 
-#: g10/g10.c:1084
+#: g10/g10.c:1107
 #, fuzzy
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key ���-������������"
 
-#: g10/g10.c:1100
+#: g10/g10.c:1123
 #, fuzzy
 msgid "--delete-secret-key user-id"
 msgstr "--delete-secret-key ���-������������"
 
-#: g10/g10.c:1103
+#: g10/g10.c:1126
 #, fuzzy
 msgid "--delete-key user-id"
 msgstr "--delete-key ���-������������"
 
-#: g10/encode.c:231 g10/g10.c:1127 g10/sign.c:366
+#: g10/encode.c:231 g10/g10.c:1150 g10/sign.c:366
 #, c-format
 msgid "can't open %s: %s\n"
 msgstr "���������� ������� ���� `%s': %s\n"
 
-#: g10/g10.c:1138
+#: g10/g10.c:1161
 msgid "-k[v][v][v][c] [userid] [keyring]"
 msgstr "-k[v][v][v][c] [������������� ������������] [������ ������]"
 
-#: g10/g10.c:1199
+#: g10/g10.c:1222
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "������ �������������: %s\n"
 
-#: g10/g10.c:1207
+#: g10/g10.c:1230
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "������ �����������: %s\n"
 
-#: g10/g10.c:1275
+#: g10/g10.c:1298
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "������������ ���-�������� `%s'\n"
 
-#: g10/g10.c:1356
+#: g10/g10.c:1379
 msgid "[filename]"
 msgstr "[��� �����]"
 
-#: g10/g10.c:1360
+#: g10/g10.c:1383
 msgid "Go ahead and type your message ...\n"
 msgstr ""
 
-#: g10/decrypt.c:59 g10/g10.c:1363 g10/verify.c:66
+#: g10/decrypt.c:59 g10/g10.c:1386 g10/verify.c:66
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "���������� ������� ���� `%s'\n"
 
-#: g10/g10.c:1532
+#: g10/g10.c:1555
 msgid ""
 "the first character of a notation name must be a letter or an underscore\n"
 msgstr ""
 
-#: g10/g10.c:1538
+#: g10/g10.c:1561
 msgid ""
 "a notation name must have only letters, digits, dots or underscores and end "
 "with an '='\n"
 msgstr ""
 
-#: g10/g10.c:1544
+#: g10/g10.c:1567
 msgid "dots in a notation name must be surrounded by other characters\n"
 msgstr ""
 
-#: g10/g10.c:1552
+#: g10/g10.c:1575
 msgid "a notation value must not use any control characters\n"
 msgstr ""
 
@@ -959,14 +959,20 @@ msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
 
+#. Translators: this shoud fit into 24 bytes to that the fingerprint
+#. * data is properly aligned with the user ID
+#: g10/pkclist.c:53
+msgid "             Fingerprint:"
+msgstr ""
+
 # valid user replies (not including 1..4)
 #. a string with valid answers
-#: g10/pkclist.c:140
+#: g10/pkclist.c:170
 #, fuzzy
 msgid "sSmMqQ"
 msgstr "sSmMqQ"
 
-#: g10/pkclist.c:144
+#: g10/pkclist.c:174
 #, fuzzy, c-format
 msgid ""
 "No trust value assigned to %lu:\n"
@@ -975,7 +981,7 @@ msgstr ""
 "�� ���������� ��������� ������� ��� %lu:\n"
 "%4u%c/%08lX %s \""
 
-#: g10/pkclist.c:154
+#: g10/pkclist.c:186
 #, fuzzy
 msgid ""
 "Please decide how far you trust this user to correctly\n"
@@ -1000,23 +1006,23 @@ msgstr ""
 " 4 = ���� ���������\n"
 " s = ����������, �������� �������������� ����������\n"
 
-#: g10/pkclist.c:163
+#: g10/pkclist.c:195
 msgid " m = back to the main menu\n"
 msgstr " m = ������� � ������� ����\n"
 
-#: g10/pkclist.c:165
+#: g10/pkclist.c:197
 msgid " q = quit\n"
 msgstr ""
 
-#: g10/pkclist.c:171
+#: g10/pkclist.c:203
 msgid "Your decision? "
 msgstr "���� �������? "
 
-#: g10/pkclist.c:193
+#: g10/pkclist.c:225
 msgid "Certificates leading to an ultimately trusted key:\n"
 msgstr ""
 
-#: g10/pkclist.c:264
+#: g10/pkclist.c:296
 msgid ""
 "Could not find a valid trust path to the key.  Let's see whether we\n"
 "can assign some missing owner trust values.\n"
@@ -1027,70 +1033,70 @@ msgstr ""
 "��������� ����������� �������� \"������� ���������\"\n"
 "\n"
 
-#: g10/pkclist.c:270
+#: g10/pkclist.c:302
 msgid ""
 "No path leading to one of our keys found.\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:272
+#: g10/pkclist.c:304
 msgid ""
 "No certificates with undefined trust found.\n"
 "\n"
 msgstr ""
 
-#: g10/pkclist.c:274
+#: g10/pkclist.c:306
 #, fuzzy
 msgid ""
 "No trust values changed.\n"
 "\n"
 msgstr "�������� ���������� ������� �� ��������.\n"
 
-#: g10/pkclist.c:291
+#: g10/pkclist.c:323
 #, fuzzy, c-format
 msgid "key %08lX: key has been revoked!\n"
 msgstr "build_sigrecs: ���� ist widerrufen\n"
 
-#: g10/pkclist.c:297 g10/pkclist.c:307 g10/pkclist.c:413
+#: g10/pkclist.c:329 g10/pkclist.c:339 g10/pkclist.c:448
 msgid "Use this key anyway? "
 msgstr "��� ����� ������������ ���� ����?"
 
-#: g10/pkclist.c:301
+#: g10/pkclist.c:333
 #, fuzzy, c-format
 msgid "key %08lX: subkey has been revoked!\n"
 msgstr "build_sigrecs: ���� ist widerrufen\n"
 
-#: g10/pkclist.c:331
+#: g10/pkclist.c:363
 #, fuzzy, c-format
 msgid "%08lX: key has expired\n"
 msgstr "���������: ���� �������� ����� ��� �����!\n"
 
-#: g10/pkclist.c:337
+#: g10/pkclist.c:369
 #, c-format
 msgid "%08lX: no info to calculate a trust probability\n"
 msgstr ""
 
-#: g10/pkclist.c:351
+#: g10/pkclist.c:383
 #, fuzzy, c-format
 msgid "%08lX: We do NOT trust this key\n"
 msgstr "��������: �� �� �������� ����� �����!\n"
 
-#: g10/pkclist.c:357
+#: g10/pkclist.c:389
 #, c-format
 msgid ""
 "%08lX: It is not sure that this key really belongs to the owner\n"
 "but it is accepted anyway\n"
 msgstr ""
 
-#: g10/pkclist.c:363
+#: g10/pkclist.c:395
 msgid "This key probably belongs to the owner\n"
 msgstr ""
 
-#: g10/pkclist.c:368
+#: g10/pkclist.c:400
 msgid "This key belongs to us\n"
 msgstr ""
 
-#: g10/pkclist.c:408
+#: g10/pkclist.c:443
 msgid ""
 "It is NOT certain that the key belongs to its owner.\n"
 "If you *really* know what you are doing, you may answer\n"
@@ -1101,65 +1107,65 @@ msgstr ""
 "��� ������ ��� ����������. ��������� \"��\" �� ��������� ������,\n"
 "������ ���� �� *�������������* ��������� ��� �������.\n"
 
-#: g10/pkclist.c:421 g10/pkclist.c:443
+#: g10/pkclist.c:456 g10/pkclist.c:478
 msgid "WARNING: Using untrusted key!\n"
 msgstr "��������: ������������ ���� � �������� ��� �������!\n"
 
-#: g10/pkclist.c:464
+#: g10/pkclist.c:499
 msgid "WARNING: This key has been revoked by its owner!\n"
 msgstr "��������: �������� ����� ��� ������� ���!\n"
 
-#: g10/pkclist.c:465
+#: g10/pkclist.c:500
 msgid "         This could mean that the signature is forgery.\n"
 msgstr "          ��� ����� ��������, ��� ������� ����������.\n"
 
-#: g10/pkclist.c:469
+#: g10/pkclist.c:504
 #, fuzzy
 msgid "WARNING: This subkey has been revoked by its owner!\n"
 msgstr "��������: �������� ����� ��� ������� ���!\n"
 
-#: g10/pkclist.c:490
+#: g10/pkclist.c:525
 msgid "Note: This key has expired!\n"
 msgstr "���������: ���� �������� ����� ��� �����!\n"
 
-#: g10/pkclist.c:497
+#: g10/pkclist.c:532
 msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "��������: ���� ���� �� ������� ���������� ��������!\n"
 
-#: g10/pkclist.c:499
+#: g10/pkclist.c:534
 msgid ""
 "         There is no indication that the signature belongs to the owner.\n"
 msgstr ""
 "         ��� ������� �������� �� ��, ��� ���� ����������� ��� ���������.\n"
 
-#: g10/pkclist.c:515
+#: g10/pkclist.c:550
 msgid "WARNING: We do NOT trust this key!\n"
 msgstr "��������: �� �� �������� ����� �����!\n"
 
-#: g10/pkclist.c:516
+#: g10/pkclist.c:551
 msgid "         The signature is probably a FORGERY.\n"
 msgstr "         ������� �������� -- ��������.\n"
 
-#: g10/pkclist.c:523
+#: g10/pkclist.c:558
 msgid ""
 "WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr "��������: ���� ���� �� ������� ���������� ����������� ���������!\n"
 
-#: g10/pkclist.c:526
+#: g10/pkclist.c:561
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "          ��� �����������, ��� ������� ����������� ���������.\n"
 
-#: g10/pkclist.c:627 g10/pkclist.c:649 g10/pkclist.c:758 g10/pkclist.c:803
+#: g10/pkclist.c:662 g10/pkclist.c:684 g10/pkclist.c:793 g10/pkclist.c:838
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: ��������: %s\n"
 
-#: g10/pkclist.c:635 g10/pkclist.c:785
+#: g10/pkclist.c:670 g10/pkclist.c:820
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr ""
 
-#: g10/pkclist.c:662
+#: g10/pkclist.c:697
 msgid ""
 "You did not specify a user ID. (you may use \"-r\")\n"
 "\n"
@@ -1168,34 +1174,34 @@ msgstr ""
 "\"-r\").\n"
 "\n"
 
-#: g10/pkclist.c:672
+#: g10/pkclist.c:707
 msgid "Enter the user ID: "
 msgstr "������� ������������� ������������: "
 
-#: g10/pkclist.c:684
+#: g10/pkclist.c:719
 msgid "No such user ID.\n"
 msgstr "��� ������ �������������� ������������.\n"
 
-#: g10/pkclist.c:704
+#: g10/pkclist.c:739
 #, fuzzy
 msgid "Public key is disabled.\n"
 msgstr "�������� ���� �� ������"
 
-#: g10/pkclist.c:733
+#: g10/pkclist.c:768
 msgid "unknown default recipient `s'\n"
 msgstr ""
 
-#: g10/pkclist.c:766
+#: g10/pkclist.c:801
 #, c-format
 msgid "%s: error checking key: %s\n"
 msgstr "%s: ������ ��� �������� �����: %s\n"
 
-#: g10/pkclist.c:771
+#: g10/pkclist.c:806
 #, c-format
 msgid "%s: skipped: public key is disabled\n"
 msgstr ""
 
-#: g10/pkclist.c:809
+#: g10/pkclist.c:844
 msgid "no valid addressees\n"
 msgstr "��� ���������� �������\n"
 
@@ -1588,243 +1594,248 @@ msgstr ""
 msgid "too many entries in unk cache - disabled\n"
 msgstr ""
 
-#: g10/getkey.c:1535 g10/getkey.c:1591
+#: g10/getkey.c:1565 g10/getkey.c:1621
 #, c-format
 msgid "using secondary key %08lX instead of primary key %08lX\n"
 msgstr "������������ �������������� ���� %09lX ������ ��������� %08lX%\n"
 
-#: g10/import.c:117
+#: g10/import.c:118
 #, fuzzy, c-format
 msgid "can't open `%s': %s\n"
 msgstr "���������� ������� ���� `%s': %s\n"
 
-#: g10/import.c:161
+#: g10/import.c:162
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "���������� ���� ���� %d\n"
 
-#: g10/import.c:168 g10/trustdb.c:1658 g10/trustdb.c:1697
+#: g10/import.c:169 g10/trustdb.c:1658 g10/trustdb.c:1697
 #, c-format
 msgid "%lu keys so far processed\n"
 msgstr ""
 
-#: g10/import.c:173
+#: g10/import.c:174
 #, fuzzy, c-format
 msgid "error reading `%s': %s\n"
 msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n"
 
-#: g10/import.c:176
+#: g10/import.c:177
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr ""
 
-#: g10/import.c:178
+#: g10/import.c:179
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr ""
 
-#: g10/import.c:180
+#: g10/import.c:181
 #, c-format
 msgid "              imported: %lu"
 msgstr ""
 
-#: g10/import.c:186
+#: g10/import.c:187
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr ""
 
-#: g10/import.c:188
+#: g10/import.c:189
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr ""
 
-#: g10/import.c:190
+#: g10/import.c:191
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr ""
 
-#: g10/import.c:192
+#: g10/import.c:193
 #, fuzzy, c-format
 msgid "        new signatures: %lu\n"
 msgstr "���� %08lX: %d ����� ��������\n"
 
-#: g10/import.c:194
+#: g10/import.c:195
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr ""
 
-#: g10/import.c:196
+#: g10/import.c:197
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr ""
 
-#: g10/import.c:198
+#: g10/import.c:199
 #, fuzzy, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "���� %08lX: ��������� ���� ������������\n"
 
-#: g10/import.c:200
+#: g10/import.c:201
 #, fuzzy, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "����������� ������������ ��������� ����"
 
-#: g10/import.c:361 g10/import.c:550
+#: g10/import.c:362 g10/import.c:554
 #, c-format
 msgid "key %08lX: no user id\n"
 msgstr "���� %08lX: ��� �������������� ������������\n"
 
-#: g10/import.c:372
+#: g10/import.c:376
 #, c-format
 msgid "key %08lX: no valid user ids\n"
 msgstr "���� %08lX: ��� ���������� ��������������� �������������\n"
 
-#: g10/import.c:374
+#: g10/import.c:378
 msgid "this may be caused by a missing self-signature\n"
 msgstr "��� ����� ���� ������� ����������� ����-�������\n"
 
-#: g10/import.c:385 g10/import.c:617
+#: g10/import.c:389 g10/import.c:621
 #, c-format
 msgid "key %08lX: public key not found: %s\n"
 msgstr "���� %08lX: �������� ���� �� ������: %s\n"
 
-#: g10/import.c:391
+#: g10/import.c:395
 msgid "no default public keyring\n"
 msgstr "��� ������ �������� ������ �� ���������\n"
 
-#: g10/import.c:395 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:559
+#: g10/import.c:399 g10/openfile.c:186 g10/sign.c:268 g10/sign.c:559
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "������������ � `%s'\n"
 
-#: g10/import.c:398 g10/import.c:456 g10/import.c:565 g10/import.c:666
+#: g10/import.c:402 g10/import.c:460 g10/import.c:569 g10/import.c:670
 #, fuzzy, c-format
 msgid "can't lock keyring `%s': %s\n"
 msgstr "���������� ������������� ������ �������� ������: %s\n"
 
-#: g10/import.c:401 g10/import.c:459 g10/import.c:568 g10/import.c:669
+#: g10/import.c:405 g10/import.c:463 g10/import.c:572 g10/import.c:673
 #, fuzzy, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "Fehler beim Erzeugen der \"Passphrase\": %s\n"
 
-#: g10/import.c:406
+#: g10/import.c:410
 #, c-format
 msgid "key %08lX: public key imported\n"
 msgstr "���� %08lX: �������� ���� ������������\n"
 
-#: g10/import.c:423
+#: g10/import.c:427
 #, c-format
 msgid "key %08lX: doesn't match our copy\n"
 msgstr "���� %08lX: �� ��������� � ����� ������\n"
 
-#: g10/import.c:432 g10/import.c:625
+#: g10/import.c:436 g10/import.c:629
 #, c-format
 msgid "key %08lX: can't locate original keyblock: %s\n"
 msgstr "���� %08lX: ���������� ���������� original keyblock: %s\n"
 
-#: g10/import.c:438 g10/import.c:631
+#: g10/import.c:442 g10/import.c:635
 #, c-format
 msgid "key %08lX: can't read original keyblock: %s\n"
 msgstr "���� %08lX: ���������� ��������� original keyblock: %s\n"
 
-#: g10/import.c:465
+#: g10/import.c:469
 #, c-format
 msgid "key %08lX: 1 new user-id\n"
 msgstr "���� %08lX: 1 ����� ������������� ������������\n"
 
-#: g10/import.c:468
+#: g10/import.c:472
 #, c-format
 msgid "key %08lX: %d new user-ids\n"
 msgstr "���� %08lX: %d ����� ��������������� �������������\n"
 
-#: g10/import.c:471
+#: g10/import.c:475
 #, c-format
 msgid "key %08lX: 1 new signature\n"
 msgstr "���� %08lX: 1 ����� �������\n"
 
-#: g10/import.c:474
+#: g10/import.c:478
 #, c-format
 msgid "key %08lX: %d new signatures\n"
 msgstr "���� %08lX: %d ����� ��������\n"
 
-#: g10/import.c:477
+#: g10/import.c:481
 #, c-format
 msgid "key %08lX: 1 new subkey\n"
 msgstr "���� %08lX: 1 ����� ���-����\n"
 
-#: g10/import.c:480
+#: g10/import.c:484
 #, c-format
 msgid "key %08lX: %d new subkeys\n"
 msgstr "���� %08lX: %d ����� ���-������\n"
 
-#: g10/import.c:490
+#: g10/import.c:494
 #, c-format
 msgid "key %08lX: not changed\n"
 msgstr "���� %08lX: �� �������\n"
 
-#: g10/import.c:573
+#: g10/import.c:577
 #, c-format
 msgid "key %08lX: secret key imported\n"
 msgstr "���� %08lX: ��������� ���� ������������\n"
 
 #. we can't merge secret keys
-#: g10/import.c:577
+#: g10/import.c:581
 #, c-format
 msgid "key %08lX: already in secret keyring\n"
 msgstr "���� %08lX: ��� �� ������ ��������� ������\n"
 
-#: g10/import.c:582
+#: g10/import.c:586
 #, c-format
 msgid "key %08lX: secret key not found: %s\n"
 msgstr "���� %08lX: ��������� ���� �� ������: %s\n"
 
-#: g10/import.c:611
+#: g10/import.c:615
 #, c-format
 msgid "key %08lX: no public key - can't apply revocation certificate\n"
 msgstr ""
 "���� %08lX: ��� ��������� ����� - ���������� ��������� ���������� "
 "����������\n"
 
-#: g10/import.c:642
+#: g10/import.c:646
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - rejected\n"
 msgstr "���� %08lX: ������������ ���������� ����������: %s - ���������\n"
 
-#: g10/import.c:674
+#: g10/import.c:678
 #, c-format
 msgid "key %08lX: revocation certificate imported\n"
 msgstr "���� %08lX: ���������� ���������� ������������\n"
 
-#: g10/import.c:707
+#: g10/import.c:711
 #, c-format
 msgid "key %08lX: no user-id for signature\n"
 msgstr "���� %08lX: ��� �������������� ������������ ��� �������\n"
 
-#: g10/import.c:714 g10/import.c:738
+#: g10/import.c:718 g10/import.c:742
 #, c-format
 msgid "key %08lX: unsupported public key algorithm\n"
 msgstr "���� %08lX: ���������������� �������� ��������� �����\n"
 
-#: g10/import.c:715
+#: g10/import.c:719
 #, c-format
 msgid "key %08lX: invalid self-signature\n"
 msgstr "���� %08lX: ������������ ����-�������\n"
 
-#: g10/import.c:730
+#: g10/import.c:734
 #, fuzzy, c-format
 msgid "key %08lX: no subkey for key binding\n"
 msgstr "���� %08lX: ��� �������������� ������������\n"
 
-#: g10/import.c:739
+#: g10/import.c:743
 #, fuzzy, c-format
 msgid "key %08lX: invalid subkey binding\n"
 msgstr "���� %08lX: ��� ���������� ��������������� �������������\n"
 
-#: g10/import.c:771
+#: g10/import.c:769
+#, fuzzy, c-format
+msgid "key %08lX: accepted non self-signed userid '"
+msgstr "���� %08lX: �������� ������������� ������������ '"
+
+#: g10/import.c:798
 #, c-format
 msgid "key %08lX: skipped userid '"
 msgstr "���� %08lX: �������� ������������� ������������ '"
 
-#: g10/import.c:794
+#: g10/import.c:821
 #, fuzzy, c-format
 msgid "key %08lX: skipped subkey\n"
 msgstr "���� %08lX: 1 ����� ���-����\n"
@@ -1833,32 +1844,32 @@ msgstr "���� %08lX: 1 ����� ���-����\n"
 #. * to import non-exportable signature when we have the
 #. * the secret key used to create this signature - it
 #. * seems that this makes sense
-#: g10/import.c:819
+#: g10/import.c:846
 #, fuzzy, c-format
 msgid "key %08lX: non exportable signature (class %02x) - skipped\n"
 msgstr "���� %08lX: ���������� ���������� � ������������ ����� - ��������\n"
 
-#: g10/import.c:828
+#: g10/import.c:855
 #, c-format
 msgid "key %08lX: revocation certificate at wrong place - skipped\n"
 msgstr "���� %08lX: ���������� ���������� � ������������ ����� - ��������\n"
 
-#: g10/import.c:836
+#: g10/import.c:863
 #, c-format
 msgid "key %08lX: invalid revocation certificate: %s - skipped\n"
 msgstr "���� %08lX: ������������ ���������� ����������: %s - ��������\n"
 
-#: g10/import.c:936
+#: g10/import.c:963
 #, c-format
 msgid "key %08lX: duplicated user ID detected - merged\n"
 msgstr ""
 
-#: g10/import.c:987
+#: g10/import.c:1014
 #, c-format
 msgid "key %08lX: revocation certificate added\n"
 msgstr "���� %08lX: ���������� ���������� ��������\n"
 
-#: g10/import.c:1100 g10/import.c:1155
+#: g10/import.c:1127 g10/import.c:1182
 #, c-format
 msgid "key %08lX: our copy has no self-signature\n"
 msgstr "���� %08lX: ���� ����� �� ����� ����-�������\n"
@@ -2448,80 +2459,80 @@ msgstr "������� ������� %.*s, ��������� %s ���� %08lX\n"
 msgid "no secret key for decryption available\n"
 msgstr "��������� ���� �� ����������"
 
-#: g10/mainproc.c:293
+#: g10/mainproc.c:300
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "����������� �������� ������ �� ������� %s\n"
 
-#: g10/mainproc.c:323
+#: g10/mainproc.c:330
 #, fuzzy
 msgid "decryption okay\n"
 msgstr "����������� �� �������: %s\n"
 
-#: g10/mainproc.c:328
+#: g10/mainproc.c:335
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr ""
 
-#: g10/mainproc.c:333
+#: g10/mainproc.c:340
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "����������� �� �������: %s\n"
 
-#: g10/mainproc.c:351
+#: g10/mainproc.c:358
 #, fuzzy
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "���������: ����������� �������� \"������-���-�����-����\"\n"
 
-#: g10/mainproc.c:353
+#: g10/mainproc.c:360
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr ""
 
-#: g10/mainproc.c:580 g10/mainproc.c:589
+#: g10/mainproc.c:587 g10/mainproc.c:596
 #, fuzzy
 msgid "WARNING: invalid notation data found\n"
 msgstr "�� ������� ���������� RFC1991 ��� OpenPGP ������.\n"
 
-#: g10/mainproc.c:592
+#: g10/mainproc.c:599
 msgid "Notation: "
 msgstr ""
 
-#: g10/mainproc.c:599
+#: g10/mainproc.c:606
 msgid "Policy: "
 msgstr ""
 
-#: g10/mainproc.c:1018
+#: g10/mainproc.c:1025
 msgid "signature verification suppressed\n"
 msgstr ""
 
-#: g10/mainproc.c:1024
+#: g10/mainproc.c:1031
 #, c-format
 msgid "Signature made %.*s using %s key ID %08lX\n"
 msgstr "������� ������� %.*s, ��������� %s ���� %08lX\n"
 
 #. just in case that we have no userid
-#: g10/mainproc.c:1050 g10/mainproc.c:1061
+#: g10/mainproc.c:1057 g10/mainproc.c:1068
 msgid "BAD signature from \""
 msgstr "������ ������� �� \""
 
-#: g10/mainproc.c:1051 g10/mainproc.c:1062
+#: g10/mainproc.c:1058 g10/mainproc.c:1069
 msgid "Good signature from \""
 msgstr "������� ������� �� \""
 
-#: g10/mainproc.c:1053
+#: g10/mainproc.c:1060
 msgid "                aka \""
 msgstr ""
 
-#: g10/mainproc.c:1104
+#: g10/mainproc.c:1115
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "���������� ��������� �������: %s\n"
 
-#: g10/mainproc.c:1198
+#: g10/mainproc.c:1209
 msgid "old style (PGP 2.x) signature\n"
 msgstr ""
 
-#: g10/mainproc.c:1203
+#: g10/mainproc.c:1214
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
@@ -2738,7 +2749,7 @@ msgstr "%s: ���������� �������: %s\n"
 msgid "%s: directory does not exist!\n"
 msgstr ""
 
-#: g10/openfile.c:182 g10/openfile.c:253 g10/ringedit.c:1344 g10/tdbio.c:457
+#: g10/openfile.c:182 g10/openfile.c:253 g10/ringedit.c:1346 g10/tdbio.c:457
 #, fuzzy, c-format
 msgid "%s: can't create: %s\n"
 msgstr "%s: ���������� �������: %s\n"
@@ -3137,26 +3148,26 @@ msgstr ""
 msgid "%s: can't create keyring: %s\n"
 msgstr "%s: ���������� �������: %s\n"
 
-#: g10/ringedit.c:333 g10/ringedit.c:1349
+#: g10/ringedit.c:333 g10/ringedit.c:1351
 #, fuzzy, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: ���������� �������: %s\n"
 
-#: g10/ringedit.c:1526
+#: g10/ringedit.c:1528
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr ""
 
-#: g10/ringedit.c:1527
+#: g10/ringedit.c:1529
 #, fuzzy, c-format
 msgid "%s is the unchanged one\n"
 msgstr "����������� ������������ ��������� ����"
 
-#: g10/ringedit.c:1528
+#: g10/ringedit.c:1530
 #, c-format
 msgid "%s is the new one\n"
 msgstr ""
 
-#: g10/ringedit.c:1529
+#: g10/ringedit.c:1531
 msgid "Please fix this possible security flaw\n"
 msgstr ""