diff --git a/NEWS b/NEWS
index 853c6e3f8..177ae3bb2 100644
--- a/NEWS
+++ b/NEWS
@@ -53,7 +53,9 @@ Noteworthy changes in version 1.4.3
 
     * Files containing several signed messages are not anymore allowed
       because there is no clean way to report the status of such files
-      back to the caller.
+      back to the caller.  To partly revert to the old behaviour the
+      new option --allow-multisig-verification may be used.
+
 
 
 Noteworthy changes in version 1.4.2 (2005-07-26)
diff --git a/checks/verify.test b/checks/verify.test
index 29ef084e7..bfd7baa0d 100755
--- a/checks/verify.test
+++ b/checks/verify.test
@@ -99,7 +99,128 @@ yW5Pvxz/XHjl
 =UNM4
 -----END PGP MESSAGE-----'
 
+# A signed message suffixed with an unsigned literal packet.
+# (fols = faked-literal-data, one-pass, literal-data, signature)
+# This should throw an error because running gpg to extract the
+# signed data will return both literal data packets
+tests="$tests bad_olsf_asc"
+bad_olsf_asc='-----BEGIN PGP MESSAGE-----
 
+kA0DAAIRLXJ8x2hpdzQBrQEHYgNtc2dEDFJaSSB0aGluayB0aGF0IGFsbCByaWdo
+dC10aGlua2luZyBwZW9wbGUgaW4gdGhpcyBjb3VudHJ5IGFyZSBzaWNrIGFuZAp0
+aXJlZCBvZiBiZWluZyB0b2xkIHRoYXQgb3JkaW5hcnkgZGVjZW50IHBlb3BsZSBh
+cmUgZmVkIHVwIGluIHRoaXMKY291bnRyeSB3aXRoIGJlaW5nIHNpY2sgYW5kIHRp
+cmVkLiAgSSdtIGNlcnRhaW5seSBub3QuICBCdXQgSSdtCnNpY2sgYW5kIHRpcmVk
+IG9mIGJlaW5nIHRvbGQgdGhhdCBJIGFtLgotIE1vbnR5IFB5dGhvbgqIPwMFAEQM
+UlotcnzHaGl3NBECR4IAoJlEGTY+bHjD2HYuCixLQCmk01pbAKCIjkzLOAmkZNm0
+D8luT78c/1x45axdYgxtc2cudW5zaWduZWREDGNMdGltZXNoYXJpbmcsIG46CglB
+biBhY2Nlc3MgbWV0aG9kIHdoZXJlYnkgb25lIGNvbXB1dGVyIGFidXNlcyBtYW55
+IHBlb3BsZS4K
+=3gnG
+-----END PGP MESSAGE-----'
+
+
+# Two standard signed messages in a row
+tests="$tests msg_olsols_asc_multisig"
+msg_olsols_asc_multisig='-----BEGIN PGP MESSAGE-----
+
+kA0DAAIRLXJ8x2hpdzQBrQEHYgNtc2dEDFJaSSB0aGluayB0aGF0IGFsbCByaWdo
+dC10aGlua2luZyBwZW9wbGUgaW4gdGhpcyBjb3VudHJ5IGFyZSBzaWNrIGFuZAp0
+aXJlZCBvZiBiZWluZyB0b2xkIHRoYXQgb3JkaW5hcnkgZGVjZW50IHBlb3BsZSBh
+cmUgZmVkIHVwIGluIHRoaXMKY291bnRyeSB3aXRoIGJlaW5nIHNpY2sgYW5kIHRp
+cmVkLiAgSSdtIGNlcnRhaW5seSBub3QuICBCdXQgSSdtCnNpY2sgYW5kIHRpcmVk
+IG9mIGJlaW5nIHRvbGQgdGhhdCBJIGFtLgotIE1vbnR5IFB5dGhvbgqIPwMFAEQM
+UlotcnzHaGl3NBECR4IAoJlEGTY+bHjD2HYuCixLQCmk01pbAKCIjkzLOAmkZNm0
+D8luT78c/1x45ZANAwACES1yfMdoaXc0Aa0BB2IDbXNnRAxSWkkgdGhpbmsgdGhh
+dCBhbGwgcmlnaHQtdGhpbmtpbmcgcGVvcGxlIGluIHRoaXMgY291bnRyeSBhcmUg
+c2ljayBhbmQKdGlyZWQgb2YgYmVpbmcgdG9sZCB0aGF0IG9yZGluYXJ5IGRlY2Vu
+dCBwZW9wbGUgYXJlIGZlZCB1cCBpbiB0aGlzCmNvdW50cnkgd2l0aCBiZWluZyBz
+aWNrIGFuZCB0aXJlZC4gIEknbSBjZXJ0YWlubHkgbm90LiAgQnV0IEknbQpzaWNr
+IGFuZCB0aXJlZCBvZiBiZWluZyB0b2xkIHRoYXQgSSBhbS4KLSBNb250eSBQeXRo
+b24KiD8DBQBEDFJaLXJ8x2hpdzQRAkeCAKCZRBk2Pmx4w9h2LgosS0AppNNaWwCg
+iI5MyzgJpGTZtA/Jbk+/HP9ceOU=
+=8nLN
+-----END PGP MESSAGE-----'
+
+# A standard message with two signatures (actually the same signature
+# duplicated).
+tests="$tests msg_oolss_asc"
+msg_oolss_asc='-----BEGIN PGP MESSAGE-----
+
+kA0DAAIRLXJ8x2hpdzQBkA0DAAIRLXJ8x2hpdzQBrQEHYgNtc2dEDFJaSSB0aGlu
+ayB0aGF0IGFsbCByaWdodC10aGlua2luZyBwZW9wbGUgaW4gdGhpcyBjb3VudHJ5
+IGFyZSBzaWNrIGFuZAp0aXJlZCBvZiBiZWluZyB0b2xkIHRoYXQgb3JkaW5hcnkg
+ZGVjZW50IHBlb3BsZSBhcmUgZmVkIHVwIGluIHRoaXMKY291bnRyeSB3aXRoIGJl
+aW5nIHNpY2sgYW5kIHRpcmVkLiAgSSdtIGNlcnRhaW5seSBub3QuICBCdXQgSSdt
+CnNpY2sgYW5kIHRpcmVkIG9mIGJlaW5nIHRvbGQgdGhhdCBJIGFtLgotIE1vbnR5
+IFB5dGhvbgqIPwMFAEQMUlotcnzHaGl3NBECR4IAoJlEGTY+bHjD2HYuCixLQCmk
+01pbAKCIjkzLOAmkZNm0D8luT78c/1x45Yg/AwUARAxSWi1yfMdoaXc0EQJHggCg
+mUQZNj5seMPYdi4KLEtAKaTTWlsAoIiOTMs4CaRk2bQPyW5Pvxz/XHjl
+=KVw5
+-----END PGP MESSAGE-----'
+
+# A standard message with two one-pass packet but only one signature
+# packet
+tests="$tests bad_ools_asc"
+bad_ools_asc='-----BEGIN PGP MESSAGE-----
+
+kA0DAAIRLXJ8x2hpdzQBkA0DAAIRLXJ8x2hpdzQBrQEHYgNtc2dEDFJaSSB0aGlu
+ayB0aGF0IGFsbCByaWdodC10aGlua2luZyBwZW9wbGUgaW4gdGhpcyBjb3VudHJ5
+IGFyZSBzaWNrIGFuZAp0aXJlZCBvZiBiZWluZyB0b2xkIHRoYXQgb3JkaW5hcnkg
+ZGVjZW50IHBlb3BsZSBhcmUgZmVkIHVwIGluIHRoaXMKY291bnRyeSB3aXRoIGJl
+aW5nIHNpY2sgYW5kIHRpcmVkLiAgSSdtIGNlcnRhaW5seSBub3QuICBCdXQgSSdt
+CnNpY2sgYW5kIHRpcmVkIG9mIGJlaW5nIHRvbGQgdGhhdCBJIGFtLgotIE1vbnR5
+IFB5dGhvbgqIPwMFAEQMUlotcnzHaGl3NBECR4IAoJlEGTY+bHjD2HYuCixLQCmk
+01pbAKCIjkzLOAmkZNm0D8luT78c/1x45Q==
+=1/ix
+-----END PGP MESSAGE-----'
+
+# Standard cleartext signature
+tests="$tests msg_cls_asc"
+msg_cls_asc=`cat <<EOF
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+I think that all right-thinking people in this country are sick and
+tired of being told that ordinary decent people are fed up in this
+country with being sick and tired.  I'm certainly not.  But I'm
+sick and tired of being told that I am.
+- - Monty Python
+-----BEGIN PGP SIGNATURE-----
+
+iD8DBQFEDVp1LXJ8x2hpdzQRAplUAKCMfpG3GPw/TLN52tosgXP5lNECkwCfQhAa
+emmev7IuQjWYrGF9Lxj+zj8=
+=qJsY
+-----END PGP SIGNATURE-----
+EOF
+`
+
+# Cleartext signature with two signatures
+tests="$tests msg_clss_asc"
+msg_clss_asc=`cat <<EOF
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+What is the difference between a Turing machine and the modern computer?
+It's the same as that between Hillary's ascent of Everest and the
+establishment of a Hilton on its peak.
+-----BEGIN PGP SIGNATURE-----
+
+iD8DBQFEDVz6LXJ8x2hpdzQRAtkGAKCeMhNbHnh339fpjNj9owsYcC4zBwCfYO5l
+2u+KEfXX0FKyk8SMzLjZ536IPwMFAUQNXPr+GAsdqeOwshEC2QYAoPOWAiQm0EF/
+FWIAQUplk7JWbyRKAJ92ZJyJpWfzb0yc1s7MY65r2qEHrg==
+=1Xvv
+-----END PGP SIGNATURE-----
+EOF
+`
+
+# Two clear text signatures in a row
+tests="$tests msg_clsclss_asc"
+msg_clsclss_asc="${msg_cls_asc}
+${msg_clss_asc}"
+
+
+# Fixme:  We need more tests with manipulated cleartext signatures.
 
 
 #
@@ -107,13 +228,17 @@ yW5Pvxz/XHjl
 #
 for i in $tests ; do
    info "checking: $i"
+   eval "(IFS=; echo \"\$$i\")" >x
    case "$i" in
     msg_*_asc)
-       eval "(IFS=; echo \"\$$i\")" >x
        $GPG --verify x || error "verify of $i failed"
        ;;
+    msg_*_asc_multisig)
+       $GPG --verify --allow-multisig-verification x \
+           || error "verify of $i failed"
+       $GPG --verify x && error "verify of $i succeeded but should not"
+       ;;
     bad_*_asc)
-       eval "(IFS=; echo \"\$$i\")" >x
        $GPG --verify x && error "verify of $i succeeded but should not"
        ;;
     *)
diff --git a/doc/gpg.sgml b/doc/gpg.sgml
index ced9b313c..c6157f340 100644
--- a/doc/gpg.sgml
+++ b/doc/gpg.sgml
@@ -2877,6 +2877,15 @@ behaviour as used by anonymous recipients (created by using
 message contains a bogus key ID.
 </para></listitem></varlistentry>
 
+<varlistentry>
+<term>--allow-multisig-verification</term>
+<listitem><para>
+Allow verification of concatenated signed messages.  This will run a
+signature verification for each data+signature block.  There are some
+security issues with this option thus it is off by default.  Note that
+versions of gpg rpior to version 1.4.3 implicityly allowed for this.
+</para></listitem></varlistentry>
+
 <varlistentry>
 <term>--enable-special-filenames</term>
 <listitem><para>
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 7bb6f4edd..2ecd3ed7c 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,9 @@
+2006-03-07  Werner Koch  <wk@g10code.com>
+
+	* mainproc.c (proc_signature_packets): Return any_sig_seen to caller.
+	(check_sig_and_print): Option to partly allow the old behaviour.
+	* gpg.c: New option --allow-multisig-verification.
+
 2006-03-06  David Shaw  <dshaw@jabberwocky.com>
 
 	* sign.c (make_keysig_packet): Don't use MD5 for a RSA_S key as
diff --git a/g10/gpg.c b/g10/gpg.c
index 03440538f..074eb4e4a 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -362,6 +362,7 @@ enum cmd_and_opt_values
     oNoRequireBacksigs,
     oAutoKeyLocate,
     oNoAutoKeyLocate,
+    oAllowMultisigVerification,
 
     oNoop
   };
@@ -699,6 +700,8 @@ static ARGPARSE_OPTS opts[] = {
 #if defined(ENABLE_CARD_SUPPORT) && defined(HAVE_LIBUSB)
     { oDebugCCIDDriver, "debug-ccid-driver", 0, "@"},
 #endif
+    { oAllowMultisigVerification, "allow-multisig-verification", 0, "@"},
+
     /* These two are aliases to help users of the PGP command line
        product use gpg with minimal pain.  Many commands are common
        already as they seem to have borrowed commands from us.  Now
@@ -2669,6 +2672,10 @@ main (int argc, char **argv )
 	    release_akl();
 	    break;
 
+          case oAllowMultisigVerification:
+            opt.allow_multisig_verification = 1;
+            break;
+
 	  case oNoop: break;
 
 	  default : pargs.err = configfp? 1:2; break;
diff --git a/g10/mainproc.c b/g10/mainproc.c
index dd9909bcf..cc865a833 100644
--- a/g10/mainproc.c
+++ b/g10/mainproc.c
@@ -1163,6 +1163,13 @@ proc_signature_packets( void *anchor, IOBUF a,
         log_error (_("no signature found\n"));
         rc = G10ERR_NO_DATA;
       }
+
+    /* Propagate the signature seen flag upward. Do this only on
+       success so that we won't issue the nodata status several
+       times. */
+    if (!rc && c->anchor && c->any_sig_seen)
+      c->anchor->any_sig_seen = 1;
+
     xfree( c );
     return rc;
 }
@@ -1445,8 +1452,8 @@ check_sig_and_print( CTX c, KBNODE node )
     KBNODE n;
     int n_onepass, n_sig;
 
-    log_debug ("checking signature packet composition\n");
-    dump_kbnode (c->list);
+/*     log_debug ("checking signature packet composition\n"); */
+/*     dump_kbnode (c->list); */
 
     n = c->list;
     assert (n);
@@ -1482,7 +1489,9 @@ check_sig_and_print( CTX c, KBNODE node )
         for (n_sig=0, n = n->next;
              n && n->pkt->pkttype == PKT_SIGNATURE; n = n->next)
           n_sig++;
-        if (n || !n_sig)
+        if (!n_sig)
+          goto ambiguous;
+        if (n && !opt.allow_multisig_verification)
           goto ambiguous;
         if (n_onepass != n_sig)
           {
diff --git a/g10/options.h b/g10/options.h
index 28b813250..422d36b85 100644
--- a/g10/options.h
+++ b/g10/options.h
@@ -231,6 +231,9 @@ struct
     struct akl *next;
   } *auto_key_locate;
 
+  /* True if multiple concatenated signatures may be verified. */
+  int allow_multisig_verification; 
+
 } opt;
 
 /* CTRL is used to keep some global variables we currently can't
diff --git a/po/be.po b/po/be.po
index 68f5941bd..88d5adcbf 100644
--- a/po/be.po
+++ b/po/be.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2006-02-14 15:28+0100\n"
+"POT-Creation-Date: 2006-03-07 11:29+0100\n"
 "PO-Revision-Date: 2003-10-30 16:35+0200\n"
 "Last-Translator: Ales Nyakhaychyk <nab@mail.by>\n"
 "Language-Team: Belarusian <i18n@mova.org>\n"
@@ -41,9 +41,9 @@ msgstr "запіс у stdout\n"
 
 #: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:992 g10/gpg.c:3360 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:997 g10/gpg.c:3391 g10/import.c:193 g10/keygen.c:2274
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:476 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
+#: g10/plaintext.c:482 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
 #: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
@@ -77,7 +77,7 @@ msgstr ""
 msgid "note: random_seed file not updated\n"
 msgstr ""
 
-#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:991 g10/keygen.c:2753
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2753
 #: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
 #: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
 #, c-format
@@ -670,47 +670,47 @@ msgstr "сакрэтны ключ недаступны"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Нерэчаісны загад (паспрабуйце \"help\")\n"
 
-#: g10/cardglue.c:435
+#: g10/cardglue.c:434
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:572
+#: g10/cardglue.c:573
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:580
+#: g10/cardglue.c:582
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:915
+#: g10/cardglue.c:917
 msgid "Enter New Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:916
+#: g10/cardglue.c:918
 msgid "Enter New PIN: "
 msgstr ""
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:919
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:920
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/cardglue.c:935
+#: g10/cardglue.c:937
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Паўтарыце пароль: "
 
-#: g10/cardglue.c:950
+#: g10/cardglue.c:952
 msgid "PIN not correctly repeated; try again"
 msgstr ""
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3720 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3751 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -720,13 +720,13 @@ msgstr "немагчыма адкрыць \"%s\"\n"
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1644
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1698
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1658
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1712
 #: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -833,12 +833,12 @@ msgstr ""
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr ""
 
-#: g10/encr-data.c:67 g10/mainproc.c:306
+#: g10/encr-data.c:67 g10/mainproc.c:293
 #, c-format
 msgid "%s encrypted data\n"
 msgstr ""
 
-#: g10/encr-data.c:69 g10/mainproc.c:310
+#: g10/encr-data.c:69 g10/mainproc.c:297
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr ""
@@ -973,7 +973,7 @@ msgstr ""
 msgid "WARNING: nothing exported\n"
 msgstr ""
 
-#: g10/gpg.c:372
+#: g10/gpg.c:373
 msgid ""
 "@Commands:\n"
 " "
@@ -981,128 +981,128 @@ msgstr ""
 "@Загады:\n"
 " "
 
-#: g10/gpg.c:374
+#: g10/gpg.c:375
 msgid "|[file]|make a signature"
 msgstr "|[файл]|зрабіць подпіс"
 
-#: g10/gpg.c:375
+#: g10/gpg.c:376
 msgid "|[file]|make a clear text signature"
 msgstr "|[файл]|зрабіць чысты тэкставы подпіс"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:377
 msgid "make a detached signature"
 msgstr "зрабіць адчэплены подпіс"
 
-#: g10/gpg.c:377
+#: g10/gpg.c:378
 msgid "encrypt data"
 msgstr "зашыфраваць даньні"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:380
 msgid "encryption only with symmetric cipher"
 msgstr "шыфраваньне толькі сымэтрычнымі шыфрамі"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:382
 msgid "decrypt data (default)"
 msgstr "разшыфраваць даньні (дапомна)"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:384
 msgid "verify a signature"
 msgstr "праверыць подпіс"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:386
 msgid "list keys"
 msgstr "паказаць сьпіс ключоў"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "list keys and signatures"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:389
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "праверыць подпісы ключа"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:390
 msgid "list keys and fingerprints"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:391
 msgid "list secret keys"
 msgstr "паказаць сакрэтныя ключы"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:392
 msgid "generate a new key pair"
 msgstr "стварыць новую пару ключоў"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:393
 msgid "remove keys from the public keyring"
 msgstr "выдаліць ключы са зьвязку грамадскіх ключоў"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:395
 msgid "remove keys from the secret keyring"
 msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:396
 msgid "sign a key"
 msgstr "падпісаць ключ"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:397
 msgid "sign a key locally"
 msgstr "падпісаць ключ толькі мясцова"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:398
 msgid "sign or edit a key"
 msgstr "падпісаць ці рэдагаваць ключ"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:399
 msgid "generate a revocation certificate"
 msgstr ""
 
-#: g10/gpg.c:400
+#: g10/gpg.c:401
 msgid "export keys"
 msgstr "экспарт ключоў"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:402
 msgid "export keys to a key server"
 msgstr "экспартаваць ключы на паслужнік ключоў"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:403
 msgid "import keys from a key server"
 msgstr "імпартаваць ключы з паслужніка ключоў"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:405
 msgid "search for keys on a key server"
 msgstr ""
 
-#: g10/gpg.c:406
+#: g10/gpg.c:407
 msgid "update all keys from a keyserver"
 msgstr "абнавіць усе ключы з паслужніка ключоў"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:411
 msgid "import/merge keys"
 msgstr "імпартаваць/аб'яднаць ключы"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:414
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:414
+#: g10/gpg.c:415
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:415
+#: g10/gpg.c:416
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:423
+#: g10/gpg.c:424
 msgid "update the trust database"
 msgstr ""
 
-#: g10/gpg.c:430
+#: g10/gpg.c:431
 msgid "|algo [files]|print message digests"
 msgstr ""
 
-#: g10/gpg.c:434 g10/gpgv.c:71
+#: g10/gpg.c:435 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1112,51 +1112,51 @@ msgstr ""
 "Выбары:\n"
 " "
 
-#: g10/gpg.c:436
+#: g10/gpg.c:437
 msgid "create ascii armored output"
 msgstr ""
 
-#: g10/gpg.c:438
+#: g10/gpg.c:439
 msgid "|NAME|encrypt for NAME"
 msgstr "|ІМЯ|   зашыфраваць для вылучанай асобы"
 
-#: g10/gpg.c:449
+#: g10/gpg.c:450
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 
-#: g10/gpg.c:450
+#: g10/gpg.c:451
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 
-#: g10/gpg.c:455
+#: g10/gpg.c:456
 msgid "use canonical text mode"
 msgstr ""
 
-#: g10/gpg.c:469
+#: g10/gpg.c:470
 msgid "use as output file"
 msgstr "выкарыстоўваць у якасьці файла вываду"
 
-#: g10/gpg.c:471 g10/gpgv.c:73
+#: g10/gpg.c:472 g10/gpgv.c:73
 msgid "verbose"
 msgstr "шматслоўнасьць"
 
-#: g10/gpg.c:482
+#: g10/gpg.c:483
 msgid "do not make any changes"
 msgstr "не рабіць ніякіх зьменаў"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:484
 msgid "prompt before overwriting"
 msgstr "пытацца перад перазапісам"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:525
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:553
+#: g10/gpg.c:554
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1164,7 +1164,7 @@ msgstr ""
 "@\n"
 "(Глядзіце man старонку, для больш поўнага апісаньня ўсіх загадаў і выбараў)\n"
 
-#: g10/gpg.c:556
+#: g10/gpg.c:557
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1184,15 +1184,15 @@ msgstr ""
 " --list-keys [назвы]        паказаць ключы\n"
 " --fingerprint [назвы]      паказаць адбіткі пальцаў\n"
 
-#: g10/gpg.c:746 g10/gpgv.c:98
+#: g10/gpg.c:751 g10/gpgv.c:98
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Калі ласка, паведамляйце пра памылкі на <gnupg-bugs@gnu.org>.\n"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:768
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
 
-#: g10/gpg.c:766
+#: g10/gpg.c:771
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1202,7 +1202,7 @@ msgstr ""
 "sign, check, encrypt ці decrypt\n"
 "Дапомнае дзеяньне залежыць ад уваходных даньняў\n"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:782
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1210,567 +1210,576 @@ msgstr ""
 "\n"
 "Альгарытмы, якія падтрымліваюцца:\n"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:785
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/gpg.c:786 g10/keyedit.c:2266
+#: g10/gpg.c:791 g10/keyedit.c:2266
 msgid "Cipher: "
 msgstr ""
 
-#: g10/gpg.c:792
+#: g10/gpg.c:797
 msgid "Hash: "
 msgstr ""
 
-#: g10/gpg.c:798 g10/keyedit.c:2312
+#: g10/gpg.c:803 g10/keyedit.c:2312
 msgid "Compression: "
 msgstr ""
 
-#: g10/gpg.c:881
+#: g10/gpg.c:886
 msgid "usage: gpg [options] "
 msgstr "Выкарыстаньне: gpg [выбары] "
 
-#: g10/gpg.c:1029
+#: g10/gpg.c:1034
 msgid "conflicting commands\n"
 msgstr "несумяшчальныя загады\n"
 
-#: g10/gpg.c:1047
+#: g10/gpg.c:1052
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1244
+#: g10/gpg.c:1249
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1247
+#: g10/gpg.c:1252
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1250
+#: g10/gpg.c:1255
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1256
+#: g10/gpg.c:1261
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1259
+#: g10/gpg.c:1264
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1262
+#: g10/gpg.c:1267
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1268
+#: g10/gpg.c:1273
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1271
+#: g10/gpg.c:1276
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1274
+#: g10/gpg.c:1279
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1280
+#: g10/gpg.c:1285
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1283
+#: g10/gpg.c:1288
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1286
+#: g10/gpg.c:1291
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1427
+#: g10/gpg.c:1432
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "невядомая вэрсыя"
 
-#: g10/gpg.c:1521
+#: g10/gpg.c:1526
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1523
+#: g10/gpg.c:1528
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1525
+#: g10/gpg.c:1530
 msgid "show all notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1527
+#: g10/gpg.c:1532
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1536
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1538
 msgid "show preferred keyserver URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1540
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1542
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1544
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1546
 msgid "show the keyring name in key listings"
 msgstr ""
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1548
 msgid "show expiration dates during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1874
+#: g10/gpg.c:1879
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr ""
 
-#: g10/gpg.c:1916
+#: g10/gpg.c:1921
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1920
+#: g10/gpg.c:1925
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr ""
 
-#: g10/gpg.c:1927
+#: g10/gpg.c:1932
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:2142 g10/gpg.c:2716 g10/gpg.c:2735
+#: g10/gpg.c:2147 g10/gpg.c:2747 g10/gpg.c:2766
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr ""
 
-#: g10/gpg.c:2158
+#: g10/gpg.c:2163
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 
-#: g10/gpg.c:2312 g10/gpg.c:2324
+#: g10/gpg.c:2317 g10/gpg.c:2329
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2400
+#: g10/gpg.c:2405
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2422 g10/keyedit.c:3997
+#: g10/gpg.c:2429 g10/keyedit.c:3997
 msgid "could not parse keyserver URL\n"
 msgstr ""
 
-#: g10/gpg.c:2428
+#: g10/gpg.c:2441
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2431
+#: g10/gpg.c:2444
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2438
+#: g10/gpg.c:2451
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: недапушчальныя выбары імпартаваньня\n"
 
-#: g10/gpg.c:2441
+#: g10/gpg.c:2454
 msgid "invalid import options\n"
 msgstr "недапушчальныя выбары імпартаваньня\n"
 
-#: g10/gpg.c:2448
+#: g10/gpg.c:2461
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2464
 msgid "invalid export options\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2458
+#: g10/gpg.c:2471
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: недапушчальныя выбары імпартаваньня\n"
 
-#: g10/gpg.c:2461
+#: g10/gpg.c:2474
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "недапушчальныя выбары імпартаваньня\n"
 
-#: g10/gpg.c:2469
+#: g10/gpg.c:2482
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2471
+#: g10/gpg.c:2484
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2473
+#: g10/gpg.c:2486
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2475
+#: g10/gpg.c:2488
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2479
+#: g10/gpg.c:2492
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2481
+#: g10/gpg.c:2494
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2483
+#: g10/gpg.c:2496
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2485
+#: g10/gpg.c:2498
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2505
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2495
+#: g10/gpg.c:2508
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2502
+#: g10/gpg.c:2515
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2705
+#: g10/gpg.c:2665
+#, fuzzy, c-format
+msgid "%s:%d: invalid auto-key-locate list\n"
+msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
+
+#: g10/gpg.c:2668
+msgid "invalid auto-key-locate list\n"
+msgstr ""
+
+#: g10/gpg.c:2736
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2740
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/gpg.c:2718
+#: g10/gpg.c:2749
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s не дазваляецца разам з %s!\n"
 
-#: g10/gpg.c:2721
+#: g10/gpg.c:2752
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ня мае сэнсу разам з %s!\n"
 
-#: g10/gpg.c:2728
+#: g10/gpg.c:2759
 #, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr ""
 
-#: g10/gpg.c:2743
+#: g10/gpg.c:2774
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "запіс у stdout\n"
 
-#: g10/gpg.c:2757
+#: g10/gpg.c:2788
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:2763
+#: g10/gpg.c:2794
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:2769
+#: g10/gpg.c:2800
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/gpg.c:2782
+#: g10/gpg.c:2813
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/gpg.c:2849 g10/gpg.c:2873
+#: g10/gpg.c:2880 g10/gpg.c:2904
 msgid "selected cipher algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:2855 g10/gpg.c:2879
+#: g10/gpg.c:2886 g10/gpg.c:2910
 msgid "selected digest algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:2861
+#: g10/gpg.c:2892
 msgid "selected compression algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:2867
+#: g10/gpg.c:2898
 msgid "selected certification digest algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:2882
+#: g10/gpg.c:2913
 msgid "completes-needed must be greater than 0\n"
 msgstr ""
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2915
 msgid "marginals-needed must be greater than 1\n"
 msgstr ""
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2917
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr ""
 
-#: g10/gpg.c:2888
+#: g10/gpg.c:2919
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 
-#: g10/gpg.c:2890
+#: g10/gpg.c:2921
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr ""
 
-#: g10/gpg.c:2893
+#: g10/gpg.c:2924
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr ""
 
-#: g10/gpg.c:2897
+#: g10/gpg.c:2928
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr ""
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2935
 msgid "invalid default preferences\n"
 msgstr "недапушчальныя дапомныя перавагі\n"
 
-#: g10/gpg.c:2913
+#: g10/gpg.c:2944
 msgid "invalid personal cipher preferences\n"
 msgstr ""
 
-#: g10/gpg.c:2917
+#: g10/gpg.c:2948
 msgid "invalid personal digest preferences\n"
 msgstr ""
 
-#: g10/gpg.c:2921
+#: g10/gpg.c:2952
 msgid "invalid personal compress preferences\n"
 msgstr ""
 
-#: g10/gpg.c:2954
+#: g10/gpg.c:2985
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ня мае сэнсу разам з %s!\n"
 
-#: g10/gpg.c:3001
+#: g10/gpg.c:3032
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3006
+#: g10/gpg.c:3037
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3011
+#: g10/gpg.c:3042
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3107
+#: g10/gpg.c:3138
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3118
+#: g10/gpg.c:3149
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3129
+#: g10/gpg.c:3160
 msgid "--store [filename]"
 msgstr "--store [назва_файла]"
 
-#: g10/gpg.c:3136
+#: g10/gpg.c:3167
 msgid "--symmetric [filename]"
 msgstr "--symmetric [назва_файла]"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3169
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3148
+#: g10/gpg.c:3179
 msgid "--encrypt [filename]"
 msgstr "--encrypt [назва_файла]"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3192
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3194
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3166
+#: g10/gpg.c:3197
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3184
+#: g10/gpg.c:3215
 msgid "--sign [filename]"
 msgstr "--sign [назва_файла]"
 
-#: g10/gpg.c:3197
+#: g10/gpg.c:3228
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/gpg.c:3212
+#: g10/gpg.c:3243
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/gpg.c:3214
+#: g10/gpg.c:3245
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3217
+#: g10/gpg.c:3248
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3237
+#: g10/gpg.c:3268
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [назва_файла]"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3277
 msgid "--clearsign [filename]"
 msgstr "--clearsign [назва_файла]"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3302
 msgid "--decrypt [filename]"
 msgstr "--decrypt [назва_файла]"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3310
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3283
+#: g10/gpg.c:3314
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3335
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [загады]"
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3406
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr ""
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3443
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3445
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3447
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3427
+#: g10/gpg.c:3458
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3437
+#: g10/gpg.c:3468
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3488
+#: g10/gpg.c:3519
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3496
+#: g10/gpg.c:3527
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3583
+#: g10/gpg.c:3614
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/gpg.c:3706
+#: g10/gpg.c:3737
 msgid "[filename]"
 msgstr "[назва_файла]"
 
-#: g10/gpg.c:3710
+#: g10/gpg.c:3741
 msgid "Go ahead and type your message ...\n"
 msgstr ""
 
-#: g10/gpg.c:4000
+#: g10/gpg.c:4031
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
 msgstr ""
 
-#: g10/gpg.c:4008
+#: g10/gpg.c:4039
 msgid "a user notation name must contain the '@' character\n"
 msgstr ""
 
-#: g10/gpg.c:4013
+#: g10/gpg.c:4044
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr ""
 
-#: g10/gpg.c:4024
+#: g10/gpg.c:4055
 msgid "a notation value must not use any control characters\n"
 msgstr ""
 
-#: g10/gpg.c:4058
+#: g10/gpg.c:4089
 msgid "the given certification policy URL is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:4060
+#: g10/gpg.c:4091
 msgid "the given signature policy URL is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:4093
+#: g10/gpg.c:4124
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr ""
 
@@ -1778,31 +1787,32 @@ msgstr ""
 msgid "too many entries in pk cache - disabled\n"
 msgstr ""
 
-#: g10/getkey.c:188 g10/getkey.c:2845
+#: g10/getkey.c:188 g10/getkey.c:2876
 msgid "[User ID not found]"
 msgstr ""
 
-#: g10/getkey.c:931 g10/getkey.c:953 g10/getkey.c:976
+#: g10/getkey.c:933 g10/getkey.c:950 g10/getkey.c:970 g10/getkey.c:986
+#: g10/getkey.c:1001
 #, c-format
 msgid "Automatically retrieved `%s' via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1769
+#: g10/getkey.c:1800
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 
-#: g10/getkey.c:2323
+#: g10/getkey.c:2354
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 
-#: g10/getkey.c:2554
+#: g10/getkey.c:2585
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: g10/getkey.c:2601
+#: g10/getkey.c:2632
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr ""
@@ -3199,12 +3209,12 @@ msgid "(sensitive)"
 msgstr ""
 
 #: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
-#: g10/keylist.c:194 g10/keyserver.c:471
+#: g10/keylist.c:194 g10/keyserver.c:525
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "памылка чытаньня файла"
 
-#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:967
+#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:960
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "памылка чытаньня файла"
@@ -3216,7 +3226,7 @@ msgstr "збой падпісаньня: %s\n"
 
 #: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
 #: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:477 g10/mainproc.c:973
+#: g10/keylist.c:914 g10/keyserver.c:531 g10/mainproc.c:966
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "збой падпісаньня: %s\n"
@@ -3250,13 +3260,13 @@ msgid ""
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:481
-#: g10/mainproc.c:1734 g10/trustdb.c:1184 g10/trustdb.c:1704
+#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:535
+#: g10/mainproc.c:1783 g10/trustdb.c:1184 g10/trustdb.c:1704
 msgid "revoked"
 msgstr ""
 
-#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:485
-#: g10/mainproc.c:1736 g10/trustdb.c:537 g10/trustdb.c:1706
+#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:539
+#: g10/mainproc.c:1785 g10/trustdb.c:537 g10/trustdb.c:1706
 msgid "expired"
 msgstr ""
 
@@ -4034,387 +4044,383 @@ msgstr "%s: створаны зьвязак ключоў\n"
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:77
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:81
+#: g10/keyserver.c:79
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:83
+#: g10/keyserver.c:81
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:87
+#: g10/keyserver.c:85
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:89
-msgid "automatically retrieve keys from PKA records"
-msgstr ""
-
-#: g10/keyserver.c:91
-msgid "automatically retrieve keys from DNS"
-msgstr ""
-
-#: g10/keyserver.c:95
+#: g10/keyserver.c:87
 msgid "honor the preferred keyserver URL set on the key"
 msgstr ""
 
-#: g10/keyserver.c:139
+#: g10/keyserver.c:89
+msgid "honor the PKA record set on a key when retrieving keys"
+msgstr ""
+
+#: g10/keyserver.c:154
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 
-#: g10/keyserver.c:483
+#: g10/keyserver.c:537
 msgid "disabled"
 msgstr ""
 
-#: g10/keyserver.c:684
+#: g10/keyserver.c:738
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:767 g10/keyserver.c:1368
+#: g10/keyserver.c:821 g10/keyserver.c:1422
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/keyserver.c:865
+#: g10/keyserver.c:919
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/keyserver.c:867
+#: g10/keyserver.c:921
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "экспартаваць ключы на паслужнік ключоў"
 
-#: g10/keyserver.c:1092
+#: g10/keyserver.c:1146
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "імпартаваць ключы з паслужніка ключоў"
 
-#: g10/keyserver.c:1096
+#: g10/keyserver.c:1150
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1120
+#: g10/keyserver.c:1174
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "імпартаваць ключы з паслужніка ключоў"
 
-#: g10/keyserver.c:1123
+#: g10/keyserver.c:1177
 #, c-format
 msgid "searching for names from %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1271
+#: g10/keyserver.c:1325
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1275
+#: g10/keyserver.c:1329
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/keyserver.c:1318
+#: g10/keyserver.c:1372
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1321
+#: g10/keyserver.c:1375
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1328 g10/keyserver.c:1424
+#: g10/keyserver.c:1382 g10/keyserver.c:1478
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/keyserver.c:1376
+#: g10/keyserver.c:1430
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1439
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1446
+#: g10/keyserver.c:1500
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1452
+#: g10/keyserver.c:1506
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1464
+#: g10/keyserver.c:1518
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1469
+#: g10/keyserver.c:1523
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1477
+#: g10/keyserver.c:1531
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1484
+#: g10/keyserver.c:1538
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keyserver.c:1489
+#: g10/keyserver.c:1543
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "агульная памылка"
 
-#: g10/keyserver.c:1498
+#: g10/keyserver.c:1552
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keyserver.c:1523 g10/keyserver.c:1557
+#: g10/keyserver.c:1577 g10/keyserver.c:1611
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1814
+#: g10/keyserver.c:1868
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1836
+#: g10/keyserver.c:1890
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1838
+#: g10/keyserver.c:1892
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1903
+#: g10/keyserver.c:1957
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: g10/keyserver.c:1909
+#: g10/keyserver.c:1963
 #, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr ""
 
-#: g10/mainproc.c:253
+#: g10/mainproc.c:240
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr ""
 
-#: g10/mainproc.c:304
+#: g10/mainproc.c:291
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr ""
 
-#: g10/mainproc.c:314
+#: g10/mainproc.c:301
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/mainproc.c:395
+#: g10/mainproc.c:382
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/mainproc.c:450
+#: g10/mainproc.c:439
 msgid "public key encrypted data: good DEK\n"
 msgstr ""
 
-#: g10/mainproc.c:483
+#: g10/mainproc.c:472
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "%u-бітавы %s ключ, ID %08lX, створаны %s"
 
-#: g10/mainproc.c:487 g10/pkclist.c:219
+#: g10/mainproc.c:476 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr ""
 
-#: g10/mainproc.c:491
+#: g10/mainproc.c:480
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "Паўтарыце пароль\n"
 
-#: g10/mainproc.c:505
+#: g10/mainproc.c:494
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:519
+#: g10/mainproc.c:508
 #, fuzzy, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "Паўтарыце пароль\n"
 
-#: g10/mainproc.c:521
+#: g10/mainproc.c:510
 #, fuzzy
 msgid "encrypted with 1 passphrase\n"
 msgstr "Паўтарыце пароль\n"
 
-#: g10/mainproc.c:549 g10/mainproc.c:571
+#: g10/mainproc.c:541 g10/mainproc.c:563
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr ""
 
-#: g10/mainproc.c:557
+#: g10/mainproc.c:549
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 
-#: g10/mainproc.c:589
+#: g10/mainproc.c:581
 msgid "decryption okay\n"
 msgstr ""
 
-#: g10/mainproc.c:593
+#: g10/mainproc.c:585
 msgid "WARNING: message was not integrity protected\n"
 msgstr ""
 
-#: g10/mainproc.c:606
+#: g10/mainproc.c:598
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr ""
 
-#: g10/mainproc.c:612
+#: g10/mainproc.c:604
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:631
+#: g10/mainproc.c:623
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr ""
 
-#: g10/mainproc.c:633
+#: g10/mainproc.c:625
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr ""
 
-#: g10/mainproc.c:822
+#: g10/mainproc.c:815
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 
-#: g10/mainproc.c:1168
+#: g10/mainproc.c:1161
 #, fuzzy
 msgid "no signature found\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/mainproc.c:1418
+#: g10/mainproc.c:1419
 msgid "signature verification suppressed\n"
 msgstr ""
 
-#: g10/mainproc.c:1460 g10/mainproc.c:1470
-msgid "can't handle these multiple signatures\n"
+#: g10/mainproc.c:1519
+msgid "can't handle this ambiguous signature data\n"
 msgstr ""
 
-#: g10/mainproc.c:1480
+#: g10/mainproc.c:1530
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
 
-#: g10/mainproc.c:1481
+#: g10/mainproc.c:1531
 #, c-format
 msgid "               using %s key %s\n"
 msgstr ""
 
-#: g10/mainproc.c:1485
+#: g10/mainproc.c:1535
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
 
-#: g10/mainproc.c:1505
+#: g10/mainproc.c:1555
 #, fuzzy
 msgid "Key available at: "
 msgstr "Даведка адсутнічае"
 
-#: g10/mainproc.c:1639 g10/mainproc.c:1687
+#: g10/mainproc.c:1688 g10/mainproc.c:1736
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/mainproc.c:1641 g10/mainproc.c:1689
+#: g10/mainproc.c:1690 g10/mainproc.c:1738
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/mainproc.c:1643 g10/mainproc.c:1691
+#: g10/mainproc.c:1692 g10/mainproc.c:1740
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/mainproc.c:1695
+#: g10/mainproc.c:1744
 msgid "[uncertain]"
 msgstr ""
 
-#: g10/mainproc.c:1727
+#: g10/mainproc.c:1776
 #, c-format
 msgid "                aka \"%s\""
 msgstr ""
 
-#: g10/mainproc.c:1824
+#: g10/mainproc.c:1873
 #, c-format
 msgid "Signature expired %s\n"
 msgstr ""
 
-#: g10/mainproc.c:1829
+#: g10/mainproc.c:1878
 #, c-format
 msgid "Signature expires %s\n"
 msgstr ""
 
-#: g10/mainproc.c:1832
+#: g10/mainproc.c:1881
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/mainproc.c:1833
+#: g10/mainproc.c:1882
 msgid "binary"
 msgstr ""
 
-#: g10/mainproc.c:1834
+#: g10/mainproc.c:1883
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1834 g10/trustdb.c:536
+#: g10/mainproc.c:1883 g10/trustdb.c:536
 #, fuzzy
 msgid "unknown"
 msgstr "невядомая вэрсыя"
 
-#: g10/mainproc.c:1854
+#: g10/mainproc.c:1903
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:1922 g10/mainproc.c:1938 g10/mainproc.c:2024
+#: g10/mainproc.c:1972 g10/mainproc.c:1988 g10/mainproc.c:2074
 msgid "not a detached signature\n"
 msgstr ""
 
-#: g10/mainproc.c:1965
+#: g10/mainproc.c:2015
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 
-#: g10/mainproc.c:1973
+#: g10/mainproc.c:2023
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr ""
 
-#: g10/mainproc.c:2030
+#: g10/mainproc.c:2080
 msgid "old style (PGP 2.x) signature\n"
 msgstr ""
 
-#: g10/mainproc.c:2040
+#: g10/mainproc.c:2090
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
@@ -4945,23 +4951,23 @@ msgstr ""
 msgid "error creating `%s': %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: g10/plaintext.c:447
+#: g10/plaintext.c:453
 msgid "Detached signature.\n"
 msgstr ""
 
-#: g10/plaintext.c:453
+#: g10/plaintext.c:459
 msgid "Please enter name of data file: "
 msgstr "Калі ласка, задайце назву файла даньняў: "
 
-#: g10/plaintext.c:485
+#: g10/plaintext.c:491
 msgid "reading stdin ...\n"
 msgstr "чытаецца stdin ...\n"
 
-#: g10/plaintext.c:519
+#: g10/plaintext.c:525
 msgid "no signed data\n"
 msgstr ""
 
-#: g10/plaintext.c:533
+#: g10/plaintext.c:539
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr ""
diff --git a/po/ca.po b/po/ca.po
index 7eaad3a84..cfe7eaed4 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -27,7 +27,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.0\n"
 "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2006-02-14 15:28+0100\n"
+"POT-Creation-Date: 2006-03-07 11:29+0100\n"
 "PO-Revision-Date: 2005-02-04 02:04+0100\n"
 "Last-Translator: Jordi Mallach <jordi@gnu.org>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
@@ -61,9 +61,9 @@ msgstr "s'està escrivint la clau secreta a «%s»\n"
 
 #: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:992 g10/gpg.c:3360 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:997 g10/gpg.c:3391 g10/import.c:193 g10/keygen.c:2274
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:476 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
+#: g10/plaintext.c:482 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
 #: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
@@ -98,7 +98,7 @@ msgstr "no s'ha pogut llegir «%s»: %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "nota: el fitxer random_seed no s'ha actualitzat\n"
 
-#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:991 g10/keygen.c:2753
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2753
 #: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
 #: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
 #, c-format
@@ -719,51 +719,51 @@ msgstr ""
 msgid "Invalid command  (try \"help\")\n"
 msgstr "L'ordre no és vàlida (proveu «help»)\n"
 
-#: g10/cardglue.c:435
+#: g10/cardglue.c:434
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:572
+#: g10/cardglue.c:573
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:580
+#: g10/cardglue.c:582
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:915
+#: g10/cardglue.c:917
 #, fuzzy
 msgid "Enter New Admin PIN: "
 msgstr "Introduïu el nom d'usuari: "
 
-#: g10/cardglue.c:916
+#: g10/cardglue.c:918
 #, fuzzy
 msgid "Enter New PIN: "
 msgstr "Introduïu el nom d'usuari: "
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:919
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:920
 #, fuzzy
 msgid "Enter PIN: "
 msgstr "Introduïu el nom d'usuari: "
 
-#: g10/cardglue.c:935
+#: g10/cardglue.c:937
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Repetiu la contrasenya: "
 
-#: g10/cardglue.c:950
+#: g10/cardglue.c:952
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "la contrasenya no s'ha repetit correctament; torneu a intentar-ho"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3720 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3751 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -773,13 +773,13 @@ msgstr "no s'ha pogut obrir «%s»\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output no funciona per a aquesta ordre\n"
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1644
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1698
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "no s'ha trobat la clau «%s»: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1658
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1712
 #: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -897,12 +897,12 @@ msgstr "no podeu usar %s mentre esteu en mode %s\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s xifrat per a: «%s»\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:306
+#: g10/encr-data.c:67 g10/mainproc.c:293
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "dades xifrades amb %s\n"
 
-#: g10/encr-data.c:69 g10/mainproc.c:310
+#: g10/encr-data.c:69 g10/mainproc.c:297
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "xifrat amb l'algoritme %d (desconegut)\n"
@@ -1052,7 +1052,7 @@ msgstr "AVÍS: la clau secreta %08lX no te una simple suma de comprovació SK\n"
 msgid "WARNING: nothing exported\n"
 msgstr "AVÍS: no s'ha exportat res\n"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:373
 msgid ""
 "@Commands:\n"
 " "
@@ -1060,130 +1060,130 @@ msgstr ""
 "@Ordres:\n"
 " "
 
-#: g10/gpg.c:374
+#: g10/gpg.c:375
 msgid "|[file]|make a signature"
 msgstr "|[fitxer]|crea una signatura"
 
-#: g10/gpg.c:375
+#: g10/gpg.c:376
 msgid "|[file]|make a clear text signature"
 msgstr "|[fitxer]|crea una signatura en text clar"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:377
 msgid "make a detached signature"
 msgstr "crea una signatura separada"
 
-#: g10/gpg.c:377
+#: g10/gpg.c:378
 msgid "encrypt data"
 msgstr "xifra dades"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:380
 msgid "encryption only with symmetric cipher"
 msgstr "xifra només amb xifratge simètric"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:382
 msgid "decrypt data (default)"
 msgstr "desxifra dades (predeterminat)"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:384
 msgid "verify a signature"
 msgstr "verifica una signatura"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:386
 msgid "list keys"
 msgstr "llista claus"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "list keys and signatures"
 msgstr "llista claus i signatures"
 
 # «de les claus» o «de la clau»?  ivb
-#: g10/gpg.c:388
+#: g10/gpg.c:389
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "comprova les signatures de la claus"
 
 # «dactilars» o «digitals»?  ivb
-#: g10/gpg.c:389
+#: g10/gpg.c:390
 msgid "list keys and fingerprints"
 msgstr "llista claus i empremtes digitals"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:391
 msgid "list secret keys"
 msgstr "llista claus secretes"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:392
 msgid "generate a new key pair"
 msgstr "genera un nou parell de claus"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:393
 msgid "remove keys from the public keyring"
 msgstr "elimina claus de l'anell públic"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:395
 msgid "remove keys from the secret keyring"
 msgstr "elimina claus de l'anell secret"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:396
 msgid "sign a key"
 msgstr "signa una clau"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:397
 msgid "sign a key locally"
 msgstr "signa una clau localment"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:398
 msgid "sign or edit a key"
 msgstr "signa o edita una clau"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:399
 msgid "generate a revocation certificate"
 msgstr "genera un certificat de revocació"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:401
 msgid "export keys"
 msgstr "exporta claus"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:402
 msgid "export keys to a key server"
 msgstr "exporta claus a un servidor de claus"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:403
 msgid "import keys from a key server"
 msgstr "importa claus d'un servidor de claus"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:405
 msgid "search for keys on a key server"
 msgstr "cerca claus en un servidor de claus"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:407
 msgid "update all keys from a keyserver"
 msgstr "actualitza totes les claus des d'un servidor de claus"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:411
 msgid "import/merge keys"
 msgstr "importa/fon claus"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:414
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:414
+#: g10/gpg.c:415
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:415
+#: g10/gpg.c:416
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:423
+#: g10/gpg.c:424
 msgid "update the trust database"
 msgstr "actualitza la base de dades de confiança"
 
-#: g10/gpg.c:430
+#: g10/gpg.c:431
 msgid "|algo [files]|print message digests"
 msgstr "|algo [fitxers]|imprimeix resums de missatges"
 
-#: g10/gpg.c:434 g10/gpgv.c:71
+#: g10/gpg.c:435 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1193,52 +1193,52 @@ msgstr ""
 "Opcions:\n"
 " "
 
-#: g10/gpg.c:436
+#: g10/gpg.c:437
 msgid "create ascii armored output"
 msgstr "crea eixida amb armadura ascii"
 
-#: g10/gpg.c:438
+#: g10/gpg.c:439
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOM|xifra per a NOM"
 
-#: g10/gpg.c:449
+#: g10/gpg.c:450
 msgid "use this user-id to sign or decrypt"
 msgstr "usa aquest id per a signar o desxifrar"
 
-#: g10/gpg.c:450
+#: g10/gpg.c:451
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|nivell de compressió N (0 no comprimeix)"
 
-#: g10/gpg.c:455
+#: g10/gpg.c:456
 msgid "use canonical text mode"
 msgstr "usa el mode de text canònic"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:470
 msgid "use as output file"
 msgstr "fitxer d'eixida"
 
 # Un dels dos és en la llista d'opcions amb --help. Urgh. jm
-#: g10/gpg.c:471 g10/gpgv.c:73
+#: g10/gpg.c:472 g10/gpgv.c:73
 msgid "verbose"
 msgstr "detall"
 
-#: g10/gpg.c:482
+#: g10/gpg.c:483
 msgid "do not make any changes"
 msgstr "no fa cap canvi"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:484
 msgid "prompt before overwriting"
 msgstr "pregunta abans de sobreescriure"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:525
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:553
+#: g10/gpg.c:554
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1249,7 +1249,7 @@ msgstr ""
 # Crec q (A)lice (orig.), (B)ob (dest.), etc. són noms usats pel Zimmerman
 # en el manual original de PGP.  A, B, C...  ivb
 # En efecte. Idem per a Mallory més endavant. Els deixe com a l'original. jm
-#: g10/gpg.c:556
+#: g10/gpg.c:557
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1269,15 +1269,15 @@ msgstr ""
 " --list-keys [noms]         mostra claus\n"
 " --fingerprint [noms]       mostra empremtes digitals\n"
 
-#: g10/gpg.c:746 g10/gpgv.c:98
+#: g10/gpg.c:751 g10/gpgv.c:98
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Si us plau, informeu sobre els errors a <gnupg-bugs@gnu.org>.\n"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:768
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: g10/gpg.c:766
+#: g10/gpg.c:771
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1292,7 +1292,7 @@ msgstr ""
 # Precissament acabem de parlar d'«implementat a la llista del GNOME
 # i s'ha dit que és erroni, igual que «suportat» :) Les alternatives
 # encara no m'agraden massa... jm
-#: g10/gpg.c:777
+#: g10/gpg.c:782
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1300,561 +1300,570 @@ msgstr ""
 "\n"
 "Algoritmes suportats:\n"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:785
 msgid "Pubkey: "
 msgstr "Clau pública: "
 
-#: g10/gpg.c:786 g10/keyedit.c:2266
+#: g10/gpg.c:791 g10/keyedit.c:2266
 msgid "Cipher: "
 msgstr "Xifratge: "
 
-#: g10/gpg.c:792
+#: g10/gpg.c:797
 msgid "Hash: "
 msgstr "Dispersió: "
 
-#: g10/gpg.c:798 g10/keyedit.c:2312
+#: g10/gpg.c:803 g10/keyedit.c:2312
 msgid "Compression: "
 msgstr "Compressió: "
 
-#: g10/gpg.c:881
+#: g10/gpg.c:886
 msgid "usage: gpg [options] "
 msgstr "forma d'ús: gpg [opcions] "
 
-#: g10/gpg.c:1029
+#: g10/gpg.c:1034
 msgid "conflicting commands\n"
 msgstr "les ordres entren en conflicte\n"
 
-#: g10/gpg.c:1047
+#: g10/gpg.c:1052
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "no s'ha trobat cap signe = a la definició de grup «%s»\n"
 
 # Indi. ivb
-#: g10/gpg.c:1244
+#: g10/gpg.c:1249
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "AVÍS: el propietari és insegur en %s «%s»\n"
 
 # Indi. ivb
-#: g10/gpg.c:1247
+#: g10/gpg.c:1252
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "AVÍS: el propietari és insegur en %s «%s»\n"
 
 # Indi. ivb
-#: g10/gpg.c:1250
+#: g10/gpg.c:1255
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVÍS: el propietari és insegur en %s «%s»\n"
 
-#: g10/gpg.c:1256
+#: g10/gpg.c:1261
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "AVÍS: els permissos són insegurs en %s «%s»\n"
 
-#: g10/gpg.c:1259
+#: g10/gpg.c:1264
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "AVÍS: els permissos són insegurs en %s «%s»\n"
 
-#: g10/gpg.c:1262
+#: g10/gpg.c:1267
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVÍS: els permissos són insegurs en %s «%s»\n"
 
-#: g10/gpg.c:1268
+#: g10/gpg.c:1273
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "AVÍS: el propietari del directori envoltant és insegur en %s «%s»\n"
 
-#: g10/gpg.c:1271
+#: g10/gpg.c:1276
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "AVÍS: el propietari del directori envoltant és insegur en %s «%s»\n"
 
-#: g10/gpg.c:1274
+#: g10/gpg.c:1279
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "AVÍS: el propietari del directori envoltant és insegur en %s «%s»\n"
 
-#: g10/gpg.c:1280
+#: g10/gpg.c:1285
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "AVÍS: els permissos del directori envoltant són insegurs en %s «%s»\n"
 
-#: g10/gpg.c:1283
+#: g10/gpg.c:1288
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "AVÍS: els permissos del directori envoltant són insegurs en %s «%s»\n"
 
-#: g10/gpg.c:1286
+#: g10/gpg.c:1291
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "AVÍS: els permissos del directori envoltant són insegurs en %s «%s»\n"
 
-#: g10/gpg.c:1427
+#: g10/gpg.c:1432
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "s'ha creat el nou fitxer d'opcions «%s»\n"
 
-#: g10/gpg.c:1521
+#: g10/gpg.c:1526
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1523
+#: g10/gpg.c:1528
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1525
+#: g10/gpg.c:1530
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
 
-#: g10/gpg.c:1527
+#: g10/gpg.c:1532
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1536
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1538
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "la URL de política de signatura donada no és vàlida\n"
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1540
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1542
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1544
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1546
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mostra en quin anell de claus està una clau llistada"
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1548
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
 
-#: g10/gpg.c:1874
+#: g10/gpg.c:1879
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: es descarta el fitxer d'opcions predeterminades antic «%s»\n"
 
-#: g10/gpg.c:1916
+#: g10/gpg.c:1921
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: no existeix el fitxer d'opcions predeterminades «%s»\n"
 
-#: g10/gpg.c:1920
+#: g10/gpg.c:1925
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fitxer d'opcions «%s»: %s\n"
 
-#: g10/gpg.c:1927
+#: g10/gpg.c:1932
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "s'estan llegint opcions de «%s»\n"
 
-#: g10/gpg.c:2142 g10/gpg.c:2716 g10/gpg.c:2735
+#: g10/gpg.c:2147 g10/gpg.c:2747 g10/gpg.c:2766
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s no és per a ús normal!\n"
 
-#: g10/gpg.c:2158
+#: g10/gpg.c:2163
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "la extensió de xifrat «%s» no s'ha carregat per tindre permissos insegurs\n"
 
-#: g10/gpg.c:2312 g10/gpg.c:2324
+#: g10/gpg.c:2317 g10/gpg.c:2329
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:2400
+#: g10/gpg.c:2405
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:2422 g10/keyedit.c:3997
+#: g10/gpg.c:2429 g10/keyedit.c:3997
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "no s'ha pogut analitzar sintàcticament la URI del servidor de claus\n"
 
-#: g10/gpg.c:2428
+#: g10/gpg.c:2441
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2431
+#: g10/gpg.c:2444
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2438
+#: g10/gpg.c:2451
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opcions d'importanció no vàlides\n"
 
-#: g10/gpg.c:2441
+#: g10/gpg.c:2454
 msgid "invalid import options\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/gpg.c:2448
+#: g10/gpg.c:2461
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2464
 msgid "invalid export options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2458
+#: g10/gpg.c:2471
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opcions d'importanció no vàlides\n"
 
-#: g10/gpg.c:2461
+#: g10/gpg.c:2474
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/gpg.c:2469
+#: g10/gpg.c:2482
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2471
+#: g10/gpg.c:2484
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2473
+#: g10/gpg.c:2486
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:2475
+#: g10/gpg.c:2488
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2479
+#: g10/gpg.c:2492
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2481
+#: g10/gpg.c:2494
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "la URL de política de signatura donada no és vàlida\n"
 
-#: g10/gpg.c:2483
+#: g10/gpg.c:2496
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:2485
+#: g10/gpg.c:2498
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2505
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2495
+#: g10/gpg.c:2508
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2502
+#: g10/gpg.c:2515
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "no s'ha pogut fixar l'exec-path a %s\n"
 
-#: g10/gpg.c:2705
+#: g10/gpg.c:2665
+#, fuzzy, c-format
+msgid "%s:%d: invalid auto-key-locate list\n"
+msgstr "%s:%d opcions d'exportació no vàlides\n"
+
+#: g10/gpg.c:2668
+msgid "invalid auto-key-locate list\n"
+msgstr ""
+
+#: g10/gpg.c:2736
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVÍS: el programa podria crear un fitxer core!\n"
 
 # FIXME: preferència? jm
 # Ho discutírem en la llista, segur.  Deu ser als arxius.  ivb
-#: g10/gpg.c:2709
+#: g10/gpg.c:2740
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVÍS: %s té preferència sobre %s\n"
 
-#: g10/gpg.c:2718
+#: g10/gpg.c:2749
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s no és permés amb %s!\n"
 
-#: g10/gpg.c:2721
+#: g10/gpg.c:2752
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s no té sentit amb %s!\n"
 
-#: g10/gpg.c:2728
+#: g10/gpg.c:2759
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "gpg-agent no està disponible en aquesta sessió\n"
 
-#: g10/gpg.c:2743
+#: g10/gpg.c:2774
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
 # clares -> en clar?  ivb
-#: g10/gpg.c:2757
+#: g10/gpg.c:2788
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "només podeu fer signatures separades o en clar en el mode --pgp2\n"
 
-#: g10/gpg.c:2763
+#: g10/gpg.c:2794
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "no podeu signar i xifrar al mateix temps en el mode --pgp2\n"
 
-#: g10/gpg.c:2769
+#: g10/gpg.c:2800
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "heu d'utilitzar fitxers (i no un conducte) mentre treballeu amb --pgp2 "
 "habilitat.\n"
 
-#: g10/gpg.c:2782
+#: g10/gpg.c:2813
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "xifrar un missatge en mode --pgp2 requereix el xifratge IDEA\n"
 
-#: g10/gpg.c:2849 g10/gpg.c:2873
+#: g10/gpg.c:2880 g10/gpg.c:2904
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorisme de xifratge triat no és vàlid\n"
 
-#: g10/gpg.c:2855 g10/gpg.c:2879
+#: g10/gpg.c:2886 g10/gpg.c:2910
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algorisme de resum seleccionat no és vàlid\n"
 
-#: g10/gpg.c:2861
+#: g10/gpg.c:2892
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algorisme de xifratge triat no és vàlid\n"
 
-#: g10/gpg.c:2867
+#: g10/gpg.c:2898
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "l'algorisme de resum de certificació seleccionat no és vàlid\n"
 
-#: g10/gpg.c:2882
+#: g10/gpg.c:2913
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ha de ser major que 0\n"
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2915
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ha de ser major que 1\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2917
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth ha d'estar en el rang 1 a 255\n"
 
-#: g10/gpg.c:2888
+#: g10/gpg.c:2919
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-check-level és invàlid; ha de ser 0, 1, 2 o 3\n"
 
-#: g10/gpg.c:2890
+#: g10/gpg.c:2921
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "default-check-level és invàlid; ha de ser 0, 1, 2 o 3\n"
 
-#: g10/gpg.c:2893
+#: g10/gpg.c:2924
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: el mode S2K simple (0) no és gens recomanable\n"
 
-#: g10/gpg.c:2897
+#: g10/gpg.c:2928
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "el mode S2K és invàlid; ha de ser 0, 1 o 3\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2935
 msgid "invalid default preferences\n"
 msgstr "les preferències per defecte són invàlides\n"
 
-#: g10/gpg.c:2913
+#: g10/gpg.c:2944
 msgid "invalid personal cipher preferences\n"
 msgstr "les preferències personals de xifrat són invàlides\n"
 
-#: g10/gpg.c:2917
+#: g10/gpg.c:2948
 msgid "invalid personal digest preferences\n"
 msgstr "les preferències personals de digest són invàlides\n"
 
-#: g10/gpg.c:2921
+#: g10/gpg.c:2952
 msgid "invalid personal compress preferences\n"
 msgstr "les preferències personals de compressió són invàlides\n"
 
-#: g10/gpg.c:2954
+#: g10/gpg.c:2985
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s encara no funciona amb %s\n"
 
-#: g10/gpg.c:3001
+#: g10/gpg.c:3032
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "no podeu usar l'algorisme de xifratge «%s» mentre esteu en mode %s\n"
 
-#: g10/gpg.c:3006
+#: g10/gpg.c:3037
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "no podeu usar l'algorisme de resum %s mentre esteu en mode %s\n"
 
-#: g10/gpg.c:3011
+#: g10/gpg.c:3042
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "no podeu usar l'algorisme de compressió %s mentre esteu en mode %s\n"
 
-#: g10/gpg.c:3107
+#: g10/gpg.c:3138
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "no s'ha pogut inicialitzar la base de dades de confiança: %s\n"
 
-#: g10/gpg.c:3118
+#: g10/gpg.c:3149
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AVÍS: s'han donat destinataris (-r) sense usar xifratge de clau pública\n"
 
-#: g10/gpg.c:3129
+#: g10/gpg.c:3160
 msgid "--store [filename]"
 msgstr "--store [nom_del_fitxer]"
 
-#: g10/gpg.c:3136
+#: g10/gpg.c:3167
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom_del_fitxer]"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3169
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "ha fallat el desxifratge: %s\n"
 
-#: g10/gpg.c:3148
+#: g10/gpg.c:3179
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3192
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3194
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3166
+#: g10/gpg.c:3197
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "no podeu usar %s mentre esteu en mode %s\n"
 
-#: g10/gpg.c:3184
+#: g10/gpg.c:3215
 msgid "--sign [filename]"
 msgstr "--sign [nom_del_fitxer]"
 
-#: g10/gpg.c:3197
+#: g10/gpg.c:3228
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3212
+#: g10/gpg.c:3243
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3214
+#: g10/gpg.c:3245
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3217
+#: g10/gpg.c:3248
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "no podeu usar %s mentre esteu en mode %s\n"
 
-#: g10/gpg.c:3237
+#: g10/gpg.c:3268
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nom_del_fitxer]"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3277
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom_del_fitxer]"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3302
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3310
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3283
+#: g10/gpg.c:3314
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3335
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [ordres]"
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3406
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [anell]"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3443
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "l'enviament al servidor de claus ha fallat: %s\n"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3445
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "la recepció des del servidor de claus ha fallat: %s\n"
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3447
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "l'exportació de la clau ha fallat: %s\n"
 
-#: g10/gpg.c:3427
+#: g10/gpg.c:3458
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "ha fallat la cerca al servidor de claus: %s\n"
 
-#: g10/gpg.c:3437
+#: g10/gpg.c:3468
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "ha fallat el refresc des del servidor de claus: %s\n"
 
-#: g10/gpg.c:3488
+#: g10/gpg.c:3519
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "no s'ha pogut llevar l'armadura: %s\n"
 
-#: g10/gpg.c:3496
+#: g10/gpg.c:3527
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
 
-#: g10/gpg.c:3583
+#: g10/gpg.c:3614
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "l'algoritme de dispersió és invàlid «%s»\n"
 
-#: g10/gpg.c:3706
+#: g10/gpg.c:3737
 msgid "[filename]"
 msgstr "[nom_del_fitxer]"
 
-#: g10/gpg.c:3710
+#: g10/gpg.c:3741
 msgid "Go ahead and type your message ...\n"
 msgstr "Endavant, escriviu el missatge...\n"
 
-#: g10/gpg.c:4000
+#: g10/gpg.c:4031
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1862,28 +1871,28 @@ msgstr ""
 "un nom de notació només pot tenir caràcters imprimibles o espais i acabar "
 "amb el signe «=»\n"
 
-#: g10/gpg.c:4008
+#: g10/gpg.c:4039
 msgid "a user notation name must contain the '@' character\n"
 msgstr "un nom de notació d'usuari no pot contenir el caràcter «@»\n"
 
-#: g10/gpg.c:4013
+#: g10/gpg.c:4044
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "un nom de notació d'usuari no pot contenir el caràcter «@»\n"
 
-#: g10/gpg.c:4024
+#: g10/gpg.c:4055
 msgid "a notation value must not use any control characters\n"
 msgstr "un valor de notació no pot utilitzar cap caràcter de control\n"
 
-#: g10/gpg.c:4058
+#: g10/gpg.c:4089
 msgid "the given certification policy URL is invalid\n"
 msgstr "la URL de política de certificació donada no és vàlida\n"
 
-#: g10/gpg.c:4060
+#: g10/gpg.c:4091
 msgid "the given signature policy URL is invalid\n"
 msgstr "la URL de política de signatura donada no és vàlida\n"
 
-#: g10/gpg.c:4093
+#: g10/gpg.c:4124
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la URL de política de signatura donada no és vàlida\n"
@@ -1893,34 +1902,35 @@ msgid "too many entries in pk cache - disabled\n"
 msgstr ""
 "hi ha massa entrades en la memòria cau de claus públiques - desactivada\n"
 
-#: g10/getkey.c:188 g10/getkey.c:2845
+#: g10/getkey.c:188 g10/getkey.c:2876
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[No s'ha trobat l'id d'usuari]"
 
-#: g10/getkey.c:931 g10/getkey.c:953 g10/getkey.c:976
+#: g10/getkey.c:933 g10/getkey.c:950 g10/getkey.c:970 g10/getkey.c:986
+#: g10/getkey.c:1001
 #, c-format
 msgid "Automatically retrieved `%s' via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1769
+#: g10/getkey.c:1800
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "La clau invàlida %08lX s'ha fet vàlida amb --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2323
+#: g10/getkey.c:2354
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 "no hi ha una clau secreta per a la subclau pública %08lX - es descarta\n"
 
-#: g10/getkey.c:2554
+#: g10/getkey.c:2585
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "s'usarà la clau secundària %08lX en lloc de la primària %08lX\n"
 
-#: g10/getkey.c:2601
+#: g10/getkey.c:2632
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "clau %08lX: clau secreta sense clau pública - es descarta\n"
@@ -3531,12 +3541,12 @@ msgid "(sensitive)"
 msgstr " (sensible)"
 
 #: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
-#: g10/keylist.c:194 g10/keyserver.c:471
+#: g10/keylist.c:194 g10/keyserver.c:525
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "no s'ha pogut creat %s: %s\n"
 
-#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:967
+#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:960
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revocada]"
@@ -3548,7 +3558,7 @@ msgstr " [caduca: %s]"
 
 #: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
 #: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:477 g10/mainproc.c:973
+#: g10/keylist.c:914 g10/keyserver.c:531 g10/mainproc.c:966
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [caduca: %s]"
@@ -3584,14 +3594,14 @@ msgstr ""
 "Teniu en compte que la validesa de la clau mostrada no és necessàriament\n"
 "correcta a no ser que torneu a executar el programa.\n"
 
-#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:481
-#: g10/mainproc.c:1734 g10/trustdb.c:1184 g10/trustdb.c:1704
+#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:535
+#: g10/mainproc.c:1783 g10/trustdb.c:1184 g10/trustdb.c:1704
 #, fuzzy
 msgid "revoked"
 msgstr "[revocada]"
 
-#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:485
-#: g10/mainproc.c:1736 g10/trustdb.c:537 g10/trustdb.c:1706
+#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:539
+#: g10/mainproc.c:1785 g10/trustdb.c:537 g10/trustdb.c:1706
 #, fuzzy
 msgid "expired"
 msgstr "expire"
@@ -4454,398 +4464,395 @@ msgstr "%s: s'ha creat l'anell\n"
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:77
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:81
+#: g10/keyserver.c:79
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:83
+#: g10/keyserver.c:81
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:87
+#: g10/keyserver.c:85
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:89
-msgid "automatically retrieve keys from PKA records"
-msgstr ""
-
-#: g10/keyserver.c:91
-msgid "automatically retrieve keys from DNS"
-msgstr ""
-
-#: g10/keyserver.c:95
+#: g10/keyserver.c:87
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "la URL de política de signatura donada no és vàlida\n"
 
-#: g10/keyserver.c:139
+#: g10/keyserver.c:89
+msgid "honor the PKA record set on a key when retrieving keys"
+msgstr ""
+
+#: g10/keyserver.c:154
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "AVÍS: les opcions en «%s» encara no estan actives durant aquesta execució\n"
 
-#: g10/keyserver.c:483
+#: g10/keyserver.c:537
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:684
+#: g10/keyserver.c:738
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:767 g10/keyserver.c:1368
+#: g10/keyserver.c:821 g10/keyserver.c:1422
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr ""
 
-#: g10/keyserver.c:865
+#: g10/keyserver.c:919
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "no s'ha trobat la clau «%s»: %s\n"
 
-#: g10/keyserver.c:867
+#: g10/keyserver.c:921
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "no s'ha trobat la clau «%s»: %s\n"
 
-#: g10/keyserver.c:1092
+#: g10/keyserver.c:1146
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "s'està sol·licitant la clau %08lX de %s\n"
 
-#: g10/keyserver.c:1096
+#: g10/keyserver.c:1150
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "s'està sol·licitant la clau %08lX de %s\n"
 
-#: g10/keyserver.c:1120
+#: g10/keyserver.c:1174
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "s'està cercant «%s» al servidor HKP %s\n"
 
-#: g10/keyserver.c:1123
+#: g10/keyserver.c:1177
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "s'està cercant «%s» al servidor HKP %s\n"
 
-#: g10/keyserver.c:1271
+#: g10/keyserver.c:1325
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "s'està cercant «%s» al servidor HKP %s\n"
 
-#: g10/keyserver.c:1275
+#: g10/keyserver.c:1329
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr "s'està sol·licitant la clau %08lX de %s\n"
 
-#: g10/keyserver.c:1318
+#: g10/keyserver.c:1372
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "s'està cercant «%s» al servidor HKP %s\n"
 
-#: g10/keyserver.c:1321
+#: g10/keyserver.c:1375
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "s'està cercant «%s» al servidor HKP %s\n"
 
 # «del servidor», «en el servidor»?  ivb
-#: g10/keyserver.c:1328 g10/keyserver.c:1424
+#: g10/keyserver.c:1382 g10/keyserver.c:1478
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "error de servidor de claus"
 
-#: g10/keyserver.c:1376
+#: g10/keyserver.c:1430
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1439
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1446
+#: g10/keyserver.c:1500
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "no es coneix cap servidor de claus (useu l'opció \"--keyserver\")\n"
 
-#: g10/keyserver.c:1452
+#: g10/keyserver.c:1506
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1464
+#: g10/keyserver.c:1518
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1469
+#: g10/keyserver.c:1523
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1477
+#: g10/keyserver.c:1531
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
 # «del servidor», «en el servidor»?  ivb
-#: g10/keyserver.c:1484
+#: g10/keyserver.c:1538
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "error de servidor de claus"
 
 # «del servidor», «en el servidor»?  ivb
-#: g10/keyserver.c:1489
+#: g10/keyserver.c:1543
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "error de servidor de claus"
 
-#: g10/keyserver.c:1498
+#: g10/keyserver.c:1552
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "la recepció des del servidor de claus ha fallat: %s\n"
 
-#: g10/keyserver.c:1523 g10/keyserver.c:1557
+#: g10/keyserver.c:1577 g10/keyserver.c:1611
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s: no és un ID vàlid\n"
 
-#: g10/keyserver.c:1814
+#: g10/keyserver.c:1868
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "AVÍS: no s'ha pogut eliminar el fitxer temporal (%s) «%s»: %s\n"
 
-#: g10/keyserver.c:1836
+#: g10/keyserver.c:1890
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "s'està sol·licitant la clau %08lX de %s\n"
 
-#: g10/keyserver.c:1838
+#: g10/keyserver.c:1892
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "s'està sol·licitant la clau %08lX de %s\n"
 
-#: g10/keyserver.c:1903
+#: g10/keyserver.c:1957
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "AVÍS: no s'ha pogut eliminar el fitxer temporal (%s) «%s»: %s\n"
 
-#: g10/keyserver.c:1909
+#: g10/keyserver.c:1963
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "AVÍS: no s'ha pogut eliminar el fitxer temporal (%s) «%s»: %s\n"
 
-#: g10/mainproc.c:253
+#: g10/mainproc.c:240
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "mida extranya per a una clau de sessió xifrada (%d)\n"
 
-#: g10/mainproc.c:304
+#: g10/mainproc.c:291
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "clau de sessió xifrada amb %s\n"
 
-#: g10/mainproc.c:314
+#: g10/mainproc.c:301
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "xifrat amb l'algoritme %d (desconegut)\n"
 
-#: g10/mainproc.c:395
+#: g10/mainproc.c:382
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "la clau pública és %08lX\n"
 
-#: g10/mainproc.c:450
+#: g10/mainproc.c:439
 msgid "public key encrypted data: good DEK\n"
 msgstr "dades xifrades amb clau pública: bona clau de xifratge (DEK)\n"
 
-#: g10/mainproc.c:483
+#: g10/mainproc.c:472
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "xifrat amb una clau %2$s de %1$u bits, ID %3$08lX, creada en %4$s\n"
 
-#: g10/mainproc.c:487 g10/pkclist.c:219
+#: g10/mainproc.c:476 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr ""
 
-#: g10/mainproc.c:491
+#: g10/mainproc.c:480
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "xifrat amb una clau %s, ID %08lX\n"
 
-#: g10/mainproc.c:505
+#: g10/mainproc.c:494
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "ha fallat el desxifratge amb la clau pública: %s\n"
 
-#: g10/mainproc.c:519
+#: g10/mainproc.c:508
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "xifrat amb %lu contrasenyes\n"
 
 # FIXME WK: Use ngettext
-#: g10/mainproc.c:521
+#: g10/mainproc.c:510
 msgid "encrypted with 1 passphrase\n"
 msgstr "xifrat amb 1 contrasenya\n"
 
 # I no serà «dades xifrades amb %s»?  ivb
 # Sembla que sí, ho marque per a mirar-ho més endavant. jm
-#: g10/mainproc.c:549 g10/mainproc.c:571
+#: g10/mainproc.c:541 g10/mainproc.c:563
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "s'assumeixen dades xifrades amb %s\n"
 
 # L'optimístic és aquell que té una Fe Cega en que Tot Anirà Bé!  ivb
-#: g10/mainproc.c:557
+#: g10/mainproc.c:549
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "El xifratge IDEA no està disponible, s'intentarà utilitzar optimistament %s "
 "en el seu lloc\n"
 
-#: g10/mainproc.c:589
+#: g10/mainproc.c:581
 msgid "decryption okay\n"
 msgstr "desxifratge correcte\n"
 
-#: g10/mainproc.c:593
+#: g10/mainproc.c:585
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVÍS: el missatge no tenia protecció d'integritat\n"
 
-#: g10/mainproc.c:606
+#: g10/mainproc.c:598
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVÍS: el missatge xifrat ha estat manipulat!\n"
 
-#: g10/mainproc.c:612
+#: g10/mainproc.c:604
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "ha fallat el desxifratge: %s\n"
 
-#: g10/mainproc.c:631
+#: g10/mainproc.c:623
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: el remitent ha sol·licitat \"alt secret\"\n"
 
-#: g10/mainproc.c:633
+#: g10/mainproc.c:625
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nom del fitxer original='%.*s'\n"
 
-#: g10/mainproc.c:822
+#: g10/mainproc.c:815
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocació autònoma: useu \"gpg --import\" per a aplicar-la\n"
 
-#: g10/mainproc.c:1168
+#: g10/mainproc.c:1161
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Signatura correcta de \""
 
-#: g10/mainproc.c:1418
+#: g10/mainproc.c:1419
 msgid "signature verification suppressed\n"
 msgstr "s'ha eliminat la verificació de signatura\n"
 
-#: g10/mainproc.c:1460 g10/mainproc.c:1470
-msgid "can't handle these multiple signatures\n"
+#: g10/mainproc.c:1519
+#, fuzzy
+msgid "can't handle this ambiguous signature data\n"
 msgstr "no es poden tractar aquestes signatures múltiples\n"
 
-#: g10/mainproc.c:1480
+#: g10/mainproc.c:1530
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Aquesta signatura va caducar el %s\n"
 
-#: g10/mainproc.c:1481
+#: g10/mainproc.c:1531
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "              alias \""
 
 # «%.*s» no serà una data?  Caldrà «el» al davant.  ivb
-#: g10/mainproc.c:1485
+#: g10/mainproc.c:1535
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Signatura creada el %.*s usant una clau %s ID %08lX\n"
 
-#: g10/mainproc.c:1505
+#: g10/mainproc.c:1555
 msgid "Key available at: "
 msgstr "La clau és disponible en: "
 
-#: g10/mainproc.c:1639 g10/mainproc.c:1687
+#: g10/mainproc.c:1688 g10/mainproc.c:1736
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Signatura INCORRECTA de \""
 
-#: g10/mainproc.c:1641 g10/mainproc.c:1689
+#: g10/mainproc.c:1690 g10/mainproc.c:1738
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Signatura caducada de \""
 
-#: g10/mainproc.c:1643 g10/mainproc.c:1691
+#: g10/mainproc.c:1692 g10/mainproc.c:1740
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Signatura correcta de \""
 
-#: g10/mainproc.c:1695
+#: g10/mainproc.c:1744
 msgid "[uncertain]"
 msgstr "[incert]"
 
-#: g10/mainproc.c:1727
+#: g10/mainproc.c:1776
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1824
+#: g10/mainproc.c:1873
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Aquesta signatura va caducar el %s\n"
 
-#: g10/mainproc.c:1829
+#: g10/mainproc.c:1878
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Aquesta signatura caduca el %s\n"
 
-#: g10/mainproc.c:1832
+#: g10/mainproc.c:1881
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "signatura %s, algorisme de resum %s\n"
 
-#: g10/mainproc.c:1833
+#: g10/mainproc.c:1882
 msgid "binary"
 msgstr "binari"
 
-#: g10/mainproc.c:1834
+#: g10/mainproc.c:1883
 msgid "textmode"
 msgstr "mode text"
 
-#: g10/mainproc.c:1834 g10/trustdb.c:536
+#: g10/mainproc.c:1883 g10/trustdb.c:536
 msgid "unknown"
 msgstr "desconeguda"
 
-#: g10/mainproc.c:1854
+#: g10/mainproc.c:1903
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "No s'ha pogut comprovar la signatura: %s\n"
 
-#: g10/mainproc.c:1922 g10/mainproc.c:1938 g10/mainproc.c:2024
+#: g10/mainproc.c:1972 g10/mainproc.c:1988 g10/mainproc.c:2074
 msgid "not a detached signature\n"
 msgstr "no és una signatura separada\n"
 
-#: g10/mainproc.c:1965
+#: g10/mainproc.c:2015
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "AVÍS: s'han detectat múltiples signatures. Només es comprovarà la primera.\n"
 
-#: g10/mainproc.c:1973
+#: g10/mainproc.c:2023
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "signatura autònoma de classe 0x%02x\n"
 
-#: g10/mainproc.c:2030
+#: g10/mainproc.c:2080
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signatura de l'estil antic (PGP 2.x)\n"
 
-#: g10/mainproc.c:2040
+#: g10/mainproc.c:2090
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "s'ha detectat un paquet arrel invàlid en proc_tree()\n"
 
@@ -5433,23 +5440,23 @@ msgstr "error en crear «%s»: %s\n"
 
 # Indi? ivb
 # Em pense que no. jm
-#: g10/plaintext.c:447
+#: g10/plaintext.c:453
 msgid "Detached signature.\n"
 msgstr "Signatura separada.\n"
 
-#: g10/plaintext.c:453
+#: g10/plaintext.c:459
 msgid "Please enter name of data file: "
 msgstr "Introduïu el nom del fitxer de dades: "
 
-#: g10/plaintext.c:485
+#: g10/plaintext.c:491
 msgid "reading stdin ...\n"
 msgstr "s'està llegint d'stdin...\n"
 
-#: g10/plaintext.c:519
+#: g10/plaintext.c:525
 msgid "no signed data\n"
 msgstr "no hi ha dades signades\n"
 
-#: g10/plaintext.c:533
+#: g10/plaintext.c:539
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "no s'han pogut obrir les dades signades `%s'\n"
diff --git a/po/cs.po b/po/cs.po
index 6166824fb..951964039 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.3.92\n"
 "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2006-02-14 15:28+0100\n"
+"POT-Creation-Date: 2006-03-07 11:29+0100\n"
 "PO-Revision-Date: 2004-11-26 09:12+0200\n"
 "Last-Translator: Roman Pavlik <rp@tns.cz>\n"
 "Language-Team: Czech <translations.cs@gnupg.cz>\n"
@@ -41,9 +41,9 @@ msgstr "zapisuji tajn
 
 #: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:992 g10/gpg.c:3360 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:997 g10/gpg.c:3391 g10/import.c:193 g10/keygen.c:2274
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:476 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
+#: g10/plaintext.c:482 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
 #: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
@@ -77,7 +77,7 @@ msgstr "nemohu 
 msgid "note: random_seed file not updated\n"
 msgstr "pozn�mka: soubor random_seed nen� aktualizov�n\n"
 
-#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:991 g10/keygen.c:2753
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2753
 #: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
 #: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
 #, c-format
@@ -663,11 +663,11 @@ msgstr "administr
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Neplatn� p��kaz (zkuste \"help\")\n"
 
-#: g10/cardglue.c:435
+#: g10/cardglue.c:434
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr "Pros�m vo�te kartu a stiskn�te enter. Operaci zru��te stisknut�m 'z': "
 
-#: g10/cardglue.c:572
+#: g10/cardglue.c:573
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
@@ -676,37 +676,37 @@ msgstr ""
 "Pros�m vyjm�te kartu a vlo�te jinou se seriov�m ��slem:\n"
 "   %.*s\n"
 
-#: g10/cardglue.c:580
+#: g10/cardglue.c:582
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 "Je-li nov� karta p�ipravena, stiskn�te enter.  Operaci zru��te stisknut�m "
 "'z': "
 
-#: g10/cardglue.c:915
+#: g10/cardglue.c:917
 msgid "Enter New Admin PIN: "
 msgstr "Vlo�te nov� PIN administr�tora: "
 
-#: g10/cardglue.c:916
+#: g10/cardglue.c:918
 msgid "Enter New PIN: "
 msgstr "Vlo�te nov� PIN: "
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:919
 msgid "Enter Admin PIN: "
 msgstr "Vlo�te PIN administr�tora: "
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:920
 msgid "Enter PIN: "
 msgstr "Vlo�te PIN: "
 
-#: g10/cardglue.c:935
+#: g10/cardglue.c:937
 msgid "Repeat this PIN: "
 msgstr "Opakujte tento PIN: "
 
-#: g10/cardglue.c:950
+#: g10/cardglue.c:952
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN nen� zopakov�n spr�vn�; zkuste to znovu"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3720 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3751 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -716,13 +716,13 @@ msgstr "nelze otev
 msgid "--output doesn't work for this command\n"
 msgstr "--output pro tento p��kaz nen� platn�\n"
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1644
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1698
 #: g10/revoke.c:228
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "kl�� \"%s\" nenalezen: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1658
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1712
 #: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -833,12 +833,12 @@ msgstr "pou
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s za�ifrovan� pro: %s\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:306
+#: g10/encr-data.c:67 g10/mainproc.c:293
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s za�ifrovan� data\n"
 
-#: g10/encr-data.c:69 g10/mainproc.c:310
+#: g10/encr-data.c:69 g10/mainproc.c:297
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "za�ifrov�no nezn�m�m algoritmem %d\n"
@@ -977,7 +977,7 @@ msgstr "VAROV
 msgid "WARNING: nothing exported\n"
 msgstr "VAROV�N�: nebylo nic vyexportov�no\n"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:373
 msgid ""
 "@Commands:\n"
 " "
@@ -985,127 +985,127 @@ msgstr ""
 "@P��kazy:\n"
 " "
 
-#: g10/gpg.c:374
+#: g10/gpg.c:375
 msgid "|[file]|make a signature"
 msgstr "|[soubor]|vytvo�it podpis"
 
-#: g10/gpg.c:375
+#: g10/gpg.c:376
 msgid "|[file]|make a clear text signature"
 msgstr "|[soubor]|vytvo�it podpis v �iteln�m dokumentu"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:377
 msgid "make a detached signature"
 msgstr "vytvo�it podpis odd�len� od dokumentu"
 
-#: g10/gpg.c:377
+#: g10/gpg.c:378
 msgid "encrypt data"
 msgstr "�ifrovat data"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:380
 msgid "encryption only with symmetric cipher"
 msgstr "�ifrov�n� pouze se symetrickou �ifrou"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:382
 msgid "decrypt data (default)"
 msgstr "de�ifrovat data (implicitn�)"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:384
 msgid "verify a signature"
 msgstr "verifikovat podpis"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:386
 msgid "list keys"
 msgstr "vypsat seznam kl���"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "list keys and signatures"
 msgstr "vypsat seznam kl��� a podpis�"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:389
 msgid "list and check key signatures"
 msgstr "vypsat a zkontrolovat podpisy kl���"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:390
 msgid "list keys and fingerprints"
 msgstr "vypsat seznam kl��� a fingerprint�"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:391
 msgid "list secret keys"
 msgstr "vypsat seznam tajn�ch kl���"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:392
 msgid "generate a new key pair"
 msgstr "vytvo�it nov� p�r kl���"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:393
 msgid "remove keys from the public keyring"
 msgstr "odstranit kl�� ze souboru ve�ejn�ch kl���"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:395
 msgid "remove keys from the secret keyring"
 msgstr "odstranit kl�� ze souboru tajn�ch kl���"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:396
 msgid "sign a key"
 msgstr "podepsat kl��"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:397
 msgid "sign a key locally"
 msgstr "podepsat kl�� lok�ln�"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:398
 msgid "sign or edit a key"
 msgstr "podepsat nebo modifikovat kl��"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:399
 msgid "generate a revocation certificate"
 msgstr "vytvo�it revoka�n� certifik�t"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:401
 msgid "export keys"
 msgstr "exportovat kl��e"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:402
 msgid "export keys to a key server"
 msgstr "exportovat kl��e na server kl���"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:403
 msgid "import keys from a key server"
 msgstr "importovat kl��e ze serveru kl���"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:405
 msgid "search for keys on a key server"
 msgstr "vyhledat kl��e na serveru kl���"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:407
 msgid "update all keys from a keyserver"
 msgstr "aktualizovat v�echny kl��e ze serveru kl���"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:411
 msgid "import/merge keys"
 msgstr "importovat/slou�it kl��e"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:414
 msgid "print the card status"
 msgstr "vytisknout stav karty"
 
-#: g10/gpg.c:414
+#: g10/gpg.c:415
 msgid "change data on a card"
 msgstr "zm�nit data na kart�"
 
-#: g10/gpg.c:415
+#: g10/gpg.c:416
 msgid "change a card's PIN"
 msgstr "zm�nit PIN karty"
 
-#: g10/gpg.c:423
+#: g10/gpg.c:424
 msgid "update the trust database"
 msgstr "aktualizovat datab�zi d�v�ry"
 
-#: g10/gpg.c:430
+#: g10/gpg.c:431
 msgid "|algo [files]|print message digests"
 msgstr "|algo [soubory]  vypi� hash"
 
-#: g10/gpg.c:434 g10/gpgv.c:71
+#: g10/gpg.c:435 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1115,55 +1115,55 @@ msgstr ""
 "Mo�nosti:\n"
 " "
 
-#: g10/gpg.c:436
+#: g10/gpg.c:437
 msgid "create ascii armored output"
 msgstr "vytvo� v�stup zak�dovan� pomoc� ASCII"
 
-#: g10/gpg.c:438
+#: g10/gpg.c:439
 msgid "|NAME|encrypt for NAME"
 msgstr "|JM�NO|�ifrovat pro JM�NO"
 
-#: g10/gpg.c:449
+#: g10/gpg.c:450
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "pou��t tento id u�ivatele pro podeps�n�\n"
 " nebo de�ifrov�n�"
 
-#: g10/gpg.c:450
+#: g10/gpg.c:451
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|nastavit �rov�� komprimace N (0 - ��dn�\n"
 " komprimace)"
 
-#: g10/gpg.c:455
+#: g10/gpg.c:456
 msgid "use canonical text mode"
 msgstr "pou��t kanonick� textov� m�d"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:470
 msgid "use as output file"
 msgstr "pou��t jako v�stupn� soubor"
 
-#: g10/gpg.c:471 g10/gpgv.c:73
+#: g10/gpg.c:472 g10/gpgv.c:73
 msgid "verbose"
 msgstr "s dodate�n�mi informacemi"
 
-#: g10/gpg.c:482
+#: g10/gpg.c:483
 msgid "do not make any changes"
 msgstr "neprov�d�t ��dn� zm�ny"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:484
 msgid "prompt before overwriting"
 msgstr "vy��dat potvrzen� p�ed p�eps�n�m"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:525
 msgid "use strict OpenPGP behavior"
 msgstr "pou��t chov�n� striktn� podle OpenPGP"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "generate PGP 2.x compatible messages"
 msgstr "generovat zpr�vu komplatibiln� s PGP 2.x"
 
-#: g10/gpg.c:553
+#: g10/gpg.c:554
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1171,7 +1171,7 @@ msgstr ""
 "@\n"
 "(Pou�ijte manu�lov� str�nky pro kompletn� seznam v�ech p��kaz� a mo�nost�)\n"
 
-#: g10/gpg.c:556
+#: g10/gpg.c:557
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1189,17 +1189,17 @@ msgstr ""
 " --list-keys [jm�na]        vypsat kl��e\n"
 " --fingerprint [jm�na]      vypsat fingerprinty \n"
 
-#: g10/gpg.c:746 g10/gpgv.c:98
+#: g10/gpg.c:751 g10/gpgv.c:98
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr ""
 "Chyby oznamte, pros�m, na adresu <gnupg-bugs@gnu.org>.\n"
 "P�ipom�nky k p�ekladu <rp@tns.cz>.\n"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:768
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
 
-#: g10/gpg.c:766
+#: g10/gpg.c:771
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1209,7 +1209,7 @@ msgstr ""
 "podepsat, ov��it, �ifrovat nebo de�ifrovat\n"
 "implicitn� operace z�vis� na vstupn�ch datech\n"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:782
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1217,79 +1217,79 @@ msgstr ""
 "\n"
 "Podporovan� algoritmy:\n"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:785
 msgid "Pubkey: "
 msgstr "Ve�ejn� kl��: "
 
-#: g10/gpg.c:786 g10/keyedit.c:2266
+#: g10/gpg.c:791 g10/keyedit.c:2266
 msgid "Cipher: "
 msgstr "�ifra: "
 
-#: g10/gpg.c:792
+#: g10/gpg.c:797
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:798 g10/keyedit.c:2312
+#: g10/gpg.c:803 g10/keyedit.c:2312
 msgid "Compression: "
 msgstr "Komprese: "
 
-#: g10/gpg.c:881
+#: g10/gpg.c:886
 msgid "usage: gpg [options] "
 msgstr "u�it�: gpg [mo�nosti]"
 
-#: g10/gpg.c:1029
+#: g10/gpg.c:1034
 msgid "conflicting commands\n"
 msgstr "konfliktn� p��kazy\n"
 
-#: g10/gpg.c:1047
+#: g10/gpg.c:1052
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "no = podpis nalezen v definici skupiny `%s'\n"
 
 # g10/g10.c:1179#, c-format
-#: g10/gpg.c:1244
+#: g10/gpg.c:1249
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 "VAROV�N�: vlastnictv� domovsk�ho adres��e nen� nastaveno bezpe�n� `%s'\n"
 
-#: g10/gpg.c:1247
+#: g10/gpg.c:1252
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr ""
 "VAROV�N�: vlastnictv� konfigura�n�ho souboru nen� nastaveno bezpe�n� `%s'\n"
 
-#: g10/gpg.c:1250
+#: g10/gpg.c:1255
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr ""
 "VAROV�N�: vlastnictv� roz�i�uj�c�ho modulu nen� nastaveno bezpe�n� `%s'\n"
 
-#: g10/gpg.c:1256
+#: g10/gpg.c:1261
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr ""
 "VAROV�N�: p��stupov� pr�va pro domovsk� adres��e nejsou bezpe�n� `%s'\n"
 
-#: g10/gpg.c:1259
+#: g10/gpg.c:1264
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr ""
 "VAROV�N�: p��stupov� pr�va pro konfigura�n� soubor nejsou bezpe�n� `%s'\n"
 
-#: g10/gpg.c:1262
+#: g10/gpg.c:1267
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "VAROV�N�: p��stupov� pr�va roz�i�uj�c�mu modulu nejsou bezpe�n� `%s'\n"
 
-#: g10/gpg.c:1268
+#: g10/gpg.c:1273
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "VAROV�N�: vlastnictv� adres��e s domovk�m adres��em nen� nastaveno "
 "nebezpe�n� `%s'\n"
 
-#: g10/gpg.c:1271
+#: g10/gpg.c:1276
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1297,21 +1297,21 @@ msgstr ""
 "VAROV�N�: vlastnictv� adres��e s konfigura�n�m souborem nen� nastaveno "
 "nebezpe�n� `%s'\n"
 
-#: g10/gpg.c:1274
+#: g10/gpg.c:1279
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "VAROV�N�: vlastnictv� adres��e s roz�i�uj�c�m modulem nen� nastaveno "
 "nebezpe�n� `%s'\n"
 
-#: g10/gpg.c:1280
+#: g10/gpg.c:1285
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "VAROV�N�: p��stupov� pr�va k adres��i s domovsk�m adres��em nejsou nastavena "
 "bezpe�n� `%s'\n"
 
-#: g10/gpg.c:1283
+#: g10/gpg.c:1288
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1319,7 +1319,7 @@ msgstr ""
 "VAROV�N�: p��stupov� pr�va k aders��i s konfigura�n�m souborem nejsou "
 "nastavena bezpe�n� `%s'\n"
 
-#: g10/gpg.c:1286
+#: g10/gpg.c:1291
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
@@ -1327,459 +1327,468 @@ msgstr ""
 "nastavena bezpe�n� `%s'\n"
 
 # c-format
-#: g10/gpg.c:1427
+#: g10/gpg.c:1432
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "nezn�m� konfigura�n� polo�ka \"%s\"\n"
 
-#: g10/gpg.c:1521
+#: g10/gpg.c:1526
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1523
+#: g10/gpg.c:1528
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1525
+#: g10/gpg.c:1530
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "V souboru tajn�ch kl��� chyb� odpov�daj�c� podpis\n"
 
-#: g10/gpg.c:1527
+#: g10/gpg.c:1532
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1536
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1538
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "zadan� URL preferovan�ho serveru kl��� je neplat�\n"
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1540
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1542
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1544
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1546
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "p�epnout mezi vypisem seznamu tajn�ch a ve�ejn�ch kl���"
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1548
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "V souboru tajn�ch kl��� chyb� odpov�daj�c� podpis\n"
 
-#: g10/gpg.c:1874
+#: g10/gpg.c:1879
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "POZN�MKA: star� implicitn� soubor s mo�nostmi `%s ignorov�n'\n"
 
-#: g10/gpg.c:1916
+#: g10/gpg.c:1921
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "POZN�MKA: neexistuje implicitn� soubor s mo�nostmi `%s'\n"
 
-#: g10/gpg.c:1920
+#: g10/gpg.c:1925
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "soubor s mo�nostmi `%s': %s\n"
 
-#: g10/gpg.c:1927
+#: g10/gpg.c:1932
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "�tu mo�nosti z `%s'\n"
 
-#: g10/gpg.c:2142 g10/gpg.c:2716 g10/gpg.c:2735
+#: g10/gpg.c:2147 g10/gpg.c:2747 g10/gpg.c:2766
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "POZN�MKA: %s nen� pro norm�ln� pou�it�!\n"
 
-#: g10/gpg.c:2158
+#: g10/gpg.c:2163
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "�ifra `%s' nebyla nahr�na, proto�e p��stupov� pr�va nejsou nastavena "
 "bezpe�n�\n"
 
-#: g10/gpg.c:2312 g10/gpg.c:2324
+#: g10/gpg.c:2317 g10/gpg.c:2329
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' nen� platn� doba expirace podpisu\n"
 
-#: g10/gpg.c:2400
+#: g10/gpg.c:2405
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' nen� platn� znakov� sada\n"
 
-#: g10/gpg.c:2422 g10/keyedit.c:3997
+#: g10/gpg.c:2429 g10/keyedit.c:3997
 msgid "could not parse keyserver URL\n"
 msgstr "nelze zpracovat URL serveru kl���\n"
 
-#: g10/gpg.c:2428
+#: g10/gpg.c:2441
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: neplatn� parametr pro server kl���\n"
 
-#: g10/gpg.c:2431
+#: g10/gpg.c:2444
 msgid "invalid keyserver options\n"
 msgstr "neplatn� parametr pro server kl���\n"
 
-#: g10/gpg.c:2438
+#: g10/gpg.c:2451
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: neplatn� parametr pro import\n"
 
-#: g10/gpg.c:2441
+#: g10/gpg.c:2454
 msgid "invalid import options\n"
 msgstr "neplatn� parametr pro import\n"
 
-#: g10/gpg.c:2448
+#: g10/gpg.c:2461
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: neplatn� parametr pro export\n"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2464
 msgid "invalid export options\n"
 msgstr "neplatn� parametr pro export\n"
 
-#: g10/gpg.c:2458
+#: g10/gpg.c:2471
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: neplatn� parametr pro v�pis\n"
 
-#: g10/gpg.c:2461
+#: g10/gpg.c:2474
 msgid "invalid list options\n"
 msgstr "neplatn� parametr pro v�pis\n"
 
-#: g10/gpg.c:2469
+#: g10/gpg.c:2482
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2471
+#: g10/gpg.c:2484
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2473
+#: g10/gpg.c:2486
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' nen� platn� doba expirace podpisu\n"
 
-#: g10/gpg.c:2475
+#: g10/gpg.c:2488
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2479
+#: g10/gpg.c:2492
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2481
+#: g10/gpg.c:2494
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "zadan� URL preferovan�ho serveru kl��� je neplat�\n"
 
-#: g10/gpg.c:2483
+#: g10/gpg.c:2496
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' nen� platn� doba expirace podpisu\n"
 
-#: g10/gpg.c:2485
+#: g10/gpg.c:2498
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2505
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: neplatn� parametr pro ov��en�\n"
 
-#: g10/gpg.c:2495
+#: g10/gpg.c:2508
 msgid "invalid verify options\n"
 msgstr "neplatn� parametr pro ov��en�\n"
 
-#: g10/gpg.c:2502
+#: g10/gpg.c:2515
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nelze nastavit exec-path na %s\n"
 
-#: g10/gpg.c:2705
+#: g10/gpg.c:2665
+#, fuzzy, c-format
+msgid "%s:%d: invalid auto-key-locate list\n"
+msgstr "%s:%d: neplatn� parametr pro ov��en�\n"
+
+#: g10/gpg.c:2668
+msgid "invalid auto-key-locate list\n"
+msgstr ""
+
+#: g10/gpg.c:2736
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROV�N�: program m��e vytvo�it soubor core!\n"
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2740
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROV�N�: %s p�ep��e %s\n"
 
-#: g10/gpg.c:2718
+#: g10/gpg.c:2749
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nen� dovoleno pou��vat %s s %s!\n"
 
-#: g10/gpg.c:2721
+#: g10/gpg.c:2752
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ned�v� s %s smysl!\n"
 
-#: g10/gpg.c:2728
+#: g10/gpg.c:2759
 #, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "POZN�MKA: %s nen� v t�to verzi dostupn�\n"
 
-#: g10/gpg.c:2743
+#: g10/gpg.c:2774
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "nelze spustit s nebezpe�nou pam�t� vzhledem k %s\n"
 
-#: g10/gpg.c:2757
+#: g10/gpg.c:2788
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "v m�du --pgp2 m��ete vytv��et pouze odd�len� podpisy nebo podpisy �iteln� "
 "jako text\n"
 
-#: g10/gpg.c:2763
+#: g10/gpg.c:2794
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "v m�du --pgp2 nelze sou�asn� �ifrovat a podepisovat\n"
 
-#: g10/gpg.c:2769
+#: g10/gpg.c:2800
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "v m�du --pgp2 mus�te pou��t soubor (ne rouru).\n"
 
-#: g10/gpg.c:2782
+#: g10/gpg.c:2813
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "�ifrov�n� zpr�v v m�du --pgp2 vy�aduje algoritmus IDEA\n"
 
-#: g10/gpg.c:2849 g10/gpg.c:2873
+#: g10/gpg.c:2880 g10/gpg.c:2904
 msgid "selected cipher algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:2855 g10/gpg.c:2879
+#: g10/gpg.c:2886 g10/gpg.c:2910
 msgid "selected digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:2861
+#: g10/gpg.c:2892
 msgid "selected compression algorithm is invalid\n"
 msgstr "vybran� komprimovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:2867
+#: g10/gpg.c:2898
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:2882
+#: g10/gpg.c:2913
 msgid "completes-needed must be greater than 0\n"
 msgstr "polo�ka completes-needed mus� b�t v�t�� ne� 0\n"
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2915
 msgid "marginals-needed must be greater than 1\n"
 msgstr "polo�ka marginals-needed mus� b�t v�t�� ne� 1\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2917
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "polo�ka max-cert-depth mus� b�t v rozmez� od 1 do 255\n"
 
-#: g10/gpg.c:2888
+#: g10/gpg.c:2919
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 "neplatn� implicitn� �rove� certifikace (default-cert-level); mus� b�t 0, 1, "
 "2 nebo 3\n"
 
-#: g10/gpg.c:2890
+#: g10/gpg.c:2921
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr ""
 "neplatn� minim�ln� �rove� certifikace (min-cert-level); mus� b�t 0, 1, 2 "
 "nebo 3\n"
 
-#: g10/gpg.c:2893
+#: g10/gpg.c:2924
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "POZN�MKA: jednoduch� m�d S2K (0) je d�razn� nedoporu�ov�n\n"
 
-#: g10/gpg.c:2897
+#: g10/gpg.c:2928
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "neplatn� m�d S2K; mus� b�t 0, 1 nebo 3\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2935
 msgid "invalid default preferences\n"
 msgstr "neplatn� defaultn� p�edvolby\n"
 
-#: g10/gpg.c:2913
+#: g10/gpg.c:2944
 msgid "invalid personal cipher preferences\n"
 msgstr "neplatn� u�ivatelsk� p�edvolby pro �ifrov�n�\n"
 
-#: g10/gpg.c:2917
+#: g10/gpg.c:2948
 msgid "invalid personal digest preferences\n"
 msgstr "neplatn� u�ivatelsk� p�edvolby pro hashov�n�\n"
 
-#: g10/gpg.c:2921
+#: g10/gpg.c:2952
 msgid "invalid personal compress preferences\n"
 msgstr "neplatn� u�ivatelsk� p�edvolby pro komprimaci\n"
 
-#: g10/gpg.c:2954
+#: g10/gpg.c:2985
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s dosud nen� funk�n� s %s\n"
 
-#: g10/gpg.c:3001
+#: g10/gpg.c:3032
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "pou�it� �ifrovac�ho algoritmu `%s' v m�du %s dovoleno\n"
 
-#: g10/gpg.c:3006
+#: g10/gpg.c:3037
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "pou�it� hashovac�ho algoritmu `%s' v m�du %s dovoleno\n"
 
-#: g10/gpg.c:3011
+#: g10/gpg.c:3042
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "pou�it� komprima�n�ho algoritmu `%s' v m�du %s dovoleno\n"
 
-#: g10/gpg.c:3107
+#: g10/gpg.c:3138
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "nemohu inicializovat datab�zi d�v�ry: %s\n"
 
-#: g10/gpg.c:3118
+#: g10/gpg.c:3149
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "VAROV�N�: specifikov�n adres�t (-r) bez pou�it� �ifrov�n� s ve�ejn�m kl��em\n"
 
-#: g10/gpg.c:3129
+#: g10/gpg.c:3160
 msgid "--store [filename]"
 msgstr "--store [jm�no souboru]"
 
-#: g10/gpg.c:3136
+#: g10/gpg.c:3167
 msgid "--symmetric [filename]"
 msgstr "--symmetric [jm�no souboru]"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3169
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "symetrick� �ifrov�n� `%s' se nepovedlo: %s\n"
 
-#: g10/gpg.c:3148
+#: g10/gpg.c:3179
 msgid "--encrypt [filename]"
 msgstr "--encrypt [jm�no souboru]"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3192
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [jm�no souboru]"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3194
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "nelze pou��t --symmetric --encrypt s p��kazem --s2k-mode 0\n"
 
-#: g10/gpg.c:3166
+#: g10/gpg.c:3197
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "nelze pou��t --symmetric --encrypt v m�du %s\n"
 
-#: g10/gpg.c:3184
+#: g10/gpg.c:3215
 msgid "--sign [filename]"
 msgstr "--sign [jm�no souboru]"
 
-#: g10/gpg.c:3197
+#: g10/gpg.c:3228
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [jm�no souboru]"
 
-#: g10/gpg.c:3212
+#: g10/gpg.c:3243
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [jm�no souboru]"
 
-#: g10/gpg.c:3214
+#: g10/gpg.c:3245
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "nelze pou��t --symmetric --sign --encrypt s p��kazem --s2k-mode 0\n"
 
-#: g10/gpg.c:3217
+#: g10/gpg.c:3248
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "nelze pou��t --symmetric --sign --encrypt v m�du %s\n"
 
-#: g10/gpg.c:3237
+#: g10/gpg.c:3268
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [jm�no souboru]"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3277
 msgid "--clearsign [filename]"
 msgstr "--clearsign [jm�no souboru]"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3302
 msgid "--decrypt [filename]"
 msgstr "--decrypt [jm�no souboru]"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3310
 msgid "--sign-key user-id"
 msgstr "--sign-key id u�ivatele"
 
-#: g10/gpg.c:3283
+#: g10/gpg.c:3314
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id u�ivatele"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3335
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id u�ivatele [p��kazy]"
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3406
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id u�ivatele] [soubor s kl��i (keyring)]"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3443
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "odesl�n� na keyserver se nezda�ilo: %s\n"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3445
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "z�sk�n� dat z keyserveru se nezda�ilo: %s\n"
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3447
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export kl��e se nepoda�il: %s\n"
 
-#: g10/gpg.c:3427
+#: g10/gpg.c:3458
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "hled�n� na keyserveru se nezda�ilo: %s\n"
 
-#: g10/gpg.c:3437
+#: g10/gpg.c:3468
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "refresh dat na keyserveru se nezda�il: %s\n"
 
-#: g10/gpg.c:3488
+#: g10/gpg.c:3519
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dek�dov�n� z ASCII form�tu selhalo: %s\n"
 
-#: g10/gpg.c:3496
+#: g10/gpg.c:3527
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "k�dov�n� do ASCII form�tu selhalo: %s\n"
 
-#: g10/gpg.c:3583
+#: g10/gpg.c:3614
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "neplatn� hashovac� algoritmus `%s'\n"
 
-#: g10/gpg.c:3706
+#: g10/gpg.c:3737
 msgid "[filename]"
 msgstr "[jm�no souboru]"
 
-#: g10/gpg.c:3710
+#: g10/gpg.c:3741
 msgid "Go ahead and type your message ...\n"
 msgstr "Za�n�te ps�t svou zpr�vu ...\n"
 
-#: g10/gpg.c:4000
+#: g10/gpg.c:4031
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1787,27 +1796,27 @@ msgstr ""
 "symbolick� jm�no sm� obsahovat pouze p�smena, ��slice, te�ky nebo podtr��tka "
 "a mus� kon�it znakem '='\n"
 
-#: g10/gpg.c:4008
+#: g10/gpg.c:4039
 msgid "a user notation name must contain the '@' character\n"
 msgstr "jm�no u�ivatele mus� obsahovat znakt '@' \n"
 
-#: g10/gpg.c:4013
+#: g10/gpg.c:4044
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "jm�no u�ivatele nesm� obsahovat v�ce ne� jeden znak '@' \n"
 
-#: g10/gpg.c:4024
+#: g10/gpg.c:4055
 msgid "a notation value must not use any control characters\n"
 msgstr "hodnota nem��e obsahovat ��dn� kontroln� znaky\n"
 
-#: g10/gpg.c:4058
+#: g10/gpg.c:4089
 msgid "the given certification policy URL is invalid\n"
 msgstr "zadan� URL pro certifika�n� politiku je neplatn�\n"
 
-#: g10/gpg.c:4060
+#: g10/gpg.c:4091
 msgid "the given signature policy URL is invalid\n"
 msgstr "zadan� URL pro podepisovac� politiku je neplatn�\n"
 
-#: g10/gpg.c:4093
+#: g10/gpg.c:4124
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "zadan� URL preferovan�ho serveru kl��� je neplat�\n"
 
@@ -1815,32 +1824,33 @@ msgstr "zadan
 msgid "too many entries in pk cache - disabled\n"
 msgstr "p��li� mnoho polo�ek v bufferu ve�ejn�ch kl��� - vypnuto\n"
 
-#: g10/getkey.c:188 g10/getkey.c:2845
+#: g10/getkey.c:188 g10/getkey.c:2876
 msgid "[User ID not found]"
 msgstr "[ID u�ivatele nenalezeno]"
 
-#: g10/getkey.c:931 g10/getkey.c:953 g10/getkey.c:976
+#: g10/getkey.c:933 g10/getkey.c:950 g10/getkey.c:970 g10/getkey.c:986
+#: g10/getkey.c:1001
 #, c-format
 msgid "Automatically retrieved `%s' via %s\n"
 msgstr ""
 
 # c-format
-#: g10/getkey.c:1769
+#: g10/getkey.c:1800
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Neplatn� kl�� %s zm�n�n na platn� pomoc� --always-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2323
+#: g10/getkey.c:2354
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "neexistuje tajn� podkl�� pro ve�ejn� kl�� %s - ignorov�no\n"
 
-#: g10/getkey.c:2554
+#: g10/getkey.c:2585
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "pou��v�m podkl�� %s m�sto prim�rn�ho kl��e %s\n"
 
-#: g10/getkey.c:2601
+#: g10/getkey.c:2632
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "kl�� %s: tajn� kl�� bez kl��e ve�ejn�ho - p�esko�eno\n"
@@ -3363,12 +3373,12 @@ msgid "(sensitive)"
 msgstr "(citliv� informace)"
 
 #: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
-#: g10/keylist.c:194 g10/keyserver.c:471
+#: g10/keylist.c:194 g10/keyserver.c:525
 #, c-format
 msgid "created: %s"
 msgstr "vytvo�en: %s"
 
-#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:967
+#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:960
 #, c-format
 msgid "revoked: %s"
 msgstr "revokov�n: %s"
@@ -3380,7 +3390,7 @@ msgstr "platnost skon
 
 #: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
 #: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:477 g10/mainproc.c:973
+#: g10/keylist.c:914 g10/keyserver.c:531 g10/mainproc.c:966
 #, c-format
 msgid "expires: %s"
 msgstr "platnost skon��: %s"
@@ -3416,13 +3426,13 @@ msgstr ""
 "Pros�m nezapome�te, �e zobrazovan� �daje o platnosti kl��� nemus�\n"
 "b�t nutn� spr�vn�, dokud znova nespust�te program.\n"
 
-#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:481
-#: g10/mainproc.c:1734 g10/trustdb.c:1184 g10/trustdb.c:1704
+#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:535
+#: g10/mainproc.c:1783 g10/trustdb.c:1184 g10/trustdb.c:1704
 msgid "revoked"
 msgstr "revokov�n"
 
-#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:485
-#: g10/mainproc.c:1736 g10/trustdb.c:537 g10/trustdb.c:1706
+#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:539
+#: g10/mainproc.c:1785 g10/trustdb.c:537 g10/trustdb.c:1706
 msgid "expired"
 msgstr "platnost skon�ila"
 
@@ -4243,388 +4253,385 @@ msgstr "%s: soubor kl
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:77
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:81
+#: g10/keyserver.c:79
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:83
+#: g10/keyserver.c:81
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:87
+#: g10/keyserver.c:85
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:89
-msgid "automatically retrieve keys from PKA records"
-msgstr ""
-
-#: g10/keyserver.c:91
-msgid "automatically retrieve keys from DNS"
-msgstr ""
-
-#: g10/keyserver.c:95
+#: g10/keyserver.c:87
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "Vlo�te URL preferovan�ho keyserveru: "
 
-#: g10/keyserver.c:139
+#: g10/keyserver.c:89
+msgid "honor the PKA record set on a key when retrieving keys"
+msgstr ""
+
+#: g10/keyserver.c:154
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "VAROV�N�: volba `%s' pro server kl��� nen� na t�to platform� ��inn�\n"
 
-#: g10/keyserver.c:483
+#: g10/keyserver.c:537
 msgid "disabled"
 msgstr "disabled"
 
-#: g10/keyserver.c:684
+#: g10/keyserver.c:738
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Vlo�te ��slo (��sla), 'N' pro dal�� nebo 'Q' pro konec> "
 
-#: g10/keyserver.c:767 g10/keyserver.c:1368
+#: g10/keyserver.c:821 g10/keyserver.c:1422
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "neplatn� protokol serveru kl��� (us %d!=handler %d)\n"
 
-#: g10/keyserver.c:865
+#: g10/keyserver.c:919
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "kl�� \"%s\" nebyl na serveru kl��� nalezen\n"
 
-#: g10/keyserver.c:867
+#: g10/keyserver.c:921
 msgid "key not found on keyserver\n"
 msgstr "kl�� nebyl na serveru kl��� nalezen\n"
 
-#: g10/keyserver.c:1092
+#: g10/keyserver.c:1146
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "po�aduji kl�� %s ze %s server %s\n"
 
-#: g10/keyserver.c:1096
+#: g10/keyserver.c:1150
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "po�aduji kl�� %s z %s\n"
 
-#: g10/keyserver.c:1120
+#: g10/keyserver.c:1174
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "vyhled�v�m \"%s\" na %s serveru %s\n"
 
-#: g10/keyserver.c:1123
+#: g10/keyserver.c:1177
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "vyhled�v�m \"%s\" na serveru %s\n"
 
-#: g10/keyserver.c:1271
+#: g10/keyserver.c:1325
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "pos�l�m kl�� %s na %s server %s\n"
 
-#: g10/keyserver.c:1275
+#: g10/keyserver.c:1329
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "pos�l�m kl�� %s na %s\n"
 
-#: g10/keyserver.c:1318
+#: g10/keyserver.c:1372
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "vyhled�v�m \"%s\" na %s serveru %s\n"
 
-#: g10/keyserver.c:1321
+#: g10/keyserver.c:1375
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "vyhled�v�m \"%s\" na serveru %s\n"
 
-#: g10/keyserver.c:1328 g10/keyserver.c:1424
+#: g10/keyserver.c:1382 g10/keyserver.c:1478
 msgid "no keyserver action!\n"
 msgstr "��dn� operace se serverem kl���!\n"
 
-#: g10/keyserver.c:1376
+#: g10/keyserver.c:1430
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "VAROV�N�: keyserver handler z jin� verze GnuPG (%s)\n"
 
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1439
 msgid "keyserver did not send VERSION\n"
 msgstr "server kl��� neposlal VERSION\n"
 
-#: g10/keyserver.c:1446
+#: g10/keyserver.c:1500
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "�adn� server kl��� nen� zn�m (pou��jte volbu --keyserver)\n"
 
-#: g10/keyserver.c:1452
+#: g10/keyserver.c:1506
 msgid "external keyserver calls are not supported in this build\n"
 msgstr "vol�n� extern�ho keyserver nen� v t�to verzi podporov�no\n"
 
-#: g10/keyserver.c:1464
+#: g10/keyserver.c:1518
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "protokol serveru kl��� `%s' nen� podporov�n\n"
 
-#: g10/keyserver.c:1469
+#: g10/keyserver.c:1523
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "akce `%s' nen� podporov�na v protokolu `%s' serveru kl���\n"
 
-#: g10/keyserver.c:1477
+#: g10/keyserver.c:1531
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "%s nepodporuje protokol verze  %d\n"
 
-#: g10/keyserver.c:1484
+#: g10/keyserver.c:1538
 msgid "keyserver timed out\n"
 msgstr "�asov� limit pro server kl��� vypr�el\n"
 
-#: g10/keyserver.c:1489
+#: g10/keyserver.c:1543
 msgid "keyserver internal error\n"
 msgstr "intern� chyba serveru kl���\n"
 
-#: g10/keyserver.c:1498
+#: g10/keyserver.c:1552
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "chyba komunikace se serverem kl���: %s\n"
 
-#: g10/keyserver.c:1523 g10/keyserver.c:1557
+#: g10/keyserver.c:1577 g10/keyserver.c:1611
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" nen� ID kl��e: p�esko�eno\n"
 
-#: g10/keyserver.c:1814
+#: g10/keyserver.c:1868
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "VAROV�N�: nelze aktualizovat kl�� %s prost�ednictv�m %s: %s\n"
 
-#: g10/keyserver.c:1836
+#: g10/keyserver.c:1890
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "aktualizuji 1 kl�� z %s\n"
 
-#: g10/keyserver.c:1838
+#: g10/keyserver.c:1892
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "aktualizuji %d kl��� z %s\n"
 
-#: g10/keyserver.c:1903
+#: g10/keyserver.c:1957
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "VAROV�N�: nelze aktualizovat kl�� %s prost�ednictv�m %s: %s\n"
 
-#: g10/keyserver.c:1909
+#: g10/keyserver.c:1963
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "VAROV�N�: nelze aktualizovat kl�� %s prost�ednictv�m %s: %s\n"
 
-#: g10/mainproc.c:253
+#: g10/mainproc.c:240
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "podivn� velikost �ifrovac�ho kl��e pro sezen� (%d)\n"
 
-#: g10/mainproc.c:304
+#: g10/mainproc.c:291
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s za�ifrovan� kl�� sezen�\n"
 
-#: g10/mainproc.c:314
+#: g10/mainproc.c:301
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "heslo (passphraze) generov�no s pou�it�m nezn�m�ho algoritmu %d\n"
 
-#: g10/mainproc.c:395
+#: g10/mainproc.c:382
 #, c-format
 msgid "public key is %s\n"
 msgstr "ve�ejn� kl�� je %s\n"
 
-#: g10/mainproc.c:450
+#: g10/mainproc.c:439
 msgid "public key encrypted data: good DEK\n"
 msgstr "data za�ifrov�na ve�ejn�m kl��em: spr�vn� DEK\n"
 
-#: g10/mainproc.c:483
+#: g10/mainproc.c:472
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "za�ifrov�na %u-bitov�m %s kl��em, ID %s, vytvo�en�m %s\n"
 
-#: g10/mainproc.c:487 g10/pkclist.c:219
+#: g10/mainproc.c:476 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen mu� "ID" rein :-(
 # [kw]
-#: g10/mainproc.c:491
+#: g10/mainproc.c:480
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "za�ifrov�no %s kl��em, ID %s\n"
 
-#: g10/mainproc.c:505
+#: g10/mainproc.c:494
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "de�ifrov�n� ve�ejn�m kl��em selhalo: %s\n"
 
-#: g10/mainproc.c:519
+#: g10/mainproc.c:508
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "za�ifrov�no s heslem %lu\n"
 
-#: g10/mainproc.c:521
+#: g10/mainproc.c:510
 msgid "encrypted with 1 passphrase\n"
 msgstr "za�ifrov�no jedn�m heslem\n"
 
-#: g10/mainproc.c:549 g10/mainproc.c:571
+#: g10/mainproc.c:541 g10/mainproc.c:563
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "p�edpokl�d�m %s �ifrovan�ch dat\n"
 
-#: g10/mainproc.c:557
+#: g10/mainproc.c:549
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "algoritmus IDEA nen� dostupn�; optimisticky se jej pokus�me nahradit "
 "algoritmem %s\n"
 
-#: g10/mainproc.c:589
+#: g10/mainproc.c:581
 msgid "decryption okay\n"
 msgstr "de�ifrov�n� o.k.\n"
 
-#: g10/mainproc.c:593
+#: g10/mainproc.c:585
 msgid "WARNING: message was not integrity protected\n"
 msgstr "VAROV�N�: zpr�va nebyla chr�n�na proti poru�en� jej� integrity\n"
 
-#: g10/mainproc.c:606
+#: g10/mainproc.c:598
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VAROV�N�: se za�ifrovanou zpr�vou bylo manipulov�no!\n"
 
-#: g10/mainproc.c:612
+#: g10/mainproc.c:604
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "de�ifrov�n� selhalo: %s\n"
 
-#: g10/mainproc.c:631
+#: g10/mainproc.c:623
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "POZN�MKA: odes�latel po�adoval (\"for-your-eyes-only\")\n"
 
-#: g10/mainproc.c:633
+#: g10/mainproc.c:625
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "p�vodn� jm�no souboru='%.*s'\n"
 
-#: g10/mainproc.c:822
+#: g10/mainproc.c:815
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "samostatn� revoka�n� certifik�t -  pou�ijte \"gpg --import\", chcete-li jej "
 "u��t\n"
 
-#: g10/mainproc.c:1168
+#: g10/mainproc.c:1161
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Dobr� podpis od \"%s\""
 
-#: g10/mainproc.c:1418
+#: g10/mainproc.c:1419
 msgid "signature verification suppressed\n"
 msgstr "verifikace podpisu potla�ena\n"
 
-#: g10/mainproc.c:1460 g10/mainproc.c:1470
-msgid "can't handle these multiple signatures\n"
+#: g10/mainproc.c:1519
+#, fuzzy
+msgid "can't handle this ambiguous signature data\n"
 msgstr "neum�m pracovat s t�mito n�sobn�mi podpisy\n"
 
-#: g10/mainproc.c:1480
+#: g10/mainproc.c:1530
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Podpis vytvo�en %s\n"
 
-#: g10/mainproc.c:1481
+#: g10/mainproc.c:1531
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               pou�it� %s kl��e %s\n"
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen mu� "ID" rein :-(
-#: g10/mainproc.c:1485
+#: g10/mainproc.c:1535
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Podpis vytvo�en %s pomoc� kl��e %s s ID u�ivatele %s\n"
 
-#: g10/mainproc.c:1505
+#: g10/mainproc.c:1555
 msgid "Key available at: "
 msgstr "Kl�� k dispozici na: "
 
-#: g10/mainproc.c:1639 g10/mainproc.c:1687
+#: g10/mainproc.c:1688 g10/mainproc.c:1736
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "�PATN� podpis od \"%s\""
 
-#: g10/mainproc.c:1641 g10/mainproc.c:1689
+#: g10/mainproc.c:1690 g10/mainproc.c:1738
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Podpis s vypr�enou platnost� od \"%s\""
 
-#: g10/mainproc.c:1643 g10/mainproc.c:1691
+#: g10/mainproc.c:1692 g10/mainproc.c:1740
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Dobr� podpis od \"%s\""
 
-#: g10/mainproc.c:1695
+#: g10/mainproc.c:1744
 msgid "[uncertain]"
 msgstr "[nejist�]"
 
-#: g10/mainproc.c:1727
+#: g10/mainproc.c:1776
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                alias \"%s\""
 
-#: g10/mainproc.c:1824
+#: g10/mainproc.c:1873
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Platnost podpisu skon�ila %s\n"
 
-#: g10/mainproc.c:1829
+#: g10/mainproc.c:1878
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Platnost podpisu skon�� %s\n"
 
-#: g10/mainproc.c:1832
+#: g10/mainproc.c:1881
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "podpis %s, hashovac� algoritmus %s\n"
 
-#: g10/mainproc.c:1833
+#: g10/mainproc.c:1882
 msgid "binary"
 msgstr "bin�rn� form�t"
 
-#: g10/mainproc.c:1834
+#: g10/mainproc.c:1883
 msgid "textmode"
 msgstr "textov� form�t"
 
-#: g10/mainproc.c:1834 g10/trustdb.c:536
+#: g10/mainproc.c:1883 g10/trustdb.c:536
 msgid "unknown"
 msgstr "nezn�m� form�t"
 
-#: g10/mainproc.c:1854
+#: g10/mainproc.c:1903
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nemohu ov��it podpis: %s\n"
 
-#: g10/mainproc.c:1922 g10/mainproc.c:1938 g10/mainproc.c:2024
+#: g10/mainproc.c:1972 g10/mainproc.c:1988 g10/mainproc.c:2074
 msgid "not a detached signature\n"
 msgstr "toto nen� podpis odd�len� od dokumentu\n"
 
-#: g10/mainproc.c:1965
+#: g10/mainproc.c:2015
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "VAROV�N�: detekov�no v�ce podpis�. Kontrolov�n bude pouze prvn�.\n"
 
-#: g10/mainproc.c:1973
+#: g10/mainproc.c:2023
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "samostatn� podpis t��dy 0x%02x\n"
 
-#: g10/mainproc.c:2030
+#: g10/mainproc.c:2080
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis star�ho typu (PGP 2.x)\n"
 
-#: g10/mainproc.c:2040
+#: g10/mainproc.c:2090
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "nalezen neplatn� ko�enov� paket v proc_tree()\n"
 
@@ -5171,23 +5178,23 @@ msgstr ""
 msgid "error creating `%s': %s\n"
 msgstr "chyba p�i vytv��en� `%s': %s\n"
 
-#: g10/plaintext.c:447
+#: g10/plaintext.c:453
 msgid "Detached signature.\n"
 msgstr "Podpis odd�len� od dokumentu.\n"
 
-#: g10/plaintext.c:453
+#: g10/plaintext.c:459
 msgid "Please enter name of data file: "
 msgstr "Pros�m, vlo�te n�zev datov�ho souboru: "
 
-#: g10/plaintext.c:485
+#: g10/plaintext.c:491
 msgid "reading stdin ...\n"
 msgstr "�tu standardn� vstup ...\n"
 
-#: g10/plaintext.c:519
+#: g10/plaintext.c:525
 msgid "no signed data\n"
 msgstr "chyb� podepsan� data\n"
 
-#: g10/plaintext.c:533
+#: g10/plaintext.c:539
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "nemohu otev��t podepsan� data '%s'\n"
diff --git a/po/da.po b/po/da.po
index 074acb6d0..5fb1cd15b 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.0h\n"
 "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2006-02-14 15:28+0100\n"
+"POT-Creation-Date: 2006-03-07 11:29+0100\n"
 "PO-Revision-Date: 2003-12-03 16:11+0100\n"
 "Last-Translator: Birger Langkjer <birger.langkjer@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -42,9 +42,9 @@ msgstr "skriver hemmeligt certifikat til '%s'\n"
 
 #: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:992 g10/gpg.c:3360 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:997 g10/gpg.c:3391 g10/import.c:193 g10/keygen.c:2274
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:476 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
+#: g10/plaintext.c:482 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
 #: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
@@ -78,7 +78,7 @@ msgstr "kan ikke 
 msgid "note: random_seed file not updated\n"
 msgstr ""
 
-#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:991 g10/keygen.c:2753
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2753
 #: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
 #: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
 #, fuzzy, c-format
@@ -692,51 +692,51 @@ msgstr "skriver hemmeligt certifikat til '%s'\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr ""
 
-#: g10/cardglue.c:435
+#: g10/cardglue.c:434
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:572
+#: g10/cardglue.c:573
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:580
+#: g10/cardglue.c:582
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:915
+#: g10/cardglue.c:917
 #, fuzzy
 msgid "Enter New Admin PIN: "
 msgstr "Indtast bruger-id: "
 
-#: g10/cardglue.c:916
+#: g10/cardglue.c:918
 #, fuzzy
 msgid "Enter New PIN: "
 msgstr "Indtast bruger-id: "
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:919
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:920
 #, fuzzy
 msgid "Enter PIN: "
 msgstr "Indtast bruger-id: "
 
-#: g10/cardglue.c:935
+#: g10/cardglue.c:937
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Gentag kodes�tning: "
 
-#: g10/cardglue.c:950
+#: g10/cardglue.c:952
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "kodes�tningen blev ikke ordentlig gentaget; pr�v igen.\n"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3720 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3751 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -746,13 +746,13 @@ msgstr "kan ikke 
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1644
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1698
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "%s: bruger ikke fundet: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1658
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1712
 #: g10/revoke.c:234 g10/revoke.c:478
 #, fuzzy, c-format
 msgid "error reading keyblock: %s\n"
@@ -859,12 +859,12 @@ msgstr ""
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s krypteret for: %s\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:306
+#: g10/encr-data.c:67 g10/mainproc.c:293
 #, c-format
 msgid "%s encrypted data\n"
 msgstr ""
 
-#: g10/encr-data.c:69 g10/mainproc.c:310
+#: g10/encr-data.c:69 g10/mainproc.c:297
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr ""
@@ -999,7 +999,7 @@ msgstr ""
 msgid "WARNING: nothing exported\n"
 msgstr "ADVARSEL: intet blev eksporteret\n"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:373
 msgid ""
 "@Commands:\n"
 " "
@@ -1007,132 +1007,132 @@ msgstr ""
 "@Kommandoer:\n"
 " "
 
-#: g10/gpg.c:374
+#: g10/gpg.c:375
 msgid "|[file]|make a signature"
 msgstr "|[filer]|opret en signatur"
 
-#: g10/gpg.c:375
+#: g10/gpg.c:376
 msgid "|[file]|make a clear text signature"
 msgstr "|[filer]|opret rentekst signatur"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:377
 msgid "make a detached signature"
 msgstr "opret en separat signatur"
 
-#: g10/gpg.c:377
+#: g10/gpg.c:378
 msgid "encrypt data"
 msgstr "krypt�r data"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:380
 msgid "encryption only with symmetric cipher"
 msgstr "krypt�r kun med symmetriske cifre"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:382
 msgid "decrypt data (default)"
 msgstr "afkrypt�r data (standard)"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:384
 msgid "verify a signature"
 msgstr "godkend en signatur"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:386
 msgid "list keys"
 msgstr "vis n�gler"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "list keys and signatures"
 msgstr "vis n�gler og signaturer"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:389
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "tjek n�glesignaturer"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:390
 msgid "list keys and fingerprints"
 msgstr "vis n�gle og fingeraftryk"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:391
 msgid "list secret keys"
 msgstr "vis hemmelige n�gler"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:392
 msgid "generate a new key pair"
 msgstr "gener�r et nyt n�glepar"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:393
 #, fuzzy
 msgid "remove keys from the public keyring"
 msgstr "fjern n�gle fra den offentlige n�glering"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:395
 #, fuzzy
 msgid "remove keys from the secret keyring"
 msgstr "fjern n�gle fra den hemmelige n�glering"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:396
 msgid "sign a key"
 msgstr "sign�r en n�gle"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:397
 msgid "sign a key locally"
 msgstr "sign�r en n�gle lokalt"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:398
 msgid "sign or edit a key"
 msgstr "sign�r eller redig�r en n�gle"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:399
 msgid "generate a revocation certificate"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:401
 msgid "export keys"
 msgstr "eksport�r n�gler"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:402
 msgid "export keys to a key server"
 msgstr "eksport�r n�gler til en n�gletjener"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:403
 msgid "import keys from a key server"
 msgstr "import�r n�gler fra en n�gleserver"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:405
 #, fuzzy
 msgid "search for keys on a key server"
 msgstr "eksport�r n�gler til en n�gletjener"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:407
 #, fuzzy
 msgid "update all keys from a keyserver"
 msgstr "import�r n�gler fra en n�gleserver"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:411
 msgid "import/merge keys"
 msgstr "import�r/fusion�r n�gler"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:414
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:414
+#: g10/gpg.c:415
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:415
+#: g10/gpg.c:416
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:423
+#: g10/gpg.c:424
 msgid "update the trust database"
 msgstr "opdat�r tillidsdatabasen"
 
-#: g10/gpg.c:430
+#: g10/gpg.c:431
 msgid "|algo [files]|print message digests"
 msgstr "|algo [filer]|print meddelelsesresum�"
 
-#: g10/gpg.c:434 g10/gpgv.c:71
+#: g10/gpg.c:435 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1142,57 +1142,57 @@ msgstr ""
 "Indstillinger:\n"
 " "
 
-#: g10/gpg.c:436
+#: g10/gpg.c:437
 msgid "create ascii armored output"
 msgstr "opret ascii beskyttet uddata"
 
-#: g10/gpg.c:438
+#: g10/gpg.c:439
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|krypt�r for NAME"
 
-#: g10/gpg.c:449
+#: g10/gpg.c:450
 msgid "use this user-id to sign or decrypt"
 msgstr "brug denne bruger-id til at signere eller dekryptere"
 
-#: g10/gpg.c:450
+#: g10/gpg.c:451
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|s�t kompresningsniveau N (0 = sl�et fra)"
 
-#: g10/gpg.c:455
+#: g10/gpg.c:456
 msgid "use canonical text mode"
 msgstr "brug kanonisk tekstmodus"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:470
 msgid "use as output file"
 msgstr "brug som uddatafil"
 
-#: g10/gpg.c:471 g10/gpgv.c:73
+#: g10/gpg.c:472 g10/gpgv.c:73
 msgid "verbose"
 msgstr "meddelsom"
 
-#: g10/gpg.c:482
+#: g10/gpg.c:483
 msgid "do not make any changes"
 msgstr "lav ingen �ndringer"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:484
 msgid "prompt before overwriting"
 msgstr ""
 
-#: g10/gpg.c:524
+#: g10/gpg.c:525
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:553
+#: g10/gpg.c:554
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/gpg.c:556
+#: g10/gpg.c:557
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1212,16 +1212,16 @@ msgstr ""
 " --list-keys [navne]        vis n�gler\n"
 " --fingerprint [navne]      vis fingeraftryk\n"
 
-#: g10/gpg.c:746 g10/gpgv.c:98
+#: g10/gpg.c:751 g10/gpgv.c:98
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Rapport�r venligst fejl til <gnupg-bugs@gnu.org>.\n"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:768
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
 
 # Skal alt dette overs�ttes eller er det flagene?
-#: g10/gpg.c:766
+#: g10/gpg.c:771
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1231,7 +1231,7 @@ msgstr ""
 "sign, check, encrypt eller decrypt\n"
 "standard operation afh�nger af inddata\n"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:782
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1239,588 +1239,597 @@ msgstr ""
 "\n"
 "Underst�ttede algoritmer:\n"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:785
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/gpg.c:786 g10/keyedit.c:2266
+#: g10/gpg.c:791 g10/keyedit.c:2266
 msgid "Cipher: "
 msgstr ""
 
-#: g10/gpg.c:792
+#: g10/gpg.c:797
 msgid "Hash: "
 msgstr ""
 
-#: g10/gpg.c:798 g10/keyedit.c:2312
+#: g10/gpg.c:803 g10/keyedit.c:2312
 #, fuzzy
 msgid "Compression: "
 msgstr "Kommentar: "
 
-#: g10/gpg.c:881
+#: g10/gpg.c:886
 msgid "usage: gpg [options] "
 msgstr "brug: gpg [flag] "
 
-#: g10/gpg.c:1029
+#: g10/gpg.c:1034
 msgid "conflicting commands\n"
 msgstr "konfliktende kommandoer\n"
 
-#: g10/gpg.c:1047
+#: g10/gpg.c:1052
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1244
+#: g10/gpg.c:1249
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1247
+#: g10/gpg.c:1252
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1250
+#: g10/gpg.c:1255
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1256
+#: g10/gpg.c:1261
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1259
+#: g10/gpg.c:1264
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1262
+#: g10/gpg.c:1267
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1268
+#: g10/gpg.c:1273
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1271
+#: g10/gpg.c:1276
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1274
+#: g10/gpg.c:1279
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1280
+#: g10/gpg.c:1285
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1283
+#: g10/gpg.c:1288
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1286
+#: g10/gpg.c:1291
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1427
+#: g10/gpg.c:1432
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "ukendt standard modtager '%s'\n"
 
-#: g10/gpg.c:1521
+#: g10/gpg.c:1526
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1523
+#: g10/gpg.c:1528
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1525
+#: g10/gpg.c:1530
 msgid "show all notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1527
+#: g10/gpg.c:1532
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1536
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1538
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1540
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1542
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1544
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1546
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "skift imellem hemmelig og offentlig n�gle visning"
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1548
 msgid "show expiration dates during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1874
+#: g10/gpg.c:1879
 #, fuzzy, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTITS: ingen standard alternativfil '%s'\n"
 
-#: g10/gpg.c:1916
+#: g10/gpg.c:1921
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTITS: ingen standard alternativfil '%s'\n"
 
-#: g10/gpg.c:1920
+#: g10/gpg.c:1925
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "alternativfil`%s': %s\n"
 
-#: g10/gpg.c:1927
+#: g10/gpg.c:1932
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "l�ser indstillinger fra `%s'\n"
 
-#: g10/gpg.c:2142 g10/gpg.c:2716 g10/gpg.c:2735
+#: g10/gpg.c:2147 g10/gpg.c:2747 g10/gpg.c:2766
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTITS: %s er ikke til normal brug!\n"
 
-#: g10/gpg.c:2158
+#: g10/gpg.c:2163
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 
-#: g10/gpg.c:2312 g10/gpg.c:2324
+#: g10/gpg.c:2317 g10/gpg.c:2329
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2400
+#: g10/gpg.c:2405
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2422 g10/keyedit.c:3997
+#: g10/gpg.c:2429 g10/keyedit.c:3997
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/gpg.c:2428
+#: g10/gpg.c:2441
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2431
+#: g10/gpg.c:2444
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "ugyldig n�glering"
 
-#: g10/gpg.c:2438
+#: g10/gpg.c:2451
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2441
+#: g10/gpg.c:2454
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "ugyldig rustning"
 
-#: g10/gpg.c:2448
+#: g10/gpg.c:2461
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2464
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "ugyldig n�glering"
 
-#: g10/gpg.c:2458
+#: g10/gpg.c:2471
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2461
+#: g10/gpg.c:2474
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "ugyldig rustning"
 
-#: g10/gpg.c:2469
+#: g10/gpg.c:2482
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2471
+#: g10/gpg.c:2484
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2473
+#: g10/gpg.c:2486
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2475
+#: g10/gpg.c:2488
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2479
+#: g10/gpg.c:2492
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2481
+#: g10/gpg.c:2494
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/gpg.c:2483
+#: g10/gpg.c:2496
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2485
+#: g10/gpg.c:2498
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2505
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2495
+#: g10/gpg.c:2508
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "ugyldig n�glering"
 
-#: g10/gpg.c:2502
+#: g10/gpg.c:2515
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2705
+#: g10/gpg.c:2665
+#, fuzzy, c-format
+msgid "%s:%d: invalid auto-key-locate list\n"
+msgstr "ADVARSEL: '%s' er en tom fil\n"
+
+#: g10/gpg.c:2668
+msgid "invalid auto-key-locate list\n"
+msgstr ""
+
+#: g10/gpg.c:2736
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2740
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/gpg.c:2718
+#: g10/gpg.c:2749
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ikke tilladt med %s!\n"
 
-#: g10/gpg.c:2721
+#: g10/gpg.c:2752
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s er meningsl�s sammen med %s!\n"
 
-#: g10/gpg.c:2728
+#: g10/gpg.c:2759
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "RSA n�gle kan ikke bruges i denne version\n"
 
-#: g10/gpg.c:2743
+#: g10/gpg.c:2774
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/gpg.c:2757
+#: g10/gpg.c:2788
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:2763
+#: g10/gpg.c:2794
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:2769
+#: g10/gpg.c:2800
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/gpg.c:2782
+#: g10/gpg.c:2813
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/gpg.c:2849 g10/gpg.c:2873
+#: g10/gpg.c:2880 g10/gpg.c:2904
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
-#: g10/gpg.c:2855 g10/gpg.c:2879
+#: g10/gpg.c:2886 g10/gpg.c:2910
 msgid "selected digest algorithm is invalid\n"
 msgstr "valgte resum�algoritme er ugyldig\n"
 
-#: g10/gpg.c:2861
+#: g10/gpg.c:2892
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
-#: g10/gpg.c:2867
+#: g10/gpg.c:2898
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valgte resum�algoritme er ugyldig\n"
 
-#: g10/gpg.c:2882
+#: g10/gpg.c:2913
 msgid "completes-needed must be greater than 0\n"
 msgstr ""
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2915
 msgid "marginals-needed must be greater than 1\n"
 msgstr ""
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2917
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr ""
 
-#: g10/gpg.c:2888
+#: g10/gpg.c:2919
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "ugyldig S2K modus; skal v�re 0, 1 el. 3\n"
 
-#: g10/gpg.c:2890
+#: g10/gpg.c:2921
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "ugyldig S2K modus; skal v�re 0, 1 el. 3\n"
 
-#: g10/gpg.c:2893
+#: g10/gpg.c:2924
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTE: simpel S2K modus (0) frar�des p� det skarpeste\n"
 
-#: g10/gpg.c:2897
+#: g10/gpg.c:2928
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ugyldig S2K modus; skal v�re 0, 1 el. 3\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2935
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/gpg.c:2913
+#: g10/gpg.c:2944
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/gpg.c:2917
+#: g10/gpg.c:2948
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/gpg.c:2921
+#: g10/gpg.c:2952
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/gpg.c:2954
+#: g10/gpg.c:2985
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s er meningsl�s sammen med %s!\n"
 
-#: g10/gpg.c:3001
+#: g10/gpg.c:3032
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3006
+#: g10/gpg.c:3037
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3011
+#: g10/gpg.c:3042
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
 # er det klogt at overs�tte TrustDB?
-#: g10/gpg.c:3107
+#: g10/gpg.c:3138
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: g10/gpg.c:3118
+#: g10/gpg.c:3149
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3129
+#: g10/gpg.c:3160
 msgid "--store [filename]"
 msgstr "--store [filnavn (som gemmes)]"
 
-#: g10/gpg.c:3136
+#: g10/gpg.c:3167
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3169
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3148
+#: g10/gpg.c:3179
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnavn (som krypteres)]"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3192
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3194
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3166
+#: g10/gpg.c:3197
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3184
+#: g10/gpg.c:3215
 msgid "--sign [filename]"
 msgstr "--sign [filnavn (som signeres)]"
 
-#: g10/gpg.c:3197
+#: g10/gpg.c:3228
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3212
+#: g10/gpg.c:3243
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3214
+#: g10/gpg.c:3245
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3217
+#: g10/gpg.c:3248
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3237
+#: g10/gpg.c:3268
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3277
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnavn]"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3302
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnavn (som dekrypteres)]"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3310
 msgid "--sign-key user-id"
 msgstr "--sign-key bruger-id"
 
-#: g10/gpg.c:3283
+#: g10/gpg.c:3314
 msgid "--lsign-key user-id"
 msgstr "--lsign-key bruger-id"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3335
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key bruger-id [kommandoer]"
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3406
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [bruger-id] [n�glering]"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3443
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3445
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3447
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3427
+#: g10/gpg.c:3458
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "signering fejlede: %s\n"
 
-#: g10/gpg.c:3437
+#: g10/gpg.c:3468
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3488
+#: g10/gpg.c:3519
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3496
+#: g10/gpg.c:3527
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3583
+#: g10/gpg.c:3614
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ugyldig hash-algoritme `%s'\n"
 
-#: g10/gpg.c:3706
+#: g10/gpg.c:3737
 msgid "[filename]"
 msgstr "[filnavn]"
 
-#: g10/gpg.c:3710
+#: g10/gpg.c:3741
 msgid "Go ahead and type your message ...\n"
 msgstr "G� til sagen og skriv meddelelsen ...\n"
 
-#: g10/gpg.c:4000
+#: g10/gpg.c:4031
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
 msgstr ""
 
-#: g10/gpg.c:4008
+#: g10/gpg.c:4039
 #, fuzzy
 msgid "a user notation name must contain the '@' character\n"
 msgstr "en notationsv�rdi m� ikke bruge nogen kontroltegn\n"
 
-#: g10/gpg.c:4013
+#: g10/gpg.c:4044
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "en notationsv�rdi m� ikke bruge nogen kontroltegn\n"
 
-#: g10/gpg.c:4024
+#: g10/gpg.c:4055
 msgid "a notation value must not use any control characters\n"
 msgstr "en notationsv�rdi m� ikke bruge nogen kontroltegn\n"
 
-#: g10/gpg.c:4058
+#: g10/gpg.c:4089
 #, fuzzy
 msgid "the given certification policy URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/gpg.c:4060
+#: g10/gpg.c:4091
 #, fuzzy
 msgid "the given signature policy URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/gpg.c:4093
+#: g10/gpg.c:4124
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
@@ -1829,32 +1838,33 @@ msgstr "den givne politik-URL er ugyldig\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr ""
 
-#: g10/getkey.c:188 g10/getkey.c:2845
+#: g10/getkey.c:188 g10/getkey.c:2876
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[bruger ikke fundet]"
 
-#: g10/getkey.c:931 g10/getkey.c:953 g10/getkey.c:976
+#: g10/getkey.c:933 g10/getkey.c:950 g10/getkey.c:970 g10/getkey.c:986
+#: g10/getkey.c:1001
 #, c-format
 msgid "Automatically retrieved `%s' via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1769
+#: g10/getkey.c:1800
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 
-#: g10/getkey.c:2323
+#: g10/getkey.c:2354
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 
-#: g10/getkey.c:2554
+#: g10/getkey.c:2585
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "bruger sekund�r n�gle %08lX istedetfor prim�r n�gle %08lX\n"
 
-#: g10/getkey.c:2601
+#: g10/getkey.c:2632
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
@@ -3287,12 +3297,12 @@ msgid "(sensitive)"
 msgstr ""
 
 #: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
-#: g10/keylist.c:194 g10/keyserver.c:471
+#: g10/keylist.c:194 g10/keyserver.c:525
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:967
+#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:960
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "tilf�j n�gle"
@@ -3304,7 +3314,7 @@ msgstr "N
 
 #: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
 #: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:477 g10/mainproc.c:973
+#: g10/keylist.c:914 g10/keyserver.c:531 g10/mainproc.c:966
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "N�gle udl�ber d. %s\n"
@@ -3338,14 +3348,14 @@ msgid ""
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:481
-#: g10/mainproc.c:1734 g10/trustdb.c:1184 g10/trustdb.c:1704
+#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:535
+#: g10/mainproc.c:1783 g10/trustdb.c:1184 g10/trustdb.c:1704
 #, fuzzy
 msgid "revoked"
 msgstr "tilf�j n�gle"
 
-#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:485
-#: g10/mainproc.c:1736 g10/trustdb.c:537 g10/trustdb.c:1706
+#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:539
+#: g10/mainproc.c:1785 g10/trustdb.c:537 g10/trustdb.c:1706
 #, fuzzy
 msgid "expired"
 msgstr "udl�b"
@@ -4155,392 +4165,388 @@ msgstr ""
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:77
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:81
+#: g10/keyserver.c:79
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:83
+#: g10/keyserver.c:81
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:87
+#: g10/keyserver.c:85
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:89
-msgid "automatically retrieve keys from PKA records"
-msgstr ""
-
-#: g10/keyserver.c:91
-msgid "automatically retrieve keys from DNS"
-msgstr ""
-
-#: g10/keyserver.c:95
+#: g10/keyserver.c:87
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/keyserver.c:139
+#: g10/keyserver.c:89
+msgid "honor the PKA record set on a key when retrieving keys"
+msgstr ""
+
+#: g10/keyserver.c:154
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 
-#: g10/keyserver.c:483
+#: g10/keyserver.c:537
 #, fuzzy
 msgid "disabled"
 msgstr "sl�fra"
 
-#: g10/keyserver.c:684
+#: g10/keyserver.c:738
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:767 g10/keyserver.c:1368
+#: g10/keyserver.c:821 g10/keyserver.c:1422
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "ugyldig n�glering"
 
-#: g10/keyserver.c:865
+#: g10/keyserver.c:919
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "%s: bruger ikke fundet: %s\n"
 
-#: g10/keyserver.c:867
+#: g10/keyserver.c:921
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "%s: bruger ikke fundet: %s\n"
 
-#: g10/keyserver.c:1092
+#: g10/keyserver.c:1146
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/keyserver.c:1096
+#: g10/keyserver.c:1150
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/keyserver.c:1120
+#: g10/keyserver.c:1174
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "eksport�r n�gler til en n�gletjener"
 
-#: g10/keyserver.c:1123
+#: g10/keyserver.c:1177
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "l�ser indstillinger fra `%s'\n"
 
-#: g10/keyserver.c:1271
+#: g10/keyserver.c:1325
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1275
+#: g10/keyserver.c:1329
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/keyserver.c:1318
+#: g10/keyserver.c:1372
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "eksport�r n�gler til en n�gletjener"
 
-#: g10/keyserver.c:1321
+#: g10/keyserver.c:1375
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "l�ser indstillinger fra `%s'\n"
 
-#: g10/keyserver.c:1328 g10/keyserver.c:1424
+#: g10/keyserver.c:1382 g10/keyserver.c:1478
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "ugyldig n�glering"
 
-#: g10/keyserver.c:1376
+#: g10/keyserver.c:1430
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1439
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1446
+#: g10/keyserver.c:1500
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1452
+#: g10/keyserver.c:1506
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1464
+#: g10/keyserver.c:1518
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1469
+#: g10/keyserver.c:1523
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1477
+#: g10/keyserver.c:1531
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1484
+#: g10/keyserver.c:1538
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "generel fejl"
 
-#: g10/keyserver.c:1489
+#: g10/keyserver.c:1543
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "generel fejl"
 
-#: g10/keyserver.c:1498
+#: g10/keyserver.c:1552
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/keyserver.c:1523 g10/keyserver.c:1557
+#: g10/keyserver.c:1577 g10/keyserver.c:1611
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/keyserver.c:1814
+#: g10/keyserver.c:1868
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1836
+#: g10/keyserver.c:1890
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/keyserver.c:1838
+#: g10/keyserver.c:1892
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/keyserver.c:1903
+#: g10/keyserver.c:1957
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "kan ikke �bne %s: %s\n"
 
-#: g10/keyserver.c:1909
+#: g10/keyserver.c:1963
 #, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr ""
 
-#: g10/mainproc.c:253
+#: g10/mainproc.c:240
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr ""
 
-#: g10/mainproc.c:304
+#: g10/mainproc.c:291
 #, fuzzy, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s/%s krypteret for: %s\n"
 
-#: g10/mainproc.c:314
+#: g10/mainproc.c:301
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "ukendt cifferalgoritme "
 
-#: g10/mainproc.c:395
+#: g10/mainproc.c:382
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "Offentlig n�gle er sl�et fra.\n"
 
-#: g10/mainproc.c:450
+#: g10/mainproc.c:439
 msgid "public key encrypted data: good DEK\n"
 msgstr ""
 
-#: g10/mainproc.c:483
+#: g10/mainproc.c:472
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "Gentag kodes�tning: "
 
-#: g10/mainproc.c:487 g10/pkclist.c:219
+#: g10/mainproc.c:476 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "              alias \""
 
-#: g10/mainproc.c:491
+#: g10/mainproc.c:480
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "Gentag kodes�tning: "
 
-#: g10/mainproc.c:505
+#: g10/mainproc.c:494
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:519
+#: g10/mainproc.c:508
 #, fuzzy, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "Gentag kodes�tning: "
 
-#: g10/mainproc.c:521
+#: g10/mainproc.c:510
 #, fuzzy
 msgid "encrypted with 1 passphrase\n"
 msgstr "Gentag kodes�tning: "
 
-#: g10/mainproc.c:549 g10/mainproc.c:571
+#: g10/mainproc.c:541 g10/mainproc.c:563
 #, fuzzy, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "krypt�r data"
 
-#: g10/mainproc.c:557
+#: g10/mainproc.c:549
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 
-#: g10/mainproc.c:589
+#: g10/mainproc.c:581
 msgid "decryption okay\n"
 msgstr ""
 
-#: g10/mainproc.c:593
+#: g10/mainproc.c:585
 #, fuzzy
 msgid "WARNING: message was not integrity protected\n"
 msgstr "ADVARSEL: intet blev eksporteret\n"
 
-#: g10/mainproc.c:606
+#: g10/mainproc.c:598
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr ""
 
-#: g10/mainproc.c:612
+#: g10/mainproc.c:604
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr ""
 
-#: g10/mainproc.c:631
+#: g10/mainproc.c:623
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr ""
 
-#: g10/mainproc.c:633
+#: g10/mainproc.c:625
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr ""
 
-#: g10/mainproc.c:822
+#: g10/mainproc.c:815
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 
-#: g10/mainproc.c:1168
+#: g10/mainproc.c:1161
 #, fuzzy
 msgid "no signature found\n"
 msgstr "God signatur fra \""
 
-#: g10/mainproc.c:1418
+#: g10/mainproc.c:1419
 msgid "signature verification suppressed\n"
 msgstr ""
 
-#: g10/mainproc.c:1460 g10/mainproc.c:1470
+#: g10/mainproc.c:1519
 #, fuzzy
-msgid "can't handle these multiple signatures\n"
+msgid "can't handle this ambiguous signature data\n"
 msgstr "opret en separat signatur"
 
-#: g10/mainproc.c:1480
+#: g10/mainproc.c:1530
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/mainproc.c:1481
+#: g10/mainproc.c:1531
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "              alias \""
 
-#: g10/mainproc.c:1485
+#: g10/mainproc.c:1535
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr ""
 
-#: g10/mainproc.c:1505
+#: g10/mainproc.c:1555
 #, fuzzy
 msgid "Key available at: "
 msgstr "Ingen hj�lp tilg�ngelig"
 
-#: g10/mainproc.c:1639 g10/mainproc.c:1687
+#: g10/mainproc.c:1688 g10/mainproc.c:1736
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "D�RLIG signatur fra \""
 
-#: g10/mainproc.c:1641 g10/mainproc.c:1689
+#: g10/mainproc.c:1690 g10/mainproc.c:1738
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "God signatur fra \""
 
-#: g10/mainproc.c:1643 g10/mainproc.c:1691
+#: g10/mainproc.c:1692 g10/mainproc.c:1740
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "God signatur fra \""
 
-#: g10/mainproc.c:1695
+#: g10/mainproc.c:1744
 msgid "[uncertain]"
 msgstr ""
 
-#: g10/mainproc.c:1727
+#: g10/mainproc.c:1776
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1824
+#: g10/mainproc.c:1873
 #, fuzzy, c-format
 msgid "Signature expired %s\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/mainproc.c:1829
+#: g10/mainproc.c:1878
 #, fuzzy, c-format
 msgid "Signature expires %s\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/mainproc.c:1832
+#: g10/mainproc.c:1881
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s signatur fra: %s\n"
 
-#: g10/mainproc.c:1833
+#: g10/mainproc.c:1882
 msgid "binary"
 msgstr ""
 
-#: g10/mainproc.c:1834
+#: g10/mainproc.c:1883
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1834 g10/trustdb.c:536
+#: g10/mainproc.c:1883 g10/trustdb.c:536
 #, fuzzy
 msgid "unknown"
 msgstr "ukendt version"
 
-#: g10/mainproc.c:1854
+#: g10/mainproc.c:1903
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan ikke tjekke signatur: %s\n"
 
-#: g10/mainproc.c:1922 g10/mainproc.c:1938 g10/mainproc.c:2024
+#: g10/mainproc.c:1972 g10/mainproc.c:1988 g10/mainproc.c:2074
 #, fuzzy
 msgid "not a detached signature\n"
 msgstr "opret en separat signatur"
 
-#: g10/mainproc.c:1965
+#: g10/mainproc.c:2015
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 
-#: g10/mainproc.c:1973
+#: g10/mainproc.c:2023
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr ""
 
-#: g10/mainproc.c:2030
+#: g10/mainproc.c:2080
 msgid "old style (PGP 2.x) signature\n"
 msgstr "gammeldags (PGP 2.x) signatur\n"
 
-#: g10/mainproc.c:2040
+#: g10/mainproc.c:2090
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr ""
 
@@ -5094,23 +5100,23 @@ msgstr ""
 msgid "error creating `%s': %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: g10/plaintext.c:447
+#: g10/plaintext.c:453
 msgid "Detached signature.\n"
 msgstr ""
 
-#: g10/plaintext.c:453
+#: g10/plaintext.c:459
 msgid "Please enter name of data file: "
 msgstr ""
 
-#: g10/plaintext.c:485
+#: g10/plaintext.c:491
 msgid "reading stdin ...\n"
 msgstr "l�ser stdin ...\n"
 
-#: g10/plaintext.c:519
+#: g10/plaintext.c:525
 msgid "no signed data\n"
 msgstr ""
 
-#: g10/plaintext.c:533
+#: g10/plaintext.c:539
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr ""
diff --git a/po/de.po b/po/de.po
index 2b3dd53cb..778c53384 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.4.1\n"
 "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2006-02-14 15:28+0100\n"
+"POT-Creation-Date: 2006-03-07 11:29+0100\n"
 "PO-Revision-Date: 2005-10-06 11:59+0200\n"
 "Last-Translator: Walter Koch <koch@u32.de>\n"
 "Language-Team: German <de@li.org>\n"
@@ -41,9 +41,9 @@ msgstr "schreiben des geheimen Schl
 
 #: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:992 g10/gpg.c:3360 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:997 g10/gpg.c:3391 g10/import.c:193 g10/keygen.c:2274
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:476 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
+#: g10/plaintext.c:482 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
 #: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
@@ -78,7 +78,7 @@ msgstr "'%s' ist unlesbar: %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "Hinweis: 'random_seed'-Datei bleibt unver�ndert\n"
 
-#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:991 g10/keygen.c:2753
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2753
 #: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
 #: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
 #, c-format
@@ -666,13 +666,13 @@ msgstr "Admin-Befehle sind nicht erlaubt\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ung�ltiger Befehl (versuchen Sie's mal mit \"help\")\n"
 
-#: g10/cardglue.c:435
+#: g10/cardglue.c:434
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 "Legen Sie die Karte ein und dr�cken Sie 'Eingabe'; dr�cken Sie 'c' um "
 "abzubrechen: "
 
-#: g10/cardglue.c:572
+#: g10/cardglue.c:573
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
@@ -682,36 +682,36 @@ msgstr ""
 "Seriennummer ein:\n"
 "   %.*s\n"
 
-#: g10/cardglue.c:580
+#: g10/cardglue.c:582
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 "Dr�cken Sie 'Eingabe' wenn fertig; oder dr�cken Sie 'c' um abzubrechen: "
 
-#: g10/cardglue.c:915
+#: g10/cardglue.c:917
 msgid "Enter New Admin PIN: "
 msgstr "Geben Sie die neue Admin-PIN ein: "
 
-#: g10/cardglue.c:916
+#: g10/cardglue.c:918
 msgid "Enter New PIN: "
 msgstr "Geben Sie die neue PIN ein: "
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:919
 msgid "Enter Admin PIN: "
 msgstr "Geben Sie die Admin-PIN ein: "
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:920
 msgid "Enter PIN: "
 msgstr "Geben Sie die PIN ein: "
 
-#: g10/cardglue.c:935
+#: g10/cardglue.c:937
 msgid "Repeat this PIN: "
 msgstr "Geben Sie die PIN nochmal ein: "
 
-#: g10/cardglue.c:950
+#: g10/cardglue.c:952
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN wurde nicht richtig wiederholt; noch einmal versuchen"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3720 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3751 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -721,13 +721,13 @@ msgstr "'%s' kann nicht ge
 msgid "--output doesn't work for this command\n"
 msgstr "--output funktioniert nicht bei diesem Kommando\n"
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1644
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1698
 #: g10/revoke.c:228
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "Schl�ssel \"%s\" nicht gefunden: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1658
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1712
 #: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -848,12 +848,12 @@ msgstr "Die Benutzung von %s ist im %s-Modus nicht erlaubt.\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s verschl�sselt f�r: %s\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:306
+#: g10/encr-data.c:67 g10/mainproc.c:293
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s verschl�sselte Daten\n"
 
-#: g10/encr-data.c:69 g10/mainproc.c:310
+#: g10/encr-data.c:69 g10/mainproc.c:297
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "Mit unbekanntem Verfahren verschl�sselt %d\n"
@@ -997,7 +997,7 @@ msgstr "WARNUNG: Der geheime Schl
 msgid "WARNING: nothing exported\n"
 msgstr "WARNUNG: Nichts exportiert\n"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:373
 msgid ""
 "@Commands:\n"
 " "
@@ -1005,127 +1005,127 @@ msgstr ""
 "@Befehle:\n"
 " "
 
-#: g10/gpg.c:374
+#: g10/gpg.c:375
 msgid "|[file]|make a signature"
 msgstr "|[Datei]|Eine Unterschrift erzeugen"
 
-#: g10/gpg.c:375
+#: g10/gpg.c:376
 msgid "|[file]|make a clear text signature"
 msgstr "|[Datei]|Eine Klartextunterschrift erzeugen"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:377
 msgid "make a detached signature"
 msgstr "Eine abgetrennte Unterschrift erzeugen"
 
-#: g10/gpg.c:377
+#: g10/gpg.c:378
 msgid "encrypt data"
 msgstr "Daten verschl�sseln"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:380
 msgid "encryption only with symmetric cipher"
 msgstr "Daten symmetrisch verschl�sseln"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:382
 msgid "decrypt data (default)"
 msgstr "Daten entschl�sseln (Voreinstellung)"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:384
 msgid "verify a signature"
 msgstr "Signatur pr�fen"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:386
 msgid "list keys"
 msgstr "Liste der Schl�ssel"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "list keys and signatures"
 msgstr "Liste der Schl�ssel und ihrer Signaturen"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:389
 msgid "list and check key signatures"
 msgstr "Signaturen der Schl�ssel auflisten und pr�fen"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:390
 msgid "list keys and fingerprints"
 msgstr "Liste der Schl�ssel und ihrer \"Fingerabdr�cke\""
 
-#: g10/gpg.c:390
+#: g10/gpg.c:391
 msgid "list secret keys"
 msgstr "Liste der geheimen Schl�ssel"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:392
 msgid "generate a new key pair"
 msgstr "Ein neues Schl�sselpaar erzeugen"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:393
 msgid "remove keys from the public keyring"
 msgstr "Schl�ssel aus dem �ff. Schl�sselbund entfernen"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:395
 msgid "remove keys from the secret keyring"
 msgstr "Schl�ssel aus dem geh. Schl�sselbund entfernen"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:396
 msgid "sign a key"
 msgstr "Schl�ssel signieren"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:397
 msgid "sign a key locally"
 msgstr "Schl�ssel nur f�r diesen Rechner signieren"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:398
 msgid "sign or edit a key"
 msgstr "Unterschreiben oder bearbeiten eines Schl."
 
-#: g10/gpg.c:398
+#: g10/gpg.c:399
 msgid "generate a revocation certificate"
 msgstr "Ein Schl�sselwiderruf-Zertifikat erzeugen"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:401
 msgid "export keys"
 msgstr "Schl�ssel exportieren"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:402
 msgid "export keys to a key server"
 msgstr "Schl�ssel zu einem Schl�.server exportieren"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:403
 msgid "import keys from a key server"
 msgstr "Schl�ssel von einem Schl�.server importieren"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:405
 msgid "search for keys on a key server"
 msgstr "Schl�ssel auf einem Schl�.server suchen"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:407
 msgid "update all keys from a keyserver"
 msgstr "alle Schl�ssel per Schl�.server aktualisieren"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:411
 msgid "import/merge keys"
 msgstr "Schl�ssel importieren/kombinieren"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:414
 msgid "print the card status"
 msgstr "den Karten-Status ausgeben"
 
-#: g10/gpg.c:414
+#: g10/gpg.c:415
 msgid "change data on a card"
 msgstr "Daten auf einer Karte �ndern"
 
-#: g10/gpg.c:415
+#: g10/gpg.c:416
 msgid "change a card's PIN"
 msgstr "PIN einer Karte �ndern"
 
-#: g10/gpg.c:423
+#: g10/gpg.c:424
 msgid "update the trust database"
 msgstr "�ndern der \"Trust\"-Datenbank"
 
-#: g10/gpg.c:430
+#: g10/gpg.c:431
 msgid "|algo [files]|print message digests"
 msgstr "|algo [Dateien]|Message-Digests f�r die Dateien ausgeben"
 
-#: g10/gpg.c:434 g10/gpgv.c:71
+#: g10/gpg.c:435 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1135,51 +1135,51 @@ msgstr ""
 "Optionen:\n"
 " "
 
-#: g10/gpg.c:436
+#: g10/gpg.c:437
 msgid "create ascii armored output"
 msgstr "Ausgabe mit ASCII-H�lle versehen"
 
-#: g10/gpg.c:438
+#: g10/gpg.c:439
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|Verschl�sseln f�r NAME"
 
-#: g10/gpg.c:449
+#: g10/gpg.c:450
 msgid "use this user-id to sign or decrypt"
 msgstr "Mit dieser User-ID signieren"
 
-#: g10/gpg.c:450
+#: g10/gpg.c:451
 msgid "|N|set compress level N (0 disables)"
 msgstr "Kompressionsstufe auf N setzen (0=keine)"
 
-#: g10/gpg.c:455
+#: g10/gpg.c:456
 msgid "use canonical text mode"
 msgstr "Textmodus benutzen"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:470
 msgid "use as output file"
 msgstr "Als Ausgabedatei benutzen"
 
-#: g10/gpg.c:471 g10/gpgv.c:73
+#: g10/gpg.c:472 g10/gpgv.c:73
 msgid "verbose"
 msgstr "Detaillierte Informationen"
 
-#: g10/gpg.c:482
+#: g10/gpg.c:483
 msgid "do not make any changes"
 msgstr "Keine wirklichen �nderungen durchf�hren"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:484
 msgid "prompt before overwriting"
 msgstr "vor �berschreiben nachfragen"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:525
 msgid "use strict OpenPGP behavior"
 msgstr "OpenPGP-Verhalten strikt beachten"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "generate PGP 2.x compatible messages"
 msgstr "PGP 2.x-kompatibele Botschaften erzeugen"
 
-#: g10/gpg.c:553
+#: g10/gpg.c:554
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1188,7 +1188,7 @@ msgstr ""
 "(Auf der \"man\"-Seite ist eine vollst�ndige Liste aller Kommandos und "
 "Optionen)\n"
 
-#: g10/gpg.c:556
+#: g10/gpg.c:557
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1208,17 +1208,17 @@ msgstr ""
 " --list-keys [Namen]        Schl�ssel anzeigen\n"
 " --fingerprint [Namen]      \"Fingerabdr�cke\" anzeigen\n"
 
-#: g10/gpg.c:746 g10/gpgv.c:98
+#: g10/gpg.c:751 g10/gpgv.c:98
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr ""
 "Berichte �ber Programmfehler bitte in englisch an <gnupg-bugs@gnu.org>.\n"
 "Sinn- oder Schreibfehler in den deutschen Texten bitte an <de@li.org>.\n"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:768
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Aufruf: gpg [Optionen] [Dateien] (-h f�r Hilfe)"
 
-#: g10/gpg.c:766
+#: g10/gpg.c:771
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1228,7 +1228,7 @@ msgstr ""
 "Signieren, pr�fen, verschl�sseln, entschl�sseln.\n"
 "Die voreingestellte Operation ist abh�ngig von den Eingabedaten\n"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:782
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1236,73 +1236,73 @@ msgstr ""
 "\n"
 "Unterst�tzte Verfahren:\n"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:785
 msgid "Pubkey: "
 msgstr "�ff.Schl�ssel: "
 
-#: g10/gpg.c:786 g10/keyedit.c:2266
+#: g10/gpg.c:791 g10/keyedit.c:2266
 msgid "Cipher: "
 msgstr "Verschl�.: "
 
-#: g10/gpg.c:792
+#: g10/gpg.c:797
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:798 g10/keyedit.c:2312
+#: g10/gpg.c:803 g10/keyedit.c:2312
 msgid "Compression: "
 msgstr "Komprimierung: "
 
-#: g10/gpg.c:881
+#: g10/gpg.c:886
 msgid "usage: gpg [options] "
 msgstr "Aufruf: gpg [Optionen] "
 
-#: g10/gpg.c:1029
+#: g10/gpg.c:1034
 msgid "conflicting commands\n"
 msgstr "Widerspr�chliche Befehle\n"
 
-#: g10/gpg.c:1047
+#: g10/gpg.c:1052
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "Kein '='-Zeichen in der Gruppendefinition gefunden `%s'\n"
 
-#: g10/gpg.c:1244
+#: g10/gpg.c:1249
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "WARNUNG: Unsicheres Besitzverh�ltnis des Home-Verzeichnis `%s'\n"
 
-#: g10/gpg.c:1247
+#: g10/gpg.c:1252
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "WARNUNG: Unsicheres Besitzverh�ltnis der Konfigurationsdatei `%s'\n"
 
-#: g10/gpg.c:1250
+#: g10/gpg.c:1255
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "WARNUNG: Unsicheres Besitzverh�ltnis auf die Erweiterung `%s'\n"
 
-#: g10/gpg.c:1256
+#: g10/gpg.c:1261
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte des Home-Verzeichnis `%s'\n"
 
-#: g10/gpg.c:1259
+#: g10/gpg.c:1264
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte der Konfigurationsdatei `%s'\n"
 
-#: g10/gpg.c:1262
+#: g10/gpg.c:1267
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "WARNUNG: Unsichere Zugriffsrechte auf die Erweiterung `%s'\n"
 
-#: g10/gpg.c:1268
+#: g10/gpg.c:1273
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "WARNUNG: Unsicheres Besitzverh�ltnis des umgebenden Verzeichnisses f�r Home-"
 "Verzeichnis `%s'\n"
 
-#: g10/gpg.c:1271
+#: g10/gpg.c:1276
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1310,20 +1310,20 @@ msgstr ""
 "WARNUNG: Unsicheres Besitzverh�ltnis des umgebenden Verzeichnisses der "
 "Konfigurationsdatei `%s'\n"
 
-#: g10/gpg.c:1274
+#: g10/gpg.c:1279
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "WARNUNG: Unsicheres Besitzverh�ltnis des umgebenden Verzeichnisses `%s'\n"
 
-#: g10/gpg.c:1280
+#: g10/gpg.c:1285
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "WARNUNG: Unsichere Zugriffsrechte des umgebenden Verzeichnisses des Home-"
 "Verzeichnisses `%s'\n"
 
-#: g10/gpg.c:1283
+#: g10/gpg.c:1288
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1331,474 +1331,483 @@ msgstr ""
 "WARNUNG: Unsichere Zugriffsrechte des umgebenden Verzeichnisses der "
 "Konfigurationsdatei `%s'\n"
 
-#: g10/gpg.c:1286
+#: g10/gpg.c:1291
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "WARNUNG: Unsichere Zugriffsrechte des umgebenden Verzeichnisses auf "
 "Erweiterung `%s'\n"
 
-#: g10/gpg.c:1427
+#: g10/gpg.c:1432
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "Unbekanntes Konfigurationselement `%s'\n"
 
-#: g10/gpg.c:1521
+#: g10/gpg.c:1526
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1523
+#: g10/gpg.c:1528
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1525
+#: g10/gpg.c:1530
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Keine entsprechende Signatur im geheimen Schl�sselbund\n"
 
-#: g10/gpg.c:1527
+#: g10/gpg.c:1532
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1536
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1538
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "Die angegebene Unterschriften-Richtlinien-URL ist ung�ltig\n"
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1540
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1542
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1544
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1546
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "Anzeigen des Schl�sselbundes, in dem ein Schl�ssel drin ist"
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1548
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Keine entsprechende Signatur im geheimen Schl�sselbund\n"
 
-#: g10/gpg.c:1874
+#: g10/gpg.c:1879
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "Hinweis: Alte voreingestellte Optionendatei '%s' wurde ignoriert\n"
 
-#: g10/gpg.c:1916
+#: g10/gpg.c:1921
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n"
 
-#: g10/gpg.c:1920
+#: g10/gpg.c:1925
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "Optionendatei '%s': %s\n"
 
-#: g10/gpg.c:1927
+#: g10/gpg.c:1932
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Optionen werden aus '%s' gelesen\n"
 
-#: g10/gpg.c:2142 g10/gpg.c:2716 g10/gpg.c:2735
+#: g10/gpg.c:2147 g10/gpg.c:2747 g10/gpg.c:2766
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "Hinweis: %s ist nicht f�r den �blichen Gebrauch gedacht!\n"
 
-#: g10/gpg.c:2158
+#: g10/gpg.c:2163
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "Verschl�sselungserweiterung `%s' wurde wegen unsicherer Zugriffsrechte nicht "
 "geladen\n"
 
-#: g10/gpg.c:2312 g10/gpg.c:2324
+#: g10/gpg.c:2317 g10/gpg.c:2329
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' ist kein g�ltiger Zeichensatz\n"
 
-#: g10/gpg.c:2400
+#: g10/gpg.c:2405
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' ist kein g�ltiger Zeichensatz\n"
 
-#: g10/gpg.c:2422 g10/keyedit.c:3997
+#: g10/gpg.c:2429 g10/keyedit.c:3997
 msgid "could not parse keyserver URL\n"
 msgstr "Schl�sselserver-URL konnte nicht analysiert werden\n"
 
-#: g10/gpg.c:2428
+#: g10/gpg.c:2441
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ung�ltige Schl�sselserver-Option\n"
 
-#: g10/gpg.c:2431
+#: g10/gpg.c:2444
 msgid "invalid keyserver options\n"
 msgstr "Ung�ltige Schl�sselserver-Option\n"
 
-#: g10/gpg.c:2438
+#: g10/gpg.c:2451
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ung�ltige Import-Option\n"
 
-#: g10/gpg.c:2441
+#: g10/gpg.c:2454
 msgid "invalid import options\n"
 msgstr "Ung�ltige Import-Option\n"
 
-#: g10/gpg.c:2448
+#: g10/gpg.c:2461
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ung�ltige Export-Option.\n"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2464
 msgid "invalid export options\n"
 msgstr "Ung�ltige Export-Option\n"
 
-#: g10/gpg.c:2458
+#: g10/gpg.c:2471
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ung�ltige Listen-Option.\n"
 
-#: g10/gpg.c:2461
+#: g10/gpg.c:2474
 msgid "invalid list options\n"
 msgstr "Ung�ltige Listen-Option\n"
 
-#: g10/gpg.c:2469
+#: g10/gpg.c:2482
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2471
+#: g10/gpg.c:2484
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2473
+#: g10/gpg.c:2486
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' ist kein g�ltiger Zeichensatz\n"
 
-#: g10/gpg.c:2475
+#: g10/gpg.c:2488
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2479
+#: g10/gpg.c:2492
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2481
+#: g10/gpg.c:2494
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "Die angegebene Unterschriften-Richtlinien-URL ist ung�ltig\n"
 
-#: g10/gpg.c:2483
+#: g10/gpg.c:2496
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' ist kein g�ltiger Zeichensatz\n"
 
-#: g10/gpg.c:2485
+#: g10/gpg.c:2498
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2505
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ung�ltige �berpr�funs-Option.\n"
 
-#: g10/gpg.c:2495
+#: g10/gpg.c:2508
 msgid "invalid verify options\n"
 msgstr "Ung�ltige �berpr�fungs-Option\n"
 
-#: g10/gpg.c:2502
+#: g10/gpg.c:2515
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "Der Ausf�hrungspfad konnte nicht auf %s gesetzt werden.\n"
 
-#: g10/gpg.c:2705
+#: g10/gpg.c:2665
+#, fuzzy, c-format
+msgid "%s:%d: invalid auto-key-locate list\n"
+msgstr "%s:%d: ung�ltige �berpr�funs-Option.\n"
+
+#: g10/gpg.c:2668
+msgid "invalid auto-key-locate list\n"
+msgstr ""
+
+#: g10/gpg.c:2736
 msgid "WARNING: program may create a core file!\n"
 msgstr "WARNUNG: Programm k�nnte eine core-dump-Datei schreiben!\n"
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2740
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "WARNUNG: %s ersetzt %s\n"
 
-#: g10/gpg.c:2718
+#: g10/gpg.c:2749
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s kann nicht zusammen mit %s verwendet werden!\n"
 
-#: g10/gpg.c:2721
+#: g10/gpg.c:2752
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s zusammen mit %s ist nicht sinnvoll!\n"
 
-#: g10/gpg.c:2728
+#: g10/gpg.c:2759
 #, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "HINWEIS: %s ist in dieser Version nicht vorhanden\n"
 
-#: g10/gpg.c:2743
+#: g10/gpg.c:2774
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "schreiben des geheimen Schl�ssels nach '%s'\n"
 
-#: g10/gpg.c:2757
+#: g10/gpg.c:2788
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "Im --pgp2-Modus k�nnen Sie nur abgetrennte oder Klartextunterschriften "
 "machen\n"
 
-#: g10/gpg.c:2763
+#: g10/gpg.c:2794
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 "Im --pgp2-Modus k�nnen Sie nicht gleichzeitig unterschreiben und "
 "verschl�sseln\n"
 
-#: g10/gpg.c:2769
+#: g10/gpg.c:2800
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "Im --pgp2-Modus m�ssen Sie Dateien benutzen und k�nnen keine Pipes "
 "verwenden.\n"
 
-#: g10/gpg.c:2782
+#: g10/gpg.c:2813
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "Verschl�ssen einer Botschaft ben�tigt im --pgp2-Modus die IDEA-"
 "Verschl�sselung\n"
 
-#: g10/gpg.c:2849 g10/gpg.c:2873
+#: g10/gpg.c:2880 g10/gpg.c:2904
 msgid "selected cipher algorithm is invalid\n"
 msgstr "Das ausgew�hlte Verschl�sselungsverfahren ist ung�ltig\n"
 
-#: g10/gpg.c:2855 g10/gpg.c:2879
+#: g10/gpg.c:2886 g10/gpg.c:2910
 msgid "selected digest algorithm is invalid\n"
 msgstr "Das ausgew�hlte Hashverfahren ist ung�ltig\n"
 
-#: g10/gpg.c:2861
+#: g10/gpg.c:2892
 msgid "selected compression algorithm is invalid\n"
 msgstr "Das ausgew�hlte Komprimierungsverfahren ist ung�ltig\n"
 
-#: g10/gpg.c:2867
+#: g10/gpg.c:2898
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "Das ausgew�hlte Hashverfahren ist ung�ltig\n"
 
-#: g10/gpg.c:2882
+#: g10/gpg.c:2913
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed m�ssen gr��er als 0 sein\n"
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2915
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed m�ssen gr��er als 1 sein\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2917
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth mu� im Bereich 1 bis 255 liegen\n"
 
-#: g10/gpg.c:2888
+#: g10/gpg.c:2919
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "ung�ltiger \"default-cert-level\"; Wert mu� 0, 1, 2 oder 3 sein\n"
 
-#: g10/gpg.c:2890
+#: g10/gpg.c:2921
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "ung�ltiger \"min-cert-level\"; Wert mu� 0, 1, 2 oder 3 sein\n"
 
-#: g10/gpg.c:2893
+#: g10/gpg.c:2924
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n"
 
-#: g10/gpg.c:2897
+#: g10/gpg.c:2928
 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/gpg.c:2904
+#: g10/gpg.c:2935
 msgid "invalid default preferences\n"
 msgstr "ung�ltige Standard Voreinstellungen\n"
 
-#: g10/gpg.c:2913
+#: g10/gpg.c:2944
 msgid "invalid personal cipher preferences\n"
 msgstr "ung�ltige private Verschl�sselungsvoreinstellungen\n"
 
-#: g10/gpg.c:2917
+#: g10/gpg.c:2948
 msgid "invalid personal digest preferences\n"
 msgstr "ung�ltige private Hashvoreinstellungen\n"
 
-#: g10/gpg.c:2921
+#: g10/gpg.c:2952
 msgid "invalid personal compress preferences\n"
 msgstr "ung�ltige private Komprimierungsvoreinstellungen\n"
 
-#: g10/gpg.c:2954
+#: g10/gpg.c:2985
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s arbeitet noch nicht mit %s zusammen\n"
 
-#: g10/gpg.c:3001
+#: g10/gpg.c:3032
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 "Die Benutzung des Verschl�sselungsverfahren %s ist im %s-Modus nicht "
 "erlaubt.\n"
 
-#: g10/gpg.c:3006
+#: g10/gpg.c:3037
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "Die Benutzung der Hashmethode %s ist im %s-Modus nicht erlaubt.\n"
 
-#: g10/gpg.c:3011
+#: g10/gpg.c:3042
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "Die Benutzung des Komprimierverfahren %s ist im %s-Modus nicht erlaubt.\n"
 
-#: g10/gpg.c:3107
+#: g10/gpg.c:3138
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
 
-#: g10/gpg.c:3118
+#: g10/gpg.c:3149
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "WARNUNG: Empf�nger (-r) angegeben ohne Verwendung von Public-Key-Verfahren\n"
 
-#: g10/gpg.c:3129
+#: g10/gpg.c:3160
 msgid "--store [filename]"
 msgstr "--store [Dateiname]"
 
-#: g10/gpg.c:3136
+#: g10/gpg.c:3167
 msgid "--symmetric [filename]"
 msgstr "--symmetric [Dateiname]"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3169
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "Symmetrische Entschl�sselung von `%s' fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3148
+#: g10/gpg.c:3179
 msgid "--encrypt [filename]"
 msgstr "--encrypt [Dateiname]"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3192
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [Dateiname]"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3194
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 "--symmetric --encrypt kann nicht zusammen mit --s2k-mode 0 verwendet werden\n"
 
-#: g10/gpg.c:3166
+#: g10/gpg.c:3197
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "Die Benutzung von %s ist im %s-Modus nicht erlaubt.\n"
 
-#: g10/gpg.c:3184
+#: g10/gpg.c:3215
 msgid "--sign [filename]"
 msgstr "--sign [Dateiname]"
 
-#: g10/gpg.c:3197
+#: g10/gpg.c:3228
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [Dateiname]"
 
-#: g10/gpg.c:3212
+#: g10/gpg.c:3243
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [Dateiname]"
 
-#: g10/gpg.c:3214
+#: g10/gpg.c:3245
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 "--symmetric --sign --encrypt kann nicht zusammen mit --s2k-mode 0 verwendet "
 "werden\n"
 
-#: g10/gpg.c:3217
+#: g10/gpg.c:3248
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "Die Benutzung von %s ist im %s-Modus nicht erlaubt.\n"
 
-#: g10/gpg.c:3237
+#: g10/gpg.c:3268
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [Dateiname]"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3277
 msgid "--clearsign [filename]"
 msgstr "--clearsign [Dateiname]"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3302
 msgid "--decrypt [filename]"
 msgstr "--decrypt [Dateiname]"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3310
 msgid "--sign-key user-id"
 msgstr "--sign-key User-ID"
 
-#: g10/gpg.c:3283
+#: g10/gpg.c:3314
 msgid "--lsign-key user-id"
 msgstr "--lsign-key User-ID"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3335
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key User-ID [Befehle]"
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3406
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [User-ID] [Schl�sselbund]"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3443
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Senden an Schl�sselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3445
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Empfangen vom Schl�sselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3447
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Schl�sselexport fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3427
+#: g10/gpg.c:3458
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Suche auf dem Schl�sselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3437
+#: g10/gpg.c:3468
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Refresh vom Schl�sselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3488
+#: g10/gpg.c:3519
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "Entfernen der ASCII-H�lle ist fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3496
+#: g10/gpg.c:3527
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "Anbringen der ASCII-H�lle ist fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3583
+#: g10/gpg.c:3614
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "Ung�ltiges Hashverfahren '%s'\n"
 
-#: g10/gpg.c:3706
+#: g10/gpg.c:3737
 msgid "[filename]"
 msgstr "[Dateiname]"
 
-#: g10/gpg.c:3710
+#: g10/gpg.c:3741
 msgid "Go ahead and type your message ...\n"
 msgstr "Auf geht's - Botschaft eintippen ...\n"
 
-#: g10/gpg.c:4000
+#: g10/gpg.c:4031
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1806,28 +1815,28 @@ msgstr ""
 "Ein \"notation\"-Name darf nur Buchstaben, Zahlen, Punkte oder Unterstriche "
 "enthalten und mu� mit einem '=' enden\n"
 
-#: g10/gpg.c:4008
+#: g10/gpg.c:4039
 msgid "a user notation name must contain the '@' character\n"
 msgstr "Ein \"notation\"-Wert darf das '@'-Zeichen nicht verwenden\n"
 
-#: g10/gpg.c:4013
+#: g10/gpg.c:4044
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "Ein \"notation\"-Wert darf das '@'-Zeichen nicht verwenden\n"
 
-#: g10/gpg.c:4024
+#: g10/gpg.c:4055
 msgid "a notation value must not use any control characters\n"
 msgstr "Ein \"notation\"-Wert darf keine Kontrollzeichen verwenden\n"
 
-#: g10/gpg.c:4058
+#: g10/gpg.c:4089
 msgid "the given certification policy URL is invalid\n"
 msgstr "Die angegebene Zertifikat-Richtlinien-URL ist ung�ltig\n"
 
-#: g10/gpg.c:4060
+#: g10/gpg.c:4091
 msgid "the given signature policy URL is invalid\n"
 msgstr "Die angegebene Unterschriften-Richtlinien-URL ist ung�ltig\n"
 
-#: g10/gpg.c:4093
+#: g10/gpg.c:4124
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "Die angegebene Unterschriften-Richtlinien-URL ist ung�ltig\n"
@@ -1836,34 +1845,35 @@ msgstr "Die angegebene Unterschriften-Richtlinien-URL ist ung
 msgid "too many entries in pk cache - disabled\n"
 msgstr "zu viele Eintr�ge im pk-Cache - abgeschaltet\n"
 
-#: g10/getkey.c:188 g10/getkey.c:2845
+#: g10/getkey.c:188 g10/getkey.c:2876
 msgid "[User ID not found]"
 msgstr "[User-ID nicht gefunden]"
 
-#: g10/getkey.c:931 g10/getkey.c:953 g10/getkey.c:976
+#: g10/getkey.c:933 g10/getkey.c:950 g10/getkey.c:970 g10/getkey.c:986
+#: g10/getkey.c:1001
 #, c-format
 msgid "Automatically retrieved `%s' via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1769
+#: g10/getkey.c:1800
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Ung�ltiger Schl�ssel %s, g�ltig gemacht per --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2323
+#: g10/getkey.c:2354
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 "Kein privater Unterschl�ssel zum �ffentlichen Unterschl�ssel %s - "
 "�bergangen\n"
 
-#: g10/getkey.c:2554
+#: g10/getkey.c:2585
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "der Zweitschl�ssel %s wird anstelle des Hauptschl�ssels %s verwendet\n"
 
-#: g10/getkey.c:2601
+#: g10/getkey.c:2632
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr ""
@@ -3472,12 +3482,12 @@ msgid "(sensitive)"
 msgstr "(empfindlich)"
 
 #: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
-#: g10/keylist.c:194 g10/keyserver.c:471
+#: g10/keylist.c:194 g10/keyserver.c:525
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s kann nicht erzeugt werden: %s\n"
 
-#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:967
+#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:960
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[widerrufen]"
@@ -3489,7 +3499,7 @@ msgstr " [verf
 
 #: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
 #: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:477 g10/mainproc.c:973
+#: g10/keylist.c:914 g10/keyserver.c:531 g10/mainproc.c:966
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [verf�llt: %s]"
@@ -3525,14 +3535,14 @@ msgstr ""
 "Bitte beachten Sie, da� ohne einen Programmneustart die angezeigte\n"
 "Schl�sselg�ltigkeit nicht notwendigerweise korrekt ist.\n"
 
-#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:481
-#: g10/mainproc.c:1734 g10/trustdb.c:1184 g10/trustdb.c:1704
+#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:535
+#: g10/mainproc.c:1783 g10/trustdb.c:1184 g10/trustdb.c:1704
 #, fuzzy
 msgid "revoked"
 msgstr "[widerrufen]"
 
-#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:485
-#: g10/mainproc.c:1736 g10/trustdb.c:537 g10/trustdb.c:1706
+#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:539
+#: g10/mainproc.c:1785 g10/trustdb.c:537 g10/trustdb.c:1706
 #, fuzzy
 msgid "expired"
 msgstr "expire"
@@ -4378,399 +4388,396 @@ msgstr "%s: Schl
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:77
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:81
+#: g10/keyserver.c:79
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:83
+#: g10/keyserver.c:81
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:87
+#: g10/keyserver.c:85
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:89
-msgid "automatically retrieve keys from PKA records"
-msgstr ""
-
-#: g10/keyserver.c:91
-msgid "automatically retrieve keys from DNS"
-msgstr ""
-
-#: g10/keyserver.c:95
+#: g10/keyserver.c:87
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "Die angegebene Unterschriften-Richtlinien-URL ist ung�ltig\n"
 
-#: g10/keyserver.c:139
+#: g10/keyserver.c:89
+msgid "honor the PKA record set on a key when retrieving keys"
+msgstr ""
+
+#: g10/keyserver.c:154
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "WARNUNG: Optionen in `%s' sind w�hrend dieses Laufes noch nicht wirksam\n"
 
-#: g10/keyserver.c:483
+#: g10/keyserver.c:537
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:684
+#: g10/keyserver.c:738
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:767 g10/keyserver.c:1368
+#: g10/keyserver.c:821 g10/keyserver.c:1422
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "Ung�ltige export Option\n"
 
-#: g10/keyserver.c:865
+#: g10/keyserver.c:919
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "Schl�ssel `%s' nicht gefunden: %s\n"
 
-#: g10/keyserver.c:867
+#: g10/keyserver.c:921
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "Schl�ssel `%s' nicht gefunden: %s\n"
 
-#: g10/keyserver.c:1092
+#: g10/keyserver.c:1146
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "Schl�ssel %08lX wird von %s angefordert\n"
 
-#: g10/keyserver.c:1096
+#: g10/keyserver.c:1150
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "Schl�ssel %08lX wird von %s angefordert\n"
 
-#: g10/keyserver.c:1120
+#: g10/keyserver.c:1174
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "suche nach \"%s\" auf HKP-Server %s\n"
 
-#: g10/keyserver.c:1123
+#: g10/keyserver.c:1177
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "suche nach \"%s\" auf HKP-Server %s\n"
 
-#: g10/keyserver.c:1271
+#: g10/keyserver.c:1325
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "suche nach \"%s\" auf HKP-Server %s\n"
 
-#: g10/keyserver.c:1275
+#: g10/keyserver.c:1329
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "unterschrieben mit Ihrem Schl�ssel %08lX um %s\n"
 
-#: g10/keyserver.c:1318
+#: g10/keyserver.c:1372
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "suche nach \"%s\" auf HKP-Server %s\n"
 
-#: g10/keyserver.c:1321
+#: g10/keyserver.c:1375
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "suche nach \"%s\" auf HKP-Server %s\n"
 
-#: g10/keyserver.c:1328 g10/keyserver.c:1424
+#: g10/keyserver.c:1382 g10/keyserver.c:1478
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "Ung�ltige export Option\n"
 
-#: g10/keyserver.c:1376
+#: g10/keyserver.c:1430
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1439
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1446
+#: g10/keyserver.c:1500
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "Kein Schl�sselserver bekannt (Option --keyserver verwenden)\n"
 
-#: g10/keyserver.c:1452
+#: g10/keyserver.c:1506
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1464
+#: g10/keyserver.c:1518
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1469
+#: g10/keyserver.c:1523
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1477
+#: g10/keyserver.c:1531
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1484
+#: g10/keyserver.c:1538
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "Schl�sselserverfehler"
 
-#: g10/keyserver.c:1489
+#: g10/keyserver.c:1543
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "Schl�sselserverfehler"
 
-#: g10/keyserver.c:1498
+#: g10/keyserver.c:1552
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "Empfangen vom Schl�sselserver fehlgeschlagen: %s\n"
 
-#: g10/keyserver.c:1523 g10/keyserver.c:1557
+#: g10/keyserver.c:1577 g10/keyserver.c:1611
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s: Dies ist keine g�ltige Schl�ssel-ID\n"
 
-#: g10/keyserver.c:1814
+#: g10/keyserver.c:1868
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr ""
 "WARNUNG: die tempor�re Datei (%s) `%s' konnte nicht entfernt werden: %s\n"
 
-#: g10/keyserver.c:1836
+#: g10/keyserver.c:1890
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "Schl�ssel %08lX wird von %s angefordert\n"
 
-#: g10/keyserver.c:1838
+#: g10/keyserver.c:1892
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "Schl�ssel %08lX wird von %s angefordert\n"
 
-#: g10/keyserver.c:1903
+#: g10/keyserver.c:1957
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr ""
 "WARNUNG: die tempor�re Datei (%s) `%s' konnte nicht entfernt werden: %s\n"
 
-#: g10/keyserver.c:1909
+#: g10/keyserver.c:1963
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr ""
 "WARNUNG: die tempor�re Datei (%s) `%s' konnte nicht entfernt werden: %s\n"
 
-#: g10/mainproc.c:253
+#: g10/mainproc.c:240
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "Seltsame L�nge f�r einen verschl�sselten Sitzungsschl�ssel (%d)\n"
 
-#: g10/mainproc.c:304
+#: g10/mainproc.c:291
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s verschl�sselter Sitzungsschl�ssel\n"
 
-#: g10/mainproc.c:314
+#: g10/mainproc.c:301
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "Passphrase wurde mit unbekanntem Hashverfahren %d erstellt\n"
 
-#: g10/mainproc.c:395
+#: g10/mainproc.c:382
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "�ffentlicher Schl�ssel ist %08lX\n"
 
-#: g10/mainproc.c:450
+#: g10/mainproc.c:439
 msgid "public key encrypted data: good DEK\n"
 msgstr "Mit �ffentlichem Sch�ssel verschl�sselte Daten: Korrekte DEK\n"
 
-#: g10/mainproc.c:483
+#: g10/mainproc.c:472
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "verschl�sselt mit %u-Bit %s Schl�ssel, ID %08lX, erzeugt %s\n"
 
-#: g10/mainproc.c:487 g10/pkclist.c:219
+#: g10/mainproc.c:476 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                    alias \""
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen mu� "ID" rein :-(
 # [kw]
-#: g10/mainproc.c:491
+#: g10/mainproc.c:480
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "verschl�sselt mit %s Schl�ssel, ID %08lX\n"
 
-#: g10/mainproc.c:505
+#: g10/mainproc.c:494
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "Entschl�sselung mit �ffentlichem Schl�ssel fehlgeschlagen: %s\n"
 
-#: g10/mainproc.c:519
+#: g10/mainproc.c:508
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "Verschl�sselt mit %lu Passphrases\n"
 
-#: g10/mainproc.c:521
+#: g10/mainproc.c:510
 msgid "encrypted with 1 passphrase\n"
 msgstr "Verschl�sselt mit einer Passphrase\n"
 
-#: g10/mainproc.c:549 g10/mainproc.c:571
+#: g10/mainproc.c:541 g10/mainproc.c:563
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "vermutlich %s-verschl�sselte Daten\n"
 
-#: g10/mainproc.c:557
+#: g10/mainproc.c:549
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA-Verschl�sselung nicht verf�gbar; versucht wird stattdessen %s\n"
 
-#: g10/mainproc.c:589
+#: g10/mainproc.c:581
 msgid "decryption okay\n"
 msgstr "Entschl�sselung erfolgreich\n"
 
-#: g10/mainproc.c:593
+#: g10/mainproc.c:585
 msgid "WARNING: message was not integrity protected\n"
 msgstr ""
 "WARNUNG: Botschaft wurde nicht integrit�tsgesch�tzt (integrity protected)\n"
 
-#: g10/mainproc.c:606
+#: g10/mainproc.c:598
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "Warnung: Verschl�sselte Botschaft ist manipuliert worden!\n"
 
-#: g10/mainproc.c:612
+#: g10/mainproc.c:604
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "Entschl�sselung fehlgeschlagen: %s\n"
 
-#: g10/mainproc.c:631
+#: g10/mainproc.c:623
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr ""
 "Hinweis: Der Absender verlangte Vertraulichkeit(\"for-your-eyes-only\")\n"
 
-#: g10/mainproc.c:633
+#: g10/mainproc.c:625
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "Urspr�nglicher Dateiname='%.*s'\n"
 
-#: g10/mainproc.c:822
+#: g10/mainproc.c:815
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "Einzelner Widerruf - verwenden Sie \"gpg --import\" um ihn anzuwenden\n"
 
-#: g10/mainproc.c:1168
+#: g10/mainproc.c:1161
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Korrekte Unterschrift von \""
 
-#: g10/mainproc.c:1418
+#: g10/mainproc.c:1419
 msgid "signature verification suppressed\n"
 msgstr "Unterschriften-�berpr�fung unterdr�ckt\n"
 
-#: g10/mainproc.c:1460 g10/mainproc.c:1470
-msgid "can't handle these multiple signatures\n"
+#: g10/mainproc.c:1519
+#, fuzzy
+msgid "can't handle this ambiguous signature data\n"
 msgstr "diese Mehrfachunterschriften k�nnen nicht behandelt werden\n"
 
-#: g10/mainproc.c:1480
+#: g10/mainproc.c:1530
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Diese Unterschrift ist seit %s verfallen.\n"
 
-#: g10/mainproc.c:1481
+#: g10/mainproc.c:1531
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                    alias \""
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen mu� "ID" rein :-(
-#: g10/mainproc.c:1485
+#: g10/mainproc.c:1535
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Unterschrift vom %.*s, %s Schl�ssel ID %08lX\n"
 
-#: g10/mainproc.c:1505
+#: g10/mainproc.c:1555
 msgid "Key available at: "
 msgstr "Schl�ssel erh�ltlich bei: "
 
-#: g10/mainproc.c:1639 g10/mainproc.c:1687
+#: g10/mainproc.c:1688 g10/mainproc.c:1736
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "FALSCHE Unterschrift von \""
 
-#: g10/mainproc.c:1641 g10/mainproc.c:1689
+#: g10/mainproc.c:1690 g10/mainproc.c:1738
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Verfallene Unterschrift von \""
 
-#: g10/mainproc.c:1643 g10/mainproc.c:1691
+#: g10/mainproc.c:1692 g10/mainproc.c:1740
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Korrekte Unterschrift von \""
 
-#: g10/mainproc.c:1695
+#: g10/mainproc.c:1744
 msgid "[uncertain]"
 msgstr "[ungewi�]  "
 
-#: g10/mainproc.c:1727
+#: g10/mainproc.c:1776
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                    alias \""
 
-#: g10/mainproc.c:1824
+#: g10/mainproc.c:1873
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Diese Unterschrift ist seit %s verfallen.\n"
 
-#: g10/mainproc.c:1829
+#: g10/mainproc.c:1878
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Diese Unterschrift verf�llt am %s.\n"
 
-#: g10/mainproc.c:1832
+#: g10/mainproc.c:1881
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s Unterschrift, Hashmethode \"%s\"\n"
 
-#: g10/mainproc.c:1833
+#: g10/mainproc.c:1882
 msgid "binary"
 msgstr "Bin�re"
 
-#: g10/mainproc.c:1834
+#: g10/mainproc.c:1883
 msgid "textmode"
 msgstr "Textmodus"
 
-#: g10/mainproc.c:1834 g10/trustdb.c:536
+#: g10/mainproc.c:1883 g10/trustdb.c:536
 msgid "unknown"
 msgstr "unbekannt"
 
-#: g10/mainproc.c:1854
+#: g10/mainproc.c:1903
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Unterschrift kann nicht gepr�ft werden: %s\n"
 
-#: g10/mainproc.c:1922 g10/mainproc.c:1938 g10/mainproc.c:2024
+#: g10/mainproc.c:1972 g10/mainproc.c:1988 g10/mainproc.c:2074
 msgid "not a detached signature\n"
 msgstr "keine abgetrennte Unterschrift\n"
 
-#: g10/mainproc.c:1965
+#: g10/mainproc.c:2015
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "WARNUNG: Mehrfache Signaturen erkannt.  Es wird nur die erste gepr�ft.\n"
 
-#: g10/mainproc.c:1973
+#: g10/mainproc.c:2023
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "Einzelne Unterschrift der Klasse 0x%02x\n"
 
-#: g10/mainproc.c:2030
+#: g10/mainproc.c:2080
 msgid "old style (PGP 2.x) signature\n"
 msgstr "Unterschrift nach alter (PGP 2.x) Art\n"
 
-#: g10/mainproc.c:2040
+#: g10/mainproc.c:2090
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "ung�ltiges root-Paket in proc_tree() entdeckt\n"
 
@@ -5349,23 +5356,23 @@ msgstr ""
 msgid "error creating `%s': %s\n"
 msgstr "Fehler beim Erstellen von `%s': %s\n"
 
-#: g10/plaintext.c:447
+#: g10/plaintext.c:453
 msgid "Detached signature.\n"
 msgstr "Abgetrennte Beglaubigungen.\n"
 
-#: g10/plaintext.c:453
+#: g10/plaintext.c:459
 msgid "Please enter name of data file: "
 msgstr "Bitte geben Sie den Namen der Datendatei ein: "
 
-#: g10/plaintext.c:485
+#: g10/plaintext.c:491
 msgid "reading stdin ...\n"
 msgstr "lese stdin ...\n"
 
-#: g10/plaintext.c:519
+#: g10/plaintext.c:525
 msgid "no signed data\n"
 msgstr "keine unterschriebene Daten\n"
 
-#: g10/plaintext.c:533
+#: g10/plaintext.c:539
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "kann signierte Datei '%s' nicht �ffnen.\n"
diff --git a/po/el.po b/po/el.po
index 394642581..ec261f537 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.1.92\n"
 "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2006-02-14 15:28+0100\n"
+"POT-Creation-Date: 2006-03-07 11:29+0100\n"
 "PO-Revision-Date: 2003-06-27 12:00+0200\n"
 "Last-Translator: Dokianakis Theofanis <madf@hellug.gr>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -40,9 +40,9 @@ msgstr "
 
 #: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:992 g10/gpg.c:3360 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:997 g10/gpg.c:3391 g10/import.c:193 g10/keygen.c:2274
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:476 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
+#: g10/plaintext.c:482 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
 #: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
@@ -78,7 +78,7 @@ msgstr "
 msgid "note: random_seed file not updated\n"
 msgstr "��������: ��� ���� ��������� �� ������ random_seed\n"
 
-#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:991 g10/keygen.c:2753
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2753
 #: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
 #: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
 #, c-format
@@ -694,48 +694,48 @@ msgstr "
 msgid "Invalid command  (try \"help\")\n"
 msgstr "�� ������ ������  (��������� \"help\")\n"
 
-#: g10/cardglue.c:435
+#: g10/cardglue.c:434
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:572
+#: g10/cardglue.c:573
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:580
+#: g10/cardglue.c:582
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:915
+#: g10/cardglue.c:917
 msgid "Enter New Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:916
+#: g10/cardglue.c:918
 msgid "Enter New PIN: "
 msgstr ""
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:919
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:920
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/cardglue.c:935
+#: g10/cardglue.c:937
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "����������� �� ����� ������: "
 
-#: g10/cardglue.c:950
+#: g10/cardglue.c:952
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "� ����� ������ ��� ������������ �����. ��������� ����"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3720 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3751 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -745,13 +745,13 @@ msgstr "
 msgid "--output doesn't work for this command\n"
 msgstr "--output ��� ���������� ��� ���� ��� ������\n"
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1644
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1698
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "�� ������ '%s' �� �������: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1658
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1712
 #: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -871,12 +871,12 @@ msgstr "
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s ��������������� ���: \"%s\"\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:306
+#: g10/encr-data.c:67 g10/mainproc.c:293
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s ��������������� ��������\n"
 
-#: g10/encr-data.c:69 g10/mainproc.c:310
+#: g10/encr-data.c:69 g10/mainproc.c:297
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "��������������� �� ������� ��������� %d\n"
@@ -1022,7 +1022,7 @@ msgstr "
 msgid "WARNING: nothing exported\n"
 msgstr "�������������: ��� ����� ������ �������\n"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:373
 msgid ""
 "@Commands:\n"
 " "
@@ -1030,128 +1030,128 @@ msgstr ""
 "@�������:\n"
 " "
 
-#: g10/gpg.c:374
+#: g10/gpg.c:375
 msgid "|[file]|make a signature"
 msgstr "|[������]|���������� ���� ���������"
 
-#: g10/gpg.c:375
+#: g10/gpg.c:376
 msgid "|[file]|make a clear text signature"
 msgstr "|[������]|���������� ���� �� ���������������� ���������"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:377
 msgid "make a detached signature"
 msgstr "���������� ���� �� ������������� ���������"
 
-#: g10/gpg.c:377
+#: g10/gpg.c:378
 msgid "encrypt data"
 msgstr "������������� ���������"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:380
 msgid "encryption only with symmetric cipher"
 msgstr "������������� �� ����� ���� ����������� ����������"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:382
 msgid "decrypt data (default)"
 msgstr "���������������� ��������� (��������������)"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:384
 msgid "verify a signature"
 msgstr "���������� ���� ���������"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:386
 msgid "list keys"
 msgstr "���������� ��� ������ ��������"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "list keys and signatures"
 msgstr "���������� ��� ������ �������� ��� ���������"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:389
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "������� ��������� ��������"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:390
 msgid "list keys and fingerprints"
 msgstr "���������� ��� ������ �������� ��� ������������ (fingerprints)"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:391
 msgid "list secret keys"
 msgstr "���������� ��� ������ �������� ��������"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:392
 msgid "generate a new key pair"
 msgstr "���������� ���� ���� ������� ��������"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:393
 msgid "remove keys from the public keyring"
 msgstr "�������� ��� �������� ��� �� ������� ����������"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:395
 msgid "remove keys from the secret keyring"
 msgstr "�������� ��� �������� ��� �� ������� ����������"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:396
 msgid "sign a key"
 msgstr "�������� ���� ��������"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:397
 msgid "sign a key locally"
 msgstr "�������� ���� �������� ������"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:398
 msgid "sign or edit a key"
 msgstr "�������� � ����������� ���� ��������"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:399
 msgid "generate a revocation certificate"
 msgstr "���������� ���� �������������� ���������"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:401
 msgid "export keys"
 msgstr "������� ��������"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:402
 msgid "export keys to a key server"
 msgstr "������� �������� �� ��� ���������� ��������"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:403
 msgid "import keys from a key server"
 msgstr "�������� �������� ��� ��� ���������� ��������"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:405
 msgid "search for keys on a key server"
 msgstr "��������� �������� �� ��� ���������� ��������"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:407
 msgid "update all keys from a keyserver"
 msgstr "�������� ���� ��� �������� ��� ��� ���������� ��������"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:411
 msgid "import/merge keys"
 msgstr "��������/���������� ��������"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:414
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:414
+#: g10/gpg.c:415
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:415
+#: g10/gpg.c:416
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:423
+#: g10/gpg.c:424
 msgid "update the trust database"
 msgstr "�������� ��� ����� ��������� ������������"
 
-#: g10/gpg.c:430
+#: g10/gpg.c:431
 msgid "|algo [files]|print message digests"
 msgstr "|����� [������]| ���������� ���������� ��� ���������"
 
-#: g10/gpg.c:434 g10/gpgv.c:71
+#: g10/gpg.c:435 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1161,51 +1161,51 @@ msgstr ""
 "��������:\n"
 " "
 
-#: g10/gpg.c:436
+#: g10/gpg.c:437
 msgid "create ascii armored output"
 msgstr "���������� ascii ������������ ������"
 
-#: g10/gpg.c:438
+#: g10/gpg.c:439
 msgid "|NAME|encrypt for NAME"
 msgstr "|�����|������������� ��� �����"
 
-#: g10/gpg.c:449
+#: g10/gpg.c:450
 msgid "use this user-id to sign or decrypt"
 msgstr "����� ����� ��� ���������� (user id) ��� �������� � ����������������"
 
-#: g10/gpg.c:450
+#: g10/gpg.c:451
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|���������� �������� ��������� N (0 �������������)"
 
-#: g10/gpg.c:455
+#: g10/gpg.c:456
 msgid "use canonical text mode"
 msgstr "����� ��������� ���������� ��������"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:470
 msgid "use as output file"
 msgstr "����� �� ������� ������"
 
-#: g10/gpg.c:471 g10/gpgv.c:73
+#: g10/gpg.c:472 g10/gpgv.c:73
 msgid "verbose"
 msgstr "���������"
 
-#: g10/gpg.c:482
+#: g10/gpg.c:483
 msgid "do not make any changes"
 msgstr "�� �� ����� ������ ������"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:484
 msgid "prompt before overwriting"
 msgstr "������� ���� ��� ���������"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:525
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:553
+#: g10/gpg.c:554
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1213,7 +1213,7 @@ msgstr ""
 "@\n"
 "(����� �� ������ man ��� ��� ����� ����� ������� ��� ��������)\n"
 
-#: g10/gpg.c:556
+#: g10/gpg.c:557
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1233,15 +1233,15 @@ msgstr ""
 " --list-keys [�������]        ���������� ��������\n"
 " --fingerprint [�������]      ���������� ������������ (fingerprints)\n"
 
-#: g10/gpg.c:746 g10/gpgv.c:98
+#: g10/gpg.c:751 g10/gpgv.c:98
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "��������� �� ���������� ��� <gnupg-bugs@gnu.org>\n"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:768
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "�����: gpg [��������] [������] (-h ��� �������)"
 
-#: g10/gpg.c:766
+#: g10/gpg.c:771
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1251,7 +1251,7 @@ msgstr ""
 "��������, �������, ������������� � ����������������\n"
 "� �������������� ���������� ��������� ��� �� �������� �������\n"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:782
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1259,564 +1259,573 @@ msgstr ""
 "\n"
 "��������������� ����������:\n"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:785
 msgid "Pubkey: "
 msgstr "�����������:"
 
-#: g10/gpg.c:786 g10/keyedit.c:2266
+#: g10/gpg.c:791 g10/keyedit.c:2266
 msgid "Cipher: "
 msgstr "���������������: "
 
-#: g10/gpg.c:792
+#: g10/gpg.c:797
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:798 g10/keyedit.c:2312
+#: g10/gpg.c:803 g10/keyedit.c:2312
 msgid "Compression: "
 msgstr "��������: "
 
-#: g10/gpg.c:881
+#: g10/gpg.c:886
 msgid "usage: gpg [options] "
 msgstr "�����: gpg [��������] "
 
-#: g10/gpg.c:1029
+#: g10/gpg.c:1034
 msgid "conflicting commands\n"
 msgstr "������������� �������\n"
 
-#: g10/gpg.c:1047
+#: g10/gpg.c:1052
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "��� ������� �� ������� = ���� ������ ��� ������ \"%s\"\n"
 
-#: g10/gpg.c:1244
+#: g10/gpg.c:1249
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1247
+#: g10/gpg.c:1252
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1250
+#: g10/gpg.c:1255
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "�������������: �� ������� ���������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1256
+#: g10/gpg.c:1261
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1259
+#: g10/gpg.c:1264
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1262
+#: g10/gpg.c:1267
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "�������������: �� �������� ������ ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1268
+#: g10/gpg.c:1273
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1271
+#: g10/gpg.c:1276
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr ""
 "�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1274
+#: g10/gpg.c:1279
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "�������������: �� ������� ��������������������� ������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1280
+#: g10/gpg.c:1285
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1283
+#: g10/gpg.c:1288
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1286
+#: g10/gpg.c:1291
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "�������������: �� �������� ������ ����������� ������� ��� %s \"%s\"\n"
 
-#: g10/gpg.c:1427
+#: g10/gpg.c:1432
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "������� ����������� ��������� \"%s\"\n"
 
-#: g10/gpg.c:1521
+#: g10/gpg.c:1526
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1523
+#: g10/gpg.c:1528
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1525
+#: g10/gpg.c:1530
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
 
-#: g10/gpg.c:1527
+#: g10/gpg.c:1532
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1536
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1538
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1540
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1542
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1544
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1546
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "���������� ��� ����������� ���� ����� ��������� �� ������"
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1548
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
 
-#: g10/gpg.c:1874
+#: g10/gpg.c:1879
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "��������: ��������� �� ����� ������ ��������������� �������� `%s'\n"
 
-#: g10/gpg.c:1916
+#: g10/gpg.c:1921
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "��������: �� �������������� ������ �������� `%s'\n"
 
-#: g10/gpg.c:1920
+#: g10/gpg.c:1925
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "������ �������� `%s': %s\n"
 
-#: g10/gpg.c:1927
+#: g10/gpg.c:1932
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "�������� �������� ��� `%s'\n"
 
-#: g10/gpg.c:2142 g10/gpg.c:2716 g10/gpg.c:2735
+#: g10/gpg.c:2147 g10/gpg.c:2747 g10/gpg.c:2766
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "��������: �� %s ��� ����� ��� �������� �����!\n"
 
-#: g10/gpg.c:2158
+#: g10/gpg.c:2163
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "� �������� ��� ��������������� \"%s\" ��� ��������� ������ ��������\n"
 "���������� ������\n"
 
-#: g10/gpg.c:2312 g10/gpg.c:2324
+#: g10/gpg.c:2317 g10/gpg.c:2329
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2400
+#: g10/gpg.c:2405
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2422 g10/keyedit.c:3997
+#: g10/gpg.c:2429 g10/keyedit.c:3997
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "�������� ������������ ��� URI ��� ��������� ��������\n"
 
-#: g10/gpg.c:2428
+#: g10/gpg.c:2441
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/gpg.c:2431
+#: g10/gpg.c:2444
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/gpg.c:2438
+#: g10/gpg.c:2451
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: �� ������� �������� ���������\n"
 
-#: g10/gpg.c:2441
+#: g10/gpg.c:2454
 msgid "invalid import options\n"
 msgstr "�� ������� �������� ���������\n"
 
-#: g10/gpg.c:2448
+#: g10/gpg.c:2461
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2464
 msgid "invalid export options\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/gpg.c:2458
+#: g10/gpg.c:2471
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: �� ������� �������� ���������\n"
 
-#: g10/gpg.c:2461
+#: g10/gpg.c:2474
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "�� ������� �������� ���������\n"
 
-#: g10/gpg.c:2469
+#: g10/gpg.c:2482
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2471
+#: g10/gpg.c:2484
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2473
+#: g10/gpg.c:2486
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2475
+#: g10/gpg.c:2488
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2479
+#: g10/gpg.c:2492
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2481
+#: g10/gpg.c:2494
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
 
-#: g10/gpg.c:2483
+#: g10/gpg.c:2496
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2485
+#: g10/gpg.c:2498
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2505
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/gpg.c:2495
+#: g10/gpg.c:2508
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/gpg.c:2502
+#: g10/gpg.c:2515
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "�������� ������� ��� exec-path �� %s\n"
 
-#: g10/gpg.c:2705
+#: g10/gpg.c:2665
+#, fuzzy, c-format
+msgid "%s:%d: invalid auto-key-locate list\n"
+msgstr "%s:%d: �� ������� �������� ��������\n"
+
+#: g10/gpg.c:2668
+msgid "invalid auto-key-locate list\n"
+msgstr ""
+
+#: g10/gpg.c:2736
 msgid "WARNING: program may create a core file!\n"
 msgstr "�������������: �� ��������� ���� ������������ ������ core!\n"
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2740
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "�������������: �� %s ����������� �� %s\n"
 
-#: g10/gpg.c:2718
+#: g10/gpg.c:2749
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�� %s ��� ����������� �� �� %s!\n"
 
-#: g10/gpg.c:2721
+#: g10/gpg.c:2752
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�� %s ��� ���� ������ ������ ���� �� �� %s!\n"
 
-#: g10/gpg.c:2728
+#: g10/gpg.c:2759
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "� gpg-agent ��� ����� ���������� �� ���� �� ��������\n"
 
-#: g10/gpg.c:2743
+#: g10/gpg.c:2774
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/gpg.c:2757
+#: g10/gpg.c:2788
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "�������� �� ������ ����������� � ������� ��������� ���� �� --pgp2 ���������\n"
 
-#: g10/gpg.c:2763
+#: g10/gpg.c:2794
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 "��� �������� �� ���������� ��� �� �������������� ���������� �� --pgp2 "
 "���������\n"
 
-#: g10/gpg.c:2769
+#: g10/gpg.c:2800
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "���� ������ ������������ (��� ��� pipes) ���� ��� ��������� --pgp2.\n"
 
-#: g10/gpg.c:2782
+#: g10/gpg.c:2813
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "� ������������� ���� ��������� �� --pgp2 ��������� ������� ��� �����. IDEA\n"
 
-#: g10/gpg.c:2849 g10/gpg.c:2873
+#: g10/gpg.c:2880 g10/gpg.c:2904
 msgid "selected cipher algorithm is invalid\n"
 msgstr "� ����������� ���������� �������������� ��� ����� �������\n"
 
-#: g10/gpg.c:2855 g10/gpg.c:2879
+#: g10/gpg.c:2886 g10/gpg.c:2910
 msgid "selected digest algorithm is invalid\n"
 msgstr "� ����������� ���������� ��������� ��� ����� �������\n"
 
-#: g10/gpg.c:2861
+#: g10/gpg.c:2892
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "� ����������� ���������� �������������� ��� ����� �������\n"
 
-#: g10/gpg.c:2867
+#: g10/gpg.c:2898
 msgid "selected certification digest algorithm is invalid\n"
 msgstr ""
 "� ����������� ���������� ��������� ��� �����������\n"
 "��� ����� �������\n"
 
-#: g10/gpg.c:2882
+#: g10/gpg.c:2913
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ������ �� ����� ���������� ��� 0\n"
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2915
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ������ �� ����� ���������� ��� 1\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2917
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth ������ �� ����� ������ 1 ��� 255\n"
 
-#: g10/gpg.c:2888
+#: g10/gpg.c:2919
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "�� ������ default-cert-level� ������ �� ����� 0, 1, 2, � 3\n"
 
-#: g10/gpg.c:2890
+#: g10/gpg.c:2921
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "�� ������ min-cert-level� ������ �� ����� 0, 1, 2, � 3\n"
 
-#: g10/gpg.c:2893
+#: g10/gpg.c:2924
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "��������: � ���� S2K ��������� (0) ������ �� �����������\n"
 
-#: g10/gpg.c:2897
+#: g10/gpg.c:2928
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "�� ������ ��������� S2K; ������ �� ����� 0, 1 � 3\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2935
 msgid "invalid default preferences\n"
 msgstr "�� ������� �����������\n"
 
-#: g10/gpg.c:2913
+#: g10/gpg.c:2944
 msgid "invalid personal cipher preferences\n"
 msgstr "�� ������� ����������� ���������� ���������������\n"
 
-#: g10/gpg.c:2917
+#: g10/gpg.c:2948
 msgid "invalid personal digest preferences\n"
 msgstr "�� ������� ����������� ���������� ���������� ���������\n"
 
-#: g10/gpg.c:2921
+#: g10/gpg.c:2952
 msgid "invalid personal compress preferences\n"
 msgstr "�� ������� ����������� ���������� ���������� ���������\n"
 
-#: g10/gpg.c:2954
+#: g10/gpg.c:2985
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "�� %s ����� �� ���������� ���� �� �� %s\n"
 
-#: g10/gpg.c:3001
+#: g10/gpg.c:3032
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "����������� � ����� ��� ��������������� \"%s\" ���� ��������� %s\n"
 
-#: g10/gpg.c:3006
+#: g10/gpg.c:3037
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 "����������� � ����� ��� ���������� ��������� \"%s\" ���� ��������� %s\n"
 
-#: g10/gpg.c:3011
+#: g10/gpg.c:3042
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "����������� � ����� ��� ���������� ��������� \"%s\" ���� ��������� %s\n"
 
-#: g10/gpg.c:3107
+#: g10/gpg.c:3138
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "�������� ������������� ��� TrustDB: %s\n"
 
-#: g10/gpg.c:3118
+#: g10/gpg.c:3149
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "�������������: ������� ���������� (-r) ����� ����� ��������������\n"
 "�������� ��������\n"
 
-#: g10/gpg.c:3129
+#: g10/gpg.c:3160
 msgid "--store [filename]"
 msgstr "--store [����� �������]"
 
-#: g10/gpg.c:3136
+#: g10/gpg.c:3167
 msgid "--symmetric [filename]"
 msgstr "--symmetric [����� �������]"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3169
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "���������������� �������: %s\n"
 
-#: g10/gpg.c:3148
+#: g10/gpg.c:3179
 msgid "--encrypt [filename]"
 msgstr "--encrypt [����� �������]"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3192
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3194
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3166
+#: g10/gpg.c:3197
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
 
-#: g10/gpg.c:3184
+#: g10/gpg.c:3215
 msgid "--sign [filename]"
 msgstr "--sign [����� �������]"
 
-#: g10/gpg.c:3197
+#: g10/gpg.c:3228
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/gpg.c:3212
+#: g10/gpg.c:3243
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/gpg.c:3214
+#: g10/gpg.c:3245
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3217
+#: g10/gpg.c:3248
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
 
-#: g10/gpg.c:3237
+#: g10/gpg.c:3268
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [����� �������]"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3277
 msgid "--clearsign [filename]"
 msgstr "--clearsign [����� �������]"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3302
 msgid "--decrypt [filename]"
 msgstr "--decrypt [����� �������]"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3310
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3283
+#: g10/gpg.c:3314
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3335
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [�������]"
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3406
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [����������]"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3443
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "keyserver �������� �������: %s\n"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3445
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "keyserver ���� �������: %s\n"
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3447
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "������� �������� �������: %s\n"
 
-#: g10/gpg.c:3427
+#: g10/gpg.c:3458
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "keyserver ��������� �������: %s\n"
 
-#: g10/gpg.c:3437
+#: g10/gpg.c:3468
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "keyserver �������� �������: %s\n"
 
-#: g10/gpg.c:3488
+#: g10/gpg.c:3519
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "����������� �������: %s\n"
 
-#: g10/gpg.c:3496
+#: g10/gpg.c:3527
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "�������� �������: %s\n"
 
-#: g10/gpg.c:3583
+#: g10/gpg.c:3614
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "�� ������� ����������  hash `%s'\n"
 
-#: g10/gpg.c:3706
+#: g10/gpg.c:3737
 msgid "[filename]"
 msgstr "[����� �������]"
 
-#: g10/gpg.c:3710
+#: g10/gpg.c:3741
 msgid "Go ahead and type your message ...\n"
 msgstr "�������� ���� �� ���������� �� ������ ��� ...\n"
 
-#: g10/gpg.c:4000
+#: g10/gpg.c:4031
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1824,28 +1833,28 @@ msgstr ""
 "��� ����� ��������� ������ �� �������� ���� ������������ ���������� ��� ���� "
 "��� �� ����� �� ��� '='\n"
 
-#: g10/gpg.c:4008
+#: g10/gpg.c:4039
 msgid "a user notation name must contain the '@' character\n"
 msgstr "�� ����� ��������� ������ ������ �� �������� �� '@' ���������\n"
 
-#: g10/gpg.c:4013
+#: g10/gpg.c:4044
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "�� ����� ��������� ������ ������ �� �������� �� '@' ���������\n"
 
-#: g10/gpg.c:4024
+#: g10/gpg.c:4055
 msgid "a notation value must not use any control characters\n"
 msgstr "� ���� ��������� ������ �� �� ������������ ���������� control\n"
 
-#: g10/gpg.c:4058
+#: g10/gpg.c:4089
 msgid "the given certification policy URL is invalid\n"
 msgstr "�� URL ��������� �������������� ��� ������ ��� ����� ������\n"
 
-#: g10/gpg.c:4060
+#: g10/gpg.c:4091
 msgid "the given signature policy URL is invalid\n"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
 
-#: g10/gpg.c:4093
+#: g10/gpg.c:4124
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
@@ -1854,33 +1863,34 @@ msgstr "
 msgid "too many entries in pk cache - disabled\n"
 msgstr "���� ������ ������������ ��� pk cache - ����������������\n"
 
-#: g10/getkey.c:188 g10/getkey.c:2845
+#: g10/getkey.c:188 g10/getkey.c:2876
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[User id ��� �������]"
 
-#: g10/getkey.c:931 g10/getkey.c:953 g10/getkey.c:976
+#: g10/getkey.c:933 g10/getkey.c:950 g10/getkey.c:970 g10/getkey.c:986
+#: g10/getkey.c:1001
 #, c-format
 msgid "Automatically retrieved `%s' via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1769
+#: g10/getkey.c:1800
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "�� ������ ������ %08lX ����� ������ ��� �� --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2323
+#: g10/getkey.c:2354
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "������ ������� ��������� ��� �� ������� ��������� %08lX - �������\n"
 
-#: g10/getkey.c:2554
+#: g10/getkey.c:2585
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "����� ��� ������������� �������� %08lX ���� ��� ����������� %08lX\n"
 
-#: g10/getkey.c:2601
+#: g10/getkey.c:2632
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "������ %08lX: ������� ������ ����� ������� - ������������\n"
@@ -3465,12 +3475,12 @@ msgid "(sensitive)"
 msgstr " (���������)"
 
 #: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
-#: g10/keylist.c:194 g10/keyserver.c:471
+#: g10/keylist.c:194 g10/keyserver.c:525
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "�������� ����������� ��� %s: %s\n"
 
-#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:967
+#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:960
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[����������]"
@@ -3482,7 +3492,7 @@ msgstr " [
 
 #: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
 #: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:477 g10/mainproc.c:973
+#: g10/keylist.c:914 g10/keyserver.c:531 g10/mainproc.c:966
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [�����: %s]"
@@ -3518,14 +3528,14 @@ msgstr ""
 "� ���������� ��� ��������������� �������� ��� ����� ���������� �����\n"
 "����� ��� ��� �������������� �� ���������.\n"
 
-#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:481
-#: g10/mainproc.c:1734 g10/trustdb.c:1184 g10/trustdb.c:1704
+#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:535
+#: g10/mainproc.c:1783 g10/trustdb.c:1184 g10/trustdb.c:1704
 #, fuzzy
 msgid "revoked"
 msgstr "[����������]"
 
-#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:485
-#: g10/mainproc.c:1736 g10/trustdb.c:537 g10/trustdb.c:1706
+#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:539
+#: g10/mainproc.c:1785 g10/trustdb.c:537 g10/trustdb.c:1706
 #, fuzzy
 msgid "expired"
 msgstr "expire"
@@ -4377,392 +4387,389 @@ msgstr "%s: 
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:77
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:81
+#: g10/keyserver.c:79
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:83
+#: g10/keyserver.c:81
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:87
+#: g10/keyserver.c:85
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:89
-msgid "automatically retrieve keys from PKA records"
-msgstr ""
-
-#: g10/keyserver.c:91
-msgid "automatically retrieve keys from DNS"
-msgstr ""
-
-#: g10/keyserver.c:95
+#: g10/keyserver.c:87
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
 
-#: g10/keyserver.c:139
+#: g10/keyserver.c:89
+msgid "honor the PKA record set on a key when retrieving keys"
+msgstr ""
+
+#: g10/keyserver.c:154
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "�������������: �� �������� ��� `%s' ��� ����� ������� �� ���� ��� ��������\n"
 
-#: g10/keyserver.c:483
+#: g10/keyserver.c:537
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:684
+#: g10/keyserver.c:738
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:767 g10/keyserver.c:1368
+#: g10/keyserver.c:821 g10/keyserver.c:1422
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/keyserver.c:865
+#: g10/keyserver.c:919
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "�� ������ '%s' �� �������: %s\n"
 
-#: g10/keyserver.c:867
+#: g10/keyserver.c:921
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "�� ������ '%s' �� �������: %s\n"
 
-#: g10/keyserver.c:1092
+#: g10/keyserver.c:1146
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "������ �������� %08lX ��� �� %s\n"
 
-#: g10/keyserver.c:1096
+#: g10/keyserver.c:1150
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "������ �������� %08lX ��� �� %s\n"
 
-#: g10/keyserver.c:1120
+#: g10/keyserver.c:1174
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "��������� ��� \"%s\" ��� �� HKP ���������� %s\n"
 
-#: g10/keyserver.c:1123
+#: g10/keyserver.c:1177
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "��������� ��� \"%s\" ��� �� HKP ���������� %s\n"
 
-#: g10/keyserver.c:1271
+#: g10/keyserver.c:1325
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "��������� ��� \"%s\" ��� �� HKP ���������� %s\n"
 
-#: g10/keyserver.c:1275
+#: g10/keyserver.c:1329
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "����������� �� �� ������ ��� %08lX ���� %s\n"
 
-#: g10/keyserver.c:1318
+#: g10/keyserver.c:1372
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "��������� ��� \"%s\" ��� �� HKP ���������� %s\n"
 
-#: g10/keyserver.c:1321
+#: g10/keyserver.c:1375
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "��������� ��� \"%s\" ��� �� HKP ���������� %s\n"
 
-#: g10/keyserver.c:1328 g10/keyserver.c:1424
+#: g10/keyserver.c:1382 g10/keyserver.c:1478
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/keyserver.c:1376
+#: g10/keyserver.c:1430
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1439
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1446
+#: g10/keyserver.c:1500
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1452
+#: g10/keyserver.c:1506
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1464
+#: g10/keyserver.c:1518
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1469
+#: g10/keyserver.c:1523
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1477
+#: g10/keyserver.c:1531
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1484
+#: g10/keyserver.c:1538
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "������ ���������� ��������"
 
-#: g10/keyserver.c:1489
+#: g10/keyserver.c:1543
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "������ ���������� ��������"
 
-#: g10/keyserver.c:1498
+#: g10/keyserver.c:1552
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "keyserver ���� �������: %s\n"
 
-#: g10/keyserver.c:1523 g10/keyserver.c:1557
+#: g10/keyserver.c:1577 g10/keyserver.c:1611
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1814
+#: g10/keyserver.c:1868
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "�������������: �������� ��������� tempfile (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1836
+#: g10/keyserver.c:1890
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "������ �������� %08lX ��� �� %s\n"
 
-#: g10/keyserver.c:1838
+#: g10/keyserver.c:1892
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "������ �������� %08lX ��� �� %s\n"
 
-#: g10/keyserver.c:1903
+#: g10/keyserver.c:1957
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "�������������: �������� ��������� tempfile (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1909
+#: g10/keyserver.c:1963
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "�������������: �������� ��������� tempfile (%s) `%s': %s\n"
 
-#: g10/mainproc.c:253
+#: g10/mainproc.c:240
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "�������� ������� ��� ��� ������ ���������������� ��������� (%d)\n"
 
-#: g10/mainproc.c:304
+#: g10/mainproc.c:291
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s ������ ���������������� ��������\n"
 
-#: g10/mainproc.c:314
+#: g10/mainproc.c:301
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "��������������� �� ������� ��������� %d\n"
 
-#: g10/mainproc.c:395
+#: g10/mainproc.c:382
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "������� ������ ����� %08lX\n"
 
-#: g10/mainproc.c:450
+#: g10/mainproc.c:439
 msgid "public key encrypted data: good DEK\n"
 msgstr "��������������� �������� �� ������� ������: ���� DEK\n"
 
-#: g10/mainproc.c:483
+#: g10/mainproc.c:472
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "��������������� �� %u-bit %s ������, ID %08lX, ������������� %s\n"
 
-#: g10/mainproc.c:487 g10/pkclist.c:219
+#: g10/mainproc.c:476 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                ������ ��� \""
 
-#: g10/mainproc.c:491
+#: g10/mainproc.c:480
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "��������������� �� %s key, ID %08lX\n"
 
-#: g10/mainproc.c:505
+#: g10/mainproc.c:494
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "������������� �� ������� ������ �������: %s\n"
 
-#: g10/mainproc.c:519
+#: g10/mainproc.c:508
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "��������������� �� %lu ������� �������\n"
 
-#: g10/mainproc.c:521
+#: g10/mainproc.c:510
 msgid "encrypted with 1 passphrase\n"
 msgstr "��������������� �� 1 ����� ������\n"
 
-#: g10/mainproc.c:549 g10/mainproc.c:571
+#: g10/mainproc.c:541 g10/mainproc.c:563
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "������� %s ���������������� ���������\n"
 
-#: g10/mainproc.c:557
+#: g10/mainproc.c:549
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "��������������� IDEA �� ����������, ��������� ���������� ������ ���\n"
 "%s ��������\n"
 
-#: g10/mainproc.c:589
+#: g10/mainproc.c:581
 msgid "decryption okay\n"
 msgstr "���������������� OK\n"
 
-#: g10/mainproc.c:593
+#: g10/mainproc.c:585
 msgid "WARNING: message was not integrity protected\n"
 msgstr "�������������: ��� ������������� � ����������� ��� ��������\n"
 
-#: g10/mainproc.c:606
+#: g10/mainproc.c:598
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "�������������: �� ��������������� ������ ���� ���������!\n"
 
-#: g10/mainproc.c:612
+#: g10/mainproc.c:604
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "���������������� �������: %s\n"
 
-#: g10/mainproc.c:631
+#: g10/mainproc.c:623
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "��������: � ���������� ������ \"���-��-�����-���-����\"\n"
 
-#: g10/mainproc.c:633
+#: g10/mainproc.c:625
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "������ ����� �������='%.*s'\n"
 
-#: g10/mainproc.c:822
+#: g10/mainproc.c:815
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "���������� �������� - ��������������� \"gpg --import\" ��� ��������\n"
 
-#: g10/mainproc.c:1168
+#: g10/mainproc.c:1161
 #, fuzzy
 msgid "no signature found\n"
 msgstr "���� �������� ��� \""
 
-#: g10/mainproc.c:1418
+#: g10/mainproc.c:1419
 msgid "signature verification suppressed\n"
 msgstr "��������� ��������� ���������\n"
 
-#: g10/mainproc.c:1460 g10/mainproc.c:1470
-msgid "can't handle these multiple signatures\n"
+#: g10/mainproc.c:1519
+#, fuzzy
+msgid "can't handle this ambiguous signature data\n"
 msgstr "�������� ��������� ����� ��� ��������� ���������\n"
 
-#: g10/mainproc.c:1480
+#: g10/mainproc.c:1530
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "�������� ����� ���� %s.\n"
 
-#: g10/mainproc.c:1481
+#: g10/mainproc.c:1531
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                ������ ��� \""
 
-#: g10/mainproc.c:1485
+#: g10/mainproc.c:1535
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "�������� ����� ��� %.*s �� ����� ��� ��������%s ID %08lX\n"
 
-#: g10/mainproc.c:1505
+#: g10/mainproc.c:1555
 msgid "Key available at: "
 msgstr "������ ��������� ���: "
 
-#: g10/mainproc.c:1639 g10/mainproc.c:1687
+#: g10/mainproc.c:1688 g10/mainproc.c:1736
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "���� �������� ��� \""
 
-#: g10/mainproc.c:1641 g10/mainproc.c:1689
+#: g10/mainproc.c:1690 g10/mainproc.c:1738
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "������� �������� ��� \""
 
-#: g10/mainproc.c:1643 g10/mainproc.c:1691
+#: g10/mainproc.c:1692 g10/mainproc.c:1740
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "���� �������� ��� \""
 
-#: g10/mainproc.c:1695
+#: g10/mainproc.c:1744
 msgid "[uncertain]"
 msgstr "[�������]"
 
-#: g10/mainproc.c:1727
+#: g10/mainproc.c:1776
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                ������ ��� \""
 
-#: g10/mainproc.c:1824
+#: g10/mainproc.c:1873
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "�������� ����� ���� %s.\n"
 
-#: g10/mainproc.c:1829
+#: g10/mainproc.c:1878
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "�������� ����� ���� %s.\n"
 
-#: g10/mainproc.c:1832
+#: g10/mainproc.c:1881
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s ��������, ���������� ��������� %s\n"
 
-#: g10/mainproc.c:1833
+#: g10/mainproc.c:1882
 msgid "binary"
 msgstr "�������"
 
-#: g10/mainproc.c:1834
+#: g10/mainproc.c:1883
 msgid "textmode"
 msgstr "���������-��������"
 
-#: g10/mainproc.c:1834 g10/trustdb.c:536
+#: g10/mainproc.c:1883 g10/trustdb.c:536
 msgid "unknown"
 msgstr "�������"
 
-#: g10/mainproc.c:1854
+#: g10/mainproc.c:1903
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "�������� ������� ��� ���������: %s\n"
 
-#: g10/mainproc.c:1922 g10/mainproc.c:1938 g10/mainproc.c:2024
+#: g10/mainproc.c:1972 g10/mainproc.c:1988 g10/mainproc.c:2074
 msgid "not a detached signature\n"
 msgstr "��� ����� ���������� ��������\n"
 
-#: g10/mainproc.c:1965
+#: g10/mainproc.c:2015
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "�������������: ���������� ��������� ���������. ���� � ����� �� ��������.\n"
 
-#: g10/mainproc.c:1973
+#: g10/mainproc.c:2023
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "���������� �������� ������ 0x%02x\n"
 
-#: g10/mainproc.c:2030
+#: g10/mainproc.c:2080
 msgid "old style (PGP 2.x) signature\n"
 msgstr "�������� ������ ���� (PGP 2.x)\n"
 
-#: g10/mainproc.c:2040
+#: g10/mainproc.c:2090
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "�� ������ ������(root) ������ ����������� ��� proc_tree()\n"
 
@@ -5335,23 +5342,23 @@ msgstr "
 msgid "error creating `%s': %s\n"
 msgstr "������ ���� �� ���������� ��� `%s': %s\n"
 
-#: g10/plaintext.c:447
+#: g10/plaintext.c:453
 msgid "Detached signature.\n"
 msgstr "���������� ��������.\n"
 
-#: g10/plaintext.c:453
+#: g10/plaintext.c:459
 msgid "Please enter name of data file: "
 msgstr "�������� �� ����� ������� ���������: "
 
-#: g10/plaintext.c:485
+#: g10/plaintext.c:491
 msgid "reading stdin ...\n"
 msgstr "�������� ��� stdin ...\n"
 
-#: g10/plaintext.c:519
+#: g10/plaintext.c:525
 msgid "no signed data\n"
 msgstr "��� �������� ������������� ��������\n"
 
-#: g10/plaintext.c:533
+#: g10/plaintext.c:539
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "�������� ��������� �������������� ��������� `%s'\n"
diff --git a/po/eo.po b/po/eo.po
index 8e6effaad..322795b09 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.6d\n"
 "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2006-02-14 15:28+0100\n"
+"POT-Creation-Date: 2006-03-07 11:29+0100\n"
 "PO-Revision-Date: 2002-04-14 14:33+0100\n"
 "Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
@@ -40,9 +40,9 @@ msgstr "skribas sekretan 
 
 #: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:992 g10/gpg.c:3360 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:997 g10/gpg.c:3391 g10/import.c:193 g10/keygen.c:2274
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:476 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
+#: g10/plaintext.c:482 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
 #: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
@@ -77,7 +77,7 @@ msgstr "ne povas legi '%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "noto: dosiero random_seed ne aktualigita\n"
 
-#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:991 g10/keygen.c:2753
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2753
 #: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
 #: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
 #, c-format
@@ -691,51 +691,51 @@ msgstr "skribas sekretan 
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Nevalida komando (provu per \"helpo\")\n"
 
-#: g10/cardglue.c:435
+#: g10/cardglue.c:434
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:572
+#: g10/cardglue.c:573
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:580
+#: g10/cardglue.c:582
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:915
+#: g10/cardglue.c:917
 #, fuzzy
 msgid "Enter New Admin PIN: "
 msgstr "Donu la uzantidentigilon: "
 
-#: g10/cardglue.c:916
+#: g10/cardglue.c:918
 #, fuzzy
 msgid "Enter New PIN: "
 msgstr "Donu la uzantidentigilon: "
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:919
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:920
 #, fuzzy
 msgid "Enter PIN: "
 msgstr "Donu la uzantidentigilon: "
 
-#: g10/cardglue.c:935
+#: g10/cardglue.c:937
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Ripetu pasfrazon: "
 
-#: g10/cardglue.c:950
+#: g10/cardglue.c:952
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "la pasfrazo ne estis �uste ripetita; provu denove"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3720 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3751 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -745,13 +745,13 @@ msgstr "ne povas malfermi '%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output ne funkcias por �i tiu komando\n"
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1644
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1698
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "�losilo '%s' ne trovita: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1658
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1712
 #: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -860,12 +860,12 @@ msgstr "Tiu komando ne eblas en la re
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s-�ifrita por: %s\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:306
+#: g10/encr-data.c:67 g10/mainproc.c:293
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s-�ifritaj datenoj\n"
 
-#: g10/encr-data.c:69 g10/mainproc.c:310
+#: g10/encr-data.c:69 g10/mainproc.c:297
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "�ifrita per nekonata metodo %d\n"
@@ -1004,7 +1004,7 @@ msgstr ""
 msgid "WARNING: nothing exported\n"
 msgstr "AVERTO: nenio estis eksportita\n"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:373
 msgid ""
 "@Commands:\n"
 " "
@@ -1012,128 +1012,128 @@ msgstr ""
 "@Komandoj:\n"
 " "
 
-#: g10/gpg.c:374
+#: g10/gpg.c:375
 msgid "|[file]|make a signature"
 msgstr "|[dosiero]|fari subskribon"
 
-#: g10/gpg.c:375
+#: g10/gpg.c:376
 msgid "|[file]|make a clear text signature"
 msgstr "|[dosiero]|fari klartekstan subskribon"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:377
 msgid "make a detached signature"
 msgstr "fari apartan subskribon"
 
-#: g10/gpg.c:377
+#: g10/gpg.c:378
 msgid "encrypt data"
 msgstr "�ifri datenojn"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:380
 msgid "encryption only with symmetric cipher"
 msgstr "�ifri nur kun simetria �ifro"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:382
 msgid "decrypt data (default)"
 msgstr "mal�ifri datenojn (implicita elekto)"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:384
 msgid "verify a signature"
 msgstr "kontroli subskribon"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:386
 msgid "list keys"
 msgstr "listigi �losilojn"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "list keys and signatures"
 msgstr "listigi �losilojn kaj subskribojn"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:389
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "kontroli �losilsubskribojn"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:390
 msgid "list keys and fingerprints"
 msgstr "listigi �losilojn kaj fingro�purojn"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:391
 msgid "list secret keys"
 msgstr "listigi sekretajn �losilojn"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:392
 msgid "generate a new key pair"
 msgstr "krei novan �losilparon"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:393
 msgid "remove keys from the public keyring"
 msgstr "forigi �losilojn de la publika �losilaro"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:395
 msgid "remove keys from the secret keyring"
 msgstr "forigi �losilojn de la sekreta �losilaro"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:396
 msgid "sign a key"
 msgstr "subskribi �losilon"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:397
 msgid "sign a key locally"
 msgstr "subskribi �losilon loke"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:398
 msgid "sign or edit a key"
 msgstr "subskribi a� redakti �losilon"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:399
 msgid "generate a revocation certificate"
 msgstr "krei revokatestilon"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:401
 msgid "export keys"
 msgstr "eksporti �losilojn"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:402
 msgid "export keys to a key server"
 msgstr "eksporti �losilojn al �losilservilo"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:403
 msgid "import keys from a key server"
 msgstr "importi �losilojn de �losilservilo"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:405
 msgid "search for keys on a key server"
 msgstr "ser�i �losilojn �e �losilservilo"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:407
 msgid "update all keys from a keyserver"
 msgstr "aktualigi �iujn �losilojn de �losilservilo"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:411
 msgid "import/merge keys"
 msgstr "importi/kunfandi �losilojn"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:414
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:414
+#: g10/gpg.c:415
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:415
+#: g10/gpg.c:416
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:423
+#: g10/gpg.c:424
 msgid "update the trust database"
 msgstr "aktualigi la fido-datenaron"
 
-#: g10/gpg.c:430
+#: g10/gpg.c:431
 msgid "|algo [files]|print message digests"
 msgstr "|metodo [dosieroj]|presi mesa�o-kompendiojn"
 
-#: g10/gpg.c:434 g10/gpgv.c:71
+#: g10/gpg.c:435 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1143,51 +1143,51 @@ msgstr ""
 "Opcioj:\n"
 " "
 
-#: g10/gpg.c:436
+#: g10/gpg.c:437
 msgid "create ascii armored output"
 msgstr "krei eligon en askia kiraso"
 
-#: g10/gpg.c:438
+#: g10/gpg.c:439
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOMO|�ifri por NOMO"
 
-#: g10/gpg.c:449
+#: g10/gpg.c:450
 msgid "use this user-id to sign or decrypt"
 msgstr "uzi �i tiun uzantidentigilon por subskribi a� mal�ifri"
 
-#: g10/gpg.c:450
+#: g10/gpg.c:451
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|difini densig-nivelon N (0=nenia)"
 
-#: g10/gpg.c:455
+#: g10/gpg.c:456
 msgid "use canonical text mode"
 msgstr "uzi tekstan re�imon"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:470
 msgid "use as output file"
 msgstr "uzi dosieron por eligo"
 
-#: g10/gpg.c:471 g10/gpgv.c:73
+#: g10/gpg.c:472 g10/gpgv.c:73
 msgid "verbose"
 msgstr "detala eligo"
 
-#: g10/gpg.c:482
+#: g10/gpg.c:483
 msgid "do not make any changes"
 msgstr "fari neniajn �an�ojn"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:484
 msgid "prompt before overwriting"
 msgstr ""
 
-#: g10/gpg.c:524
+#: g10/gpg.c:525
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:553
+#: g10/gpg.c:554
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1195,7 +1195,7 @@ msgstr ""
 "@\n"
 "(Vidu la manpa�on por kompleta listo de �iuj komandoj kaj opcioj)\n"
 
-#: g10/gpg.c:556
+#: g10/gpg.c:557
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1215,15 +1215,15 @@ msgstr ""
 " --list-keys [nomoj]        montri �losilojn\n"
 " --fingerprint [nomoj]      montri fingro�purojn\n"
 
-#: g10/gpg.c:746 g10/gpgv.c:98
+#: g10/gpg.c:751 g10/gpgv.c:98
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Bonvolu raporti cimojn al <gnupg-bugs@gnu.org>.\n"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:768
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: g10/gpg.c:766
+#: g10/gpg.c:771
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1233,7 +1233,7 @@ msgstr ""
 "subskribi, kontroli, �ifri a� mal�ifri\n"
 "implicita operacio dependas de la enigataj datenoj\n"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:782
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1241,559 +1241,568 @@ msgstr ""
 "\n"
 "Realigitaj metodoj:\n"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:785
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/gpg.c:786 g10/keyedit.c:2266
+#: g10/gpg.c:791 g10/keyedit.c:2266
 msgid "Cipher: "
 msgstr ""
 
-#: g10/gpg.c:792
+#: g10/gpg.c:797
 msgid "Hash: "
 msgstr ""
 
-#: g10/gpg.c:798 g10/keyedit.c:2312
+#: g10/gpg.c:803 g10/keyedit.c:2312
 #, fuzzy
 msgid "Compression: "
 msgstr "Komento: "
 
-#: g10/gpg.c:881
+#: g10/gpg.c:886
 msgid "usage: gpg [options] "
 msgstr "uzado: gpg [opcioj] "
 
-#: g10/gpg.c:1029
+#: g10/gpg.c:1034
 msgid "conflicting commands\n"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/gpg.c:1047
+#: g10/gpg.c:1052
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1244
+#: g10/gpg.c:1249
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1247
+#: g10/gpg.c:1252
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1250
+#: g10/gpg.c:1255
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1256
+#: g10/gpg.c:1261
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1259
+#: g10/gpg.c:1264
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1262
+#: g10/gpg.c:1267
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1268
+#: g10/gpg.c:1273
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1271
+#: g10/gpg.c:1276
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1274
+#: g10/gpg.c:1279
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/gpg.c:1280
+#: g10/gpg.c:1285
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1283
+#: g10/gpg.c:1288
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1286
+#: g10/gpg.c:1291
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 
-#: g10/gpg.c:1427
+#: g10/gpg.c:1432
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "%s: nova opcio-dosiero kreita\n"
 
-#: g10/gpg.c:1521
+#: g10/gpg.c:1526
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1523
+#: g10/gpg.c:1528
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1525
+#: g10/gpg.c:1530
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Mankas responda subskribo en sekreta �losilaro\n"
 
-#: g10/gpg.c:1527
+#: g10/gpg.c:1532
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1536
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1538
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1540
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1542
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1544
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1546
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "montri, en kiu �losilaro estas listigita �losilo"
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1548
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Mankas responda subskribo en sekreta �losilaro\n"
 
-#: g10/gpg.c:1874
+#: g10/gpg.c:1879
 #, fuzzy, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
 
-#: g10/gpg.c:1916
+#: g10/gpg.c:1921
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
 
-#: g10/gpg.c:1920
+#: g10/gpg.c:1925
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "opcio-dosiero '%s': %s\n"
 
-#: g10/gpg.c:1927
+#: g10/gpg.c:1932
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "legas opciojn el '%s'\n"
 
-#: g10/gpg.c:2142 g10/gpg.c:2716 g10/gpg.c:2735
+#: g10/gpg.c:2147 g10/gpg.c:2747 g10/gpg.c:2766
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTO: %s ne estas por normala uzado!\n"
 
-#: g10/gpg.c:2158
+#: g10/gpg.c:2163
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 
-#: g10/gpg.c:2312 g10/gpg.c:2324
+#: g10/gpg.c:2317 g10/gpg.c:2329
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2400
+#: g10/gpg.c:2405
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2422 g10/keyedit.c:3997
+#: g10/gpg.c:2429 g10/keyedit.c:3997
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "ne povis analizi URI de �losilservilo\n"
 
-#: g10/gpg.c:2428
+#: g10/gpg.c:2441
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2431
+#: g10/gpg.c:2444
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/gpg.c:2438
+#: g10/gpg.c:2451
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2441
+#: g10/gpg.c:2454
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "nevalida kiraso"
 
-#: g10/gpg.c:2448
+#: g10/gpg.c:2461
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2464
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/gpg.c:2458
+#: g10/gpg.c:2471
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2461
+#: g10/gpg.c:2474
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "nevalida kiraso"
 
-#: g10/gpg.c:2469
+#: g10/gpg.c:2482
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2471
+#: g10/gpg.c:2484
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2473
+#: g10/gpg.c:2486
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2475
+#: g10/gpg.c:2488
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2479
+#: g10/gpg.c:2492
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2481
+#: g10/gpg.c:2494
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/gpg.c:2483
+#: g10/gpg.c:2496
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2485
+#: g10/gpg.c:2498
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2505
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2495
+#: g10/gpg.c:2508
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/gpg.c:2502
+#: g10/gpg.c:2515
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2705
+#: g10/gpg.c:2665
+#, fuzzy, c-format
+msgid "%s:%d: invalid auto-key-locate list\n"
+msgstr "AVERTO: '%s' estas malplena dosiero\n"
+
+#: g10/gpg.c:2668
+msgid "invalid auto-key-locate list\n"
+msgstr ""
+
+#: g10/gpg.c:2736
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVERTO: programo povas krei core-dosieron!\n"
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2740
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVERTO: %s nuligas %s\n"
 
-#: g10/gpg.c:2718
+#: g10/gpg.c:2749
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ne eblas kun %s!\n"
 
-#: g10/gpg.c:2721
+#: g10/gpg.c:2752
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/gpg.c:2728
+#: g10/gpg.c:2759
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "gpg-agent ne estas disponata en �i tiu sesio\n"
 
-#: g10/gpg.c:2743
+#: g10/gpg.c:2774
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/gpg.c:2757
+#: g10/gpg.c:2788
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "eblas fari nur apartajn kaj klartekstajn subskribojn kun --pgp2\n"
 
-#: g10/gpg.c:2763
+#: g10/gpg.c:2794
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "ne eblas samtempe subskribi kaj �ifri kun --pgp2\n"
 
-#: g10/gpg.c:2769
+#: g10/gpg.c:2800
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "necesas uzi dosierojn (kaj ne tubon) kun --pgp2\n"
 
-#: g10/gpg.c:2782
+#: g10/gpg.c:2813
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "�ifri mesa�on kun --pgp2 postulas la �ifron IDEA\n"
 
-#: g10/gpg.c:2849 g10/gpg.c:2873
+#: g10/gpg.c:2880 g10/gpg.c:2904
 msgid "selected cipher algorithm is invalid\n"
 msgstr "elektita �ifrad-metodo ne validas\n"
 
-#: g10/gpg.c:2855 g10/gpg.c:2879
+#: g10/gpg.c:2886 g10/gpg.c:2910
 msgid "selected digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/gpg.c:2861
+#: g10/gpg.c:2892
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "elektita �ifrad-metodo ne validas\n"
 
-#: g10/gpg.c:2867
+#: g10/gpg.c:2898
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/gpg.c:2882
+#: g10/gpg.c:2913
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed devas esti pli granda ol 0\n"
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2915
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed devas esti pli granda ol 1\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2917
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth devas esti inter 1 kaj 255\n"
 
-#: g10/gpg.c:2888
+#: g10/gpg.c:2919
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "nevalida default-check-level; devas esti 0, 1, 2 a� 3\n"
 
-#: g10/gpg.c:2890
+#: g10/gpg.c:2921
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "nevalida default-check-level; devas esti 0, 1, 2 a� 3\n"
 
-#: g10/gpg.c:2893
+#: g10/gpg.c:2924
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTO: simpla S2K-re�imo (0) estas forte malrekomendata\n"
 
-#: g10/gpg.c:2897
+#: g10/gpg.c:2928
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "nevalida S2K-re�imo; devas esti 0, 1 a� 3\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2935
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:2913
+#: g10/gpg.c:2944
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:2917
+#: g10/gpg.c:2948
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:2921
+#: g10/gpg.c:2952
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:2954
+#: g10/gpg.c:2985
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/gpg.c:3001
+#: g10/gpg.c:3032
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/gpg.c:3006
+#: g10/gpg.c:3037
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/gpg.c:3011
+#: g10/gpg.c:3042
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/gpg.c:3107
+#: g10/gpg.c:3138
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: g10/gpg.c:3118
+#: g10/gpg.c:3149
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3129
+#: g10/gpg.c:3160
 msgid "--store [filename]"
 msgstr "--store [dosiero]"
 
-#: g10/gpg.c:3136
+#: g10/gpg.c:3167
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosiero]"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3169
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "mal�ifrado malsukcesis: %s\n"
 
-#: g10/gpg.c:3148
+#: g10/gpg.c:3179
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosiero]"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3192
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3194
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3166
+#: g10/gpg.c:3197
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/gpg.c:3184
+#: g10/gpg.c:3215
 msgid "--sign [filename]"
 msgstr "--sign [dosiero]"
 
-#: g10/gpg.c:3197
+#: g10/gpg.c:3228
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/gpg.c:3212
+#: g10/gpg.c:3243
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/gpg.c:3214
+#: g10/gpg.c:3245
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3217
+#: g10/gpg.c:3248
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/gpg.c:3237
+#: g10/gpg.c:3268
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [dosiero]"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3277
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosiero]"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3302
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosiero]"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3310
 msgid "--sign-key user-id"
 msgstr "--sign-key uzantidentigilo"
 
-#: g10/gpg.c:3283
+#: g10/gpg.c:3314
 msgid "--lsign-key user-id"
 msgstr "--lsign-key uzantidentigilo"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3335
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key uzantidentigilo [komandoj]"
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3406
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [uzantidentigilo] [�losilaro]"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3443
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3445
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3447
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3427
+#: g10/gpg.c:3458
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "get_dir_record: search_record malsukcesis: %s\n"
 
-#: g10/gpg.c:3437
+#: g10/gpg.c:3468
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3488
+#: g10/gpg.c:3519
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "elkirasigo malsukcesis: %s\n"
 
-#: g10/gpg.c:3496
+#: g10/gpg.c:3527
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: g10/gpg.c:3583
+#: g10/gpg.c:3614
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "nevalida kompendi-metodo '%s'\n"
 
-#: g10/gpg.c:3706
+#: g10/gpg.c:3737
 msgid "[filename]"
 msgstr "[dosiero]"
 
-#: g10/gpg.c:3710
+#: g10/gpg.c:3741
 msgid "Go ahead and type your message ...\n"
 msgstr "Ektajpu vian mesa�on ...\n"
 
-#: g10/gpg.c:4000
+#: g10/gpg.c:4031
 #, fuzzy
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1802,29 +1811,29 @@ msgstr ""
 "notacia nomo devas enhavi nur literojn, ciferojn, punktojn a� substrekojn "
 "kaj fini per '='\n"
 
-#: g10/gpg.c:4008
+#: g10/gpg.c:4039
 #, fuzzy
 msgid "a user notation name must contain the '@' character\n"
 msgstr "notacia valoro ne povas enhavi stirsignojn\n"
 
-#: g10/gpg.c:4013
+#: g10/gpg.c:4044
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "notacia valoro ne povas enhavi stirsignojn\n"
 
-#: g10/gpg.c:4024
+#: g10/gpg.c:4055
 msgid "a notation value must not use any control characters\n"
 msgstr "notacia valoro ne povas enhavi stirsignojn\n"
 
-#: g10/gpg.c:4058
+#: g10/gpg.c:4089
 msgid "the given certification policy URL is invalid\n"
 msgstr "la donita gvidlinia URL por atestado ne validas\n"
 
-#: g10/gpg.c:4060
+#: g10/gpg.c:4091
 msgid "the given signature policy URL is invalid\n"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/gpg.c:4093
+#: g10/gpg.c:4124
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
@@ -1833,32 +1842,33 @@ msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "tro da registroj en pk-staplo - mal�altas\n"
 
-#: g10/getkey.c:188 g10/getkey.c:2845
+#: g10/getkey.c:188 g10/getkey.c:2876
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[Uzantidentigilo ne trovita]"
 
-#: g10/getkey.c:931 g10/getkey.c:953 g10/getkey.c:976
+#: g10/getkey.c:933 g10/getkey.c:950 g10/getkey.c:970 g10/getkey.c:986
+#: g10/getkey.c:1001
 #, c-format
 msgid "Automatically retrieved `%s' via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1769
+#: g10/getkey.c:1800
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Nevalida �losilo %08lX validigita per --always-trust\n"
 
-#: g10/getkey.c:2323
+#: g10/getkey.c:2354
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "estas sekreta �losilo por la publika �losilo \"%s\"!\n"
 
-#: g10/getkey.c:2554
+#: g10/getkey.c:2585
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "uzas flankan �losilon %08lX anstata� la �efa �losilo %08lX\n"
 
-#: g10/getkey.c:2601
+#: g10/getkey.c:2632
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "�losilo %08lX: sekreta �losilo sen publika �losilo - ignorita\n"
@@ -3436,12 +3446,12 @@ msgid "(sensitive)"
 msgstr " (sentema)"
 
 #: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
-#: g10/keylist.c:194 g10/keyserver.c:471
+#: g10/keylist.c:194 g10/keyserver.c:525
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "ne povas krei %s: %s\n"
 
-#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:967
+#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:960
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "rev"
@@ -3453,7 +3463,7 @@ msgstr " [eksvalidi
 
 #: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
 #: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:477 g10/mainproc.c:973
+#: g10/keylist.c:914 g10/keyserver.c:531 g10/mainproc.c:966
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [eksvalidi�os: %s]"
@@ -3487,14 +3497,14 @@ msgid ""
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:481
-#: g10/mainproc.c:1734 g10/trustdb.c:1184 g10/trustdb.c:1704
+#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:535
+#: g10/mainproc.c:1783 g10/trustdb.c:1184 g10/trustdb.c:1704
 #, fuzzy
 msgid "revoked"
 msgstr "rev"
 
-#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:485
-#: g10/mainproc.c:1736 g10/trustdb.c:537 g10/trustdb.c:1706
+#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:539
+#: g10/mainproc.c:1785 g10/trustdb.c:537 g10/trustdb.c:1706
 #, fuzzy
 msgid "expired"
 msgstr "eksval"
@@ -4342,393 +4352,390 @@ msgstr "%s: 
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:77
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:81
+#: g10/keyserver.c:79
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:83
+#: g10/keyserver.c:81
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:87
+#: g10/keyserver.c:85
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:89
-msgid "automatically retrieve keys from PKA records"
-msgstr ""
-
-#: g10/keyserver.c:91
-msgid "automatically retrieve keys from DNS"
-msgstr ""
-
-#: g10/keyserver.c:95
+#: g10/keyserver.c:87
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/keyserver.c:139
+#: g10/keyserver.c:89
+msgid "honor the PKA record set on a key when retrieving keys"
+msgstr ""
+
+#: g10/keyserver.c:154
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 
-#: g10/keyserver.c:483
+#: g10/keyserver.c:537
 #, fuzzy
 msgid "disabled"
 msgstr "el"
 
-#: g10/keyserver.c:684
+#: g10/keyserver.c:738
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:767 g10/keyserver.c:1368
+#: g10/keyserver.c:821 g10/keyserver.c:1422
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "nevalida �losilaro"
 
-#: g10/keyserver.c:865
+#: g10/keyserver.c:919
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "�losilo '%s' ne trovita: %s\n"
 
-#: g10/keyserver.c:867
+#: g10/keyserver.c:921
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "�losilo '%s' ne trovita: %s\n"
 
-#: g10/keyserver.c:1092
+#: g10/keyserver.c:1146
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "petas la �losilon %08lX de HKP-�losilservilo %s ...\n"
 
-#: g10/keyserver.c:1096
+#: g10/keyserver.c:1150
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "petas la �losilon %08lX de HKP-�losilservilo %s ...\n"
 
-#: g10/keyserver.c:1120
+#: g10/keyserver.c:1174
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "ser�as pri \"%s\" �e HKP-servilo %s\n"
 
-#: g10/keyserver.c:1123
+#: g10/keyserver.c:1177
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "ser�as pri \"%s\" �e HKP-servilo %s\n"
 
-#: g10/keyserver.c:1271
+#: g10/keyserver.c:1325
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "ser�as pri \"%s\" �e HKP-servilo %s\n"
 
-#: g10/keyserver.c:1275
+#: g10/keyserver.c:1329
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "subskribita per via �losilo %08lX je %s\n"
 
-#: g10/keyserver.c:1318
+#: g10/keyserver.c:1372
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "ser�as pri \"%s\" �e HKP-servilo %s\n"
 
-#: g10/keyserver.c:1321
+#: g10/keyserver.c:1375
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "ser�as pri \"%s\" �e HKP-servilo %s\n"
 
-#: g10/keyserver.c:1328 g10/keyserver.c:1424
+#: g10/keyserver.c:1382 g10/keyserver.c:1478
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "nevalida �losilaro"
 
-#: g10/keyserver.c:1376
+#: g10/keyserver.c:1430
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1439
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1446
+#: g10/keyserver.c:1500
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "neniu �losilservilo konata (uzu la opcion --keyserver)\n"
 
-#: g10/keyserver.c:1452
+#: g10/keyserver.c:1506
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1464
+#: g10/keyserver.c:1518
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1469
+#: g10/keyserver.c:1523
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1477
+#: g10/keyserver.c:1531
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1484
+#: g10/keyserver.c:1538
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "�losilservila eraro"
 
-#: g10/keyserver.c:1489
+#: g10/keyserver.c:1543
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "�losilservila eraro"
 
-#: g10/keyserver.c:1498
+#: g10/keyserver.c:1552
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
 
-#: g10/keyserver.c:1523 g10/keyserver.c:1557
+#: g10/keyserver.c:1577 g10/keyserver.c:1611
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s: ne valida �losilidentigilo\n"
 
-#: g10/keyserver.c:1814
+#: g10/keyserver.c:1868
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/keyserver.c:1836
+#: g10/keyserver.c:1890
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "petas la �losilon %08lX de HKP-�losilservilo %s ...\n"
 
-#: g10/keyserver.c:1838
+#: g10/keyserver.c:1892
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "petas la �losilon %08lX de HKP-�losilservilo %s ...\n"
 
-#: g10/keyserver.c:1903
+#: g10/keyserver.c:1957
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/keyserver.c:1909
+#: g10/keyserver.c:1963
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/mainproc.c:253
+#: g10/mainproc.c:240
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr ""
 
-#: g10/mainproc.c:304
+#: g10/mainproc.c:291
 #, fuzzy, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s-�ifritaj datenoj\n"
 
-#: g10/mainproc.c:314
+#: g10/mainproc.c:301
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "�ifrita per nekonata metodo %d\n"
 
-#: g10/mainproc.c:395
+#: g10/mainproc.c:382
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "publika �losilo estas %08lX\n"
 
-#: g10/mainproc.c:450
+#: g10/mainproc.c:439
 msgid "public key encrypted data: good DEK\n"
 msgstr "publik�losile �ifritaj datenoj: bona DEK\n"
 
-#: g10/mainproc.c:483
+#: g10/mainproc.c:472
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "�ifrita per %u-bita %s-�losilo, %08lX, kreita je %s\n"
 
-#: g10/mainproc.c:487 g10/pkclist.c:219
+#: g10/mainproc.c:476 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "            alinome \""
 
-#: g10/mainproc.c:491
+#: g10/mainproc.c:480
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "�ifrita per %s-�losilo, %08lX\n"
 
-#: g10/mainproc.c:505
+#: g10/mainproc.c:494
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "publik�losila mal�ifrado malsukcesis: %s\n"
 
-#: g10/mainproc.c:519
+#: g10/mainproc.c:508
 #, fuzzy, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "Ripetu pasfrazon\n"
 
-#: g10/mainproc.c:521
+#: g10/mainproc.c:510
 #, fuzzy
 msgid "encrypted with 1 passphrase\n"
 msgstr "Ripetu pasfrazon\n"
 
-#: g10/mainproc.c:549 g10/mainproc.c:571
+#: g10/mainproc.c:541 g10/mainproc.c:563
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "supozas %s �ifritajn datenojn\n"
 
-#: g10/mainproc.c:557
+#: g10/mainproc.c:549
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "�ifro IDEA ne disponata, optimisme provas uzi %s anstata�e\n"
 
-#: g10/mainproc.c:589
+#: g10/mainproc.c:581
 msgid "decryption okay\n"
 msgstr "mal�ifrado sukcesis\n"
 
-#: g10/mainproc.c:593
+#: g10/mainproc.c:585
 #, fuzzy
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVERTO: nenio estis eksportita\n"
 
-#: g10/mainproc.c:606
+#: g10/mainproc.c:598
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVERTO: �ifrita mesa�o estis manipulita!\n"
 
-#: g10/mainproc.c:612
+#: g10/mainproc.c:604
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "mal�ifrado malsukcesis: %s\n"
 
-#: g10/mainproc.c:631
+#: g10/mainproc.c:623
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTO: sendinto petis konfidencon (\"for-your-eyes-only\")\n"
 
-#: g10/mainproc.c:633
+#: g10/mainproc.c:625
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "originala dosiernomo='%.*s'\n"
 
-#: g10/mainproc.c:822
+#: g10/mainproc.c:815
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "memstara revoko - uzu \"gpg --import\" por apliki �in\n"
 
-#: g10/mainproc.c:1168
+#: g10/mainproc.c:1161
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Bona subskribo de \""
 
-#: g10/mainproc.c:1418
+#: g10/mainproc.c:1419
 msgid "signature verification suppressed\n"
 msgstr "kontrolo de subskribo estas mal�altita\n"
 
-#: g10/mainproc.c:1460 g10/mainproc.c:1470
-msgid "can't handle these multiple signatures\n"
+#: g10/mainproc.c:1519
+#, fuzzy
+msgid "can't handle this ambiguous signature data\n"
 msgstr "ne povas trakti �i tiujn pluroblajn subskribojn\n"
 
-#: g10/mainproc.c:1480
+#: g10/mainproc.c:1530
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/mainproc.c:1481
+#: g10/mainproc.c:1531
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "            alinome \""
 
-#: g10/mainproc.c:1485
+#: g10/mainproc.c:1535
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Subskribo farita je %.*s per %s, �losilo %08lX\n"
 
-#: g10/mainproc.c:1505
+#: g10/mainproc.c:1555
 #, fuzzy
 msgid "Key available at: "
 msgstr "Nenia helpo disponata"
 
-#: g10/mainproc.c:1639 g10/mainproc.c:1687
+#: g10/mainproc.c:1688 g10/mainproc.c:1736
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "MALBONA subskribo de \""
 
-#: g10/mainproc.c:1641 g10/mainproc.c:1689
+#: g10/mainproc.c:1690 g10/mainproc.c:1738
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Eksvalidi�inta subskribo de \""
 
-#: g10/mainproc.c:1643 g10/mainproc.c:1691
+#: g10/mainproc.c:1692 g10/mainproc.c:1740
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Bona subskribo de \""
 
-#: g10/mainproc.c:1695
+#: g10/mainproc.c:1744
 msgid "[uncertain]"
 msgstr "[malcerta]"
 
-#: g10/mainproc.c:1727
+#: g10/mainproc.c:1776
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "            alinome \""
 
-#: g10/mainproc.c:1824
+#: g10/mainproc.c:1873
 #, fuzzy, c-format
 msgid "Signature expired %s\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/mainproc.c:1829
+#: g10/mainproc.c:1878
 #, fuzzy, c-format
 msgid "Signature expires %s\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/mainproc.c:1832
+#: g10/mainproc.c:1881
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: g10/mainproc.c:1833
+#: g10/mainproc.c:1882
 #, fuzzy
 msgid "binary"
 msgstr "�efa"
 
-#: g10/mainproc.c:1834
+#: g10/mainproc.c:1883
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1834 g10/trustdb.c:536
+#: g10/mainproc.c:1883 g10/trustdb.c:536
 #, fuzzy
 msgid "unknown"
 msgstr "nekonata versio"
 
-#: g10/mainproc.c:1854
+#: g10/mainproc.c:1903
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Ne povas kontroli subskribon: %s\n"
 
-#: g10/mainproc.c:1922 g10/mainproc.c:1938 g10/mainproc.c:2024
+#: g10/mainproc.c:1972 g10/mainproc.c:1988 g10/mainproc.c:2074
 msgid "not a detached signature\n"
 msgstr "ne aparta subskribo\n"
 
-#: g10/mainproc.c:1965
+#: g10/mainproc.c:2015
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 
-#: g10/mainproc.c:1973
+#: g10/mainproc.c:2023
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "memstara subskribo de klaso 0x%02x\n"
 
-#: g10/mainproc.c:2030
+#: g10/mainproc.c:2080
 msgid "old style (PGP 2.x) signature\n"
 msgstr "malnovstila subskribo (PGP 2.x)\n"
 
-#: g10/mainproc.c:2040
+#: g10/mainproc.c:2090
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "nevalida radikpaketo trovita en proc_tree()\n"
 
@@ -5291,23 +5298,23 @@ msgstr "datenoj ne savitaj; uzu la opcion \"--output\" por savi ilin\n"
 msgid "error creating `%s': %s\n"
 msgstr "eraro dum kreado de '%s': %s\n"
 
-#: g10/plaintext.c:447
+#: g10/plaintext.c:453
 msgid "Detached signature.\n"
 msgstr "Aparta subskribo.\n"
 
-#: g10/plaintext.c:453
+#: g10/plaintext.c:459
 msgid "Please enter name of data file: "
 msgstr "Bonvolu doni la nomon de la dosiero: "
 
-#: g10/plaintext.c:485
+#: g10/plaintext.c:491
 msgid "reading stdin ...\n"
 msgstr "legas la normalan enigon ...\n"
 
-#: g10/plaintext.c:519
+#: g10/plaintext.c:525
 msgid "no signed data\n"
 msgstr "mankas subskribitaj datenoj\n"
 
-#: g10/plaintext.c:533
+#: g10/plaintext.c:539
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "ne povas malfermi subskribitan dosieron '%s'\n"
diff --git a/po/es.po b/po/es.po
index a99a02bce..8ca1c5288 100644
--- a/po/es.po
+++ b/po/es.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gnupg 1.4.1\n"
 "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2006-02-14 15:28+0100\n"
+"POT-Creation-Date: 2006-03-07 11:29+0100\n"
 "PO-Revision-Date: 2005-03-25 16:50+0100\n"
 "Last-Translator: Jaime Su�rez <jsuarez@ono.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -44,9 +44,9 @@ msgstr "escribiendo clave privada en `%s'\n"
 
 #: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:992 g10/gpg.c:3360 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:997 g10/gpg.c:3391 g10/import.c:193 g10/keygen.c:2274
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:476 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
+#: g10/plaintext.c:482 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
 #: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
@@ -86,7 +86,7 @@ msgstr "no se puede leer `%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "nota: el fichero de semillas aleatorias no se ha actualizado\n"
 
-#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:991 g10/keygen.c:2753
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2753
 #: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
 #: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
 #, c-format
@@ -675,11 +675,11 @@ msgstr "No se permiten 
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Orden inv�lida (pruebe \"help\")\n"
 
-#: g10/cardglue.c:435
+#: g10/cardglue.c:434
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr "Inserte la tarjeta y pulse Intro o escriba 'c' para cancelar: "
 
-#: g10/cardglue.c:572
+#: g10/cardglue.c:573
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
@@ -688,35 +688,35 @@ msgstr ""
 "Por favor retire la tarjeta actual e inserte la de n�mero de serie:\n"
 "   %.*s\n"
 
-#: g10/cardglue.c:580
+#: g10/cardglue.c:582
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr "Pulse Intro cuando est� listo"
 
-#: g10/cardglue.c:915
+#: g10/cardglue.c:917
 msgid "Enter New Admin PIN: "
 msgstr "Introduzca nuevo PIN de administrador: "
 
-#: g10/cardglue.c:916
+#: g10/cardglue.c:918
 msgid "Enter New PIN: "
 msgstr "Introduzca el nuevo PIN: "
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:919
 msgid "Enter Admin PIN: "
 msgstr "Introduzca PIN de administrador: "
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:920
 msgid "Enter PIN: "
 msgstr "Introduzca PIN: "
 
-#: g10/cardglue.c:935
+#: g10/cardglue.c:937
 msgid "Repeat this PIN: "
 msgstr "Repita este PIN: "
 
-#: g10/cardglue.c:950
+#: g10/cardglue.c:952
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN repetido incorrectamente; int�ntelo de nuevo"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3720 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3751 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -726,13 +726,13 @@ msgstr "no se puede abrir `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output no funciona con esta orden\n"
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1644
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1698
 #: g10/revoke.c:228
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "clave \"%s\" no encontrada: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1658
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1712
 #: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -845,12 +845,12 @@ msgstr "no puede usar %s en modo %s\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s cifrado para: \"%s\"\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:306
+#: g10/encr-data.c:67 g10/mainproc.c:293
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "datos cifrados %s\n"
 
-#: g10/encr-data.c:69 g10/mainproc.c:310
+#: g10/encr-data.c:69 g10/mainproc.c:297
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrado con algoritmo desconocido %d\n"
@@ -994,7 +994,7 @@ msgstr "ATENCI
 # S�, este no he podido ser yo :-) Por cierto, �por qu� la O no se
 # puede acentuar? �demasiado alta?
 # �Qui�n dice que no se puede? :-)
-#: g10/gpg.c:372
+#: g10/gpg.c:373
 msgid ""
 "@Commands:\n"
 " "
@@ -1002,127 +1002,127 @@ msgstr ""
 "@�rdenes:\n"
 " "
 
-#: g10/gpg.c:374
+#: g10/gpg.c:375
 msgid "|[file]|make a signature"
 msgstr "|[file]|crea una firma"
 
-#: g10/gpg.c:375
+#: g10/gpg.c:376
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|crea una firma en texto claro"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:377
 msgid "make a detached signature"
 msgstr "crea una firma separada"
 
-#: g10/gpg.c:377
+#: g10/gpg.c:378
 msgid "encrypt data"
 msgstr "cifra datos"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:380
 msgid "encryption only with symmetric cipher"
 msgstr "cifra s�lo con un cifrado sim�trico"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:382
 msgid "decrypt data (default)"
 msgstr "descifra datos (predefinido)"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:384
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:386
 msgid "list keys"
 msgstr "lista claves"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "list keys and signatures"
 msgstr "lista claves y firmas"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:389
 msgid "list and check key signatures"
 msgstr "lista y comprueba firmas de las claves"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:390
 msgid "list keys and fingerprints"
 msgstr "lista claves y huellas dactilares"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:391
 msgid "list secret keys"
 msgstr "lista claves secretas"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:392
 msgid "generate a new key pair"
 msgstr "genera un nuevo par de claves"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:393
 msgid "remove keys from the public keyring"
 msgstr "elimina claves del anillo p�blico"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:395
 msgid "remove keys from the secret keyring"
 msgstr "elimina claves del anillo privado"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:396
 msgid "sign a key"
 msgstr "firma la clave"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:397
 msgid "sign a key locally"
 msgstr "firma la clave localmente"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:398
 msgid "sign or edit a key"
 msgstr "firma o modifica una clave"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:399
 msgid "generate a revocation certificate"
 msgstr "genera un certificado de revocaci�n"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:401
 msgid "export keys"
 msgstr "exporta claves"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:402
 msgid "export keys to a key server"
 msgstr "exporta claves a un servidor de claves"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:403
 msgid "import keys from a key server"
 msgstr "importa claves desde un servidor de claves"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:405
 msgid "search for keys on a key server"
 msgstr "busca claves en un servidor de claves"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:407
 msgid "update all keys from a keyserver"
 msgstr "actualiza todas las claves desde un servidor de claves"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:411
 msgid "import/merge keys"
 msgstr "importa/fusiona claves"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:414
 msgid "print the card status"
 msgstr "escribir estado de la tarjeta"
 
-#: g10/gpg.c:414
+#: g10/gpg.c:415
 msgid "change data on a card"
 msgstr "cambiar datos en la tarjeta"
 
-#: g10/gpg.c:415
+#: g10/gpg.c:416
 msgid "change a card's PIN"
 msgstr "cambiar el PIN de la tarjeta"
 
-#: g10/gpg.c:423
+#: g10/gpg.c:424
 msgid "update the trust database"
 msgstr "actualiza la base de datos de confianza"
 
-#: g10/gpg.c:430
+#: g10/gpg.c:431
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheros]|imprime res�menes de mensaje"
 
-#: g10/gpg.c:434 g10/gpgv.c:71
+#: g10/gpg.c:435 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1132,47 +1132,47 @@ msgstr ""
 "Opciones:\n"
 " "
 
-#: g10/gpg.c:436
+#: g10/gpg.c:437
 msgid "create ascii armored output"
 msgstr "crea una salida ascii con armadura"
 
-#: g10/gpg.c:438
+#: g10/gpg.c:439
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOMBRE|cifra para NOMBRE"
 
-#: g10/gpg.c:449
+#: g10/gpg.c:450
 msgid "use this user-id to sign or decrypt"
 msgstr "usa este usuario para firmar o descifrar"
 
-#: g10/gpg.c:450
+#: g10/gpg.c:451
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|nivel de compresi�n N (0 no comprime)"
 
-#: g10/gpg.c:455
+#: g10/gpg.c:456
 msgid "use canonical text mode"
 msgstr "usa modo de texto can�nico"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:470
 msgid "use as output file"
 msgstr "usa como fichero de salida"
 
-#: g10/gpg.c:471 g10/gpgv.c:73
+#: g10/gpg.c:472 g10/gpgv.c:73
 msgid "verbose"
 msgstr "prolijo"
 
-#: g10/gpg.c:482
+#: g10/gpg.c:483
 msgid "do not make any changes"
 msgstr "no hace ning�n cambio"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:484
 msgid "prompt before overwriting"
 msgstr "preguntar antes de sobreescribir"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:525
 msgid "use strict OpenPGP behavior"
 msgstr "usar estilo OpenPGP estricto"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "generate PGP 2.x compatible messages"
 msgstr "generar mensajes compatibles con PGP 2.x"
 
@@ -1180,7 +1180,7 @@ msgstr "generar mensajes compatibles con PGP 2.x"
 # p�gina man -> p�gina de manual
 # Vale. �del manual mejor?
 # Hmm, no s�, en man-db se usa "de". La verdad es que no lo he pensado.
-#: g10/gpg.c:553
+#: g10/gpg.c:554
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1188,7 +1188,7 @@ msgstr ""
 "@\n"
 "(V�ase en la p�gina del manual la lista completo de �rdenes y opciones)\n"
 
-#: g10/gpg.c:556
+#: g10/gpg.c:557
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1208,15 +1208,15 @@ msgstr ""
 " --list-keys [nombres]      muestra las claves\n"
 " --fingerprint [nombres]    muestra las huellas dactilares\n"
 
-#: g10/gpg.c:746 g10/gpgv.c:98
+#: g10/gpg.c:751 g10/gpgv.c:98
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Por favor, informe de posibles \"bugs\" a <gnupg-bugs@gnu.org>.\n"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:768
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opciones] [ficheros] (-h para ayuda)"
 
-#: g10/gpg.c:766
+#: g10/gpg.c:771
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1226,7 +1226,7 @@ msgstr ""
 "firma, comprueba, cifra o descifra\n"
 "la operaci�n por defecto depende de los datos de entrada\n"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:782
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1234,71 +1234,71 @@ msgstr ""
 "\n"
 "Algoritmos disponibles:\n"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:785
 msgid "Pubkey: "
 msgstr "Clave p�blica: "
 
-#: g10/gpg.c:786 g10/keyedit.c:2266
+#: g10/gpg.c:791 g10/keyedit.c:2266
 msgid "Cipher: "
 msgstr "Cifrado: "
 
-#: g10/gpg.c:792
+#: g10/gpg.c:797
 msgid "Hash: "
 msgstr "Resumen: "
 
-#: g10/gpg.c:798 g10/keyedit.c:2312
+#: g10/gpg.c:803 g10/keyedit.c:2312
 msgid "Compression: "
 msgstr "Compresi�n: "
 
-#: g10/gpg.c:881
+#: g10/gpg.c:886
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opciones] "
 
-#: g10/gpg.c:1029
+#: g10/gpg.c:1034
 msgid "conflicting commands\n"
 msgstr "�rdenes incompatibles\n"
 
-#: g10/gpg.c:1047
+#: g10/gpg.c:1052
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "no se encontr� el signo = en la definici�n de grupo `%s'\n"
 
-#: g10/gpg.c:1244
+#: g10/gpg.c:1249
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "AVISO: propiedad insegura del directorio personal `%s'\n"
 
-#: g10/gpg.c:1247
+#: g10/gpg.c:1252
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "AVISO: propiedad insegura del fichero de configuraci�n `%s'\n"
 
-#: g10/gpg.c:1250
+#: g10/gpg.c:1255
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVISO: propiedad insegura de la extensi�n `%s'\n"
 
-#: g10/gpg.c:1256
+#: g10/gpg.c:1261
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "AVISO: permisos inseguros del directorio personal `%s'\n"
 
-#: g10/gpg.c:1259
+#: g10/gpg.c:1264
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "AVISO: permisos inseguros del fichero de configuraci�n `%s'\n"
 
-#: g10/gpg.c:1262
+#: g10/gpg.c:1267
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVISO: permisos inseguros de la extensi�n `%s'\n"
 
-#: g10/gpg.c:1268
+#: g10/gpg.c:1273
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "AVISO: propiedad insegura del directorio contenedor de `%s'\n"
 
-#: g10/gpg.c:1271
+#: g10/gpg.c:1276
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1306,18 +1306,18 @@ msgstr ""
 "AVISO: propiedad insegura del directorio contenedor del fichero de\n"
 "configuraci�n `%s'\n"
 
-#: g10/gpg.c:1274
+#: g10/gpg.c:1279
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "AVISO: propiedad insegura del directorio contenedor de la extensi�n `%s'\n"
 
-#: g10/gpg.c:1280
+#: g10/gpg.c:1285
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "AVISO: permisos inseguros del directorio contenedor de `%s'\n"
 
-#: g10/gpg.c:1283
+#: g10/gpg.c:1288
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1325,448 +1325,457 @@ msgstr ""
 "AVISO: permisos inseguros del directorio contenedor del fichero de\n"
 "configuraci�n `%s'\n"
 
-#: g10/gpg.c:1286
+#: g10/gpg.c:1291
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "AVISO: permisos inseguros del directorio contenedor de la extensi�n `%s'\n"
 
-#: g10/gpg.c:1427
+#: g10/gpg.c:1432
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "art�culo de configuraci�n desconocido `%s'\n"
 
-#: g10/gpg.c:1521
+#: g10/gpg.c:1526
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1523
+#: g10/gpg.c:1528
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1525
+#: g10/gpg.c:1530
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "No existe la firma correspondiente en el anillo secreto\n"
 
-#: g10/gpg.c:1527
+#: g10/gpg.c:1532
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1536
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1538
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "la URL del servidor de claves preferido no es v�lida\n"
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1540
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1542
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1544
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1546
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "muestra en qu� anillos est� una clave"
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1548
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "No existe la firma correspondiente en el anillo secreto\n"
 
-#: g10/gpg.c:1874
+#: g10/gpg.c:1879
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: se ignora el antiguo fichero de opciones predefinidas `%s'\n"
 
-#: g10/gpg.c:1916
+#: g10/gpg.c:1921
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: no existe el fichero de opciones predefinido `%s'\n"
 
-#: g10/gpg.c:1920
+#: g10/gpg.c:1925
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichero de opciones `%s': %s\n"
 
-#: g10/gpg.c:1927
+#: g10/gpg.c:1932
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "leyendo opciones desde `%s'\n"
 
-#: g10/gpg.c:2142 g10/gpg.c:2716 g10/gpg.c:2735
+#: g10/gpg.c:2147 g10/gpg.c:2747 g10/gpg.c:2766
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: �%s no es para uso normal!\n"
 
-#: g10/gpg.c:2158
+#: g10/gpg.c:2163
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "no se carga el cifrado de ampliaci�n `%s' por permisos inseguros\n"
 
-#: g10/gpg.c:2312 g10/gpg.c:2324
+#: g10/gpg.c:2317 g10/gpg.c:2329
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' no es un juego de caracteres v�lido\n"
 
-#: g10/gpg.c:2400
+#: g10/gpg.c:2405
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' no es un juego de caracteres v�lido\n"
 
-#: g10/gpg.c:2422 g10/keyedit.c:3997
+#: g10/gpg.c:2429 g10/keyedit.c:3997
 msgid "could not parse keyserver URL\n"
 msgstr "no se puede interpretar la URL del servidor de claves\n"
 
-#: g10/gpg.c:2428
+#: g10/gpg.c:2441
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opciones del servidor de claves inv�lidas\n"
 
-#: g10/gpg.c:2431
+#: g10/gpg.c:2444
 msgid "invalid keyserver options\n"
 msgstr "opciones del servidor de claves inv�lidas\n"
 
-#: g10/gpg.c:2438
+#: g10/gpg.c:2451
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opciones de importaci�n inv�lidas\n"
 
-#: g10/gpg.c:2441
+#: g10/gpg.c:2454
 msgid "invalid import options\n"
 msgstr "opciones de importaci�n inv�lidas\n"
 
-#: g10/gpg.c:2448
+#: g10/gpg.c:2461
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opciones de exportaci�n inv�lidas\n"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2464
 msgid "invalid export options\n"
 msgstr "opciones de exportaci�n inv�lidas\n"
 
-#: g10/gpg.c:2458
+#: g10/gpg.c:2471
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: lista de opciones inv�lida\n"
 
-#: g10/gpg.c:2461
+#: g10/gpg.c:2474
 msgid "invalid list options\n"
 msgstr "lista de opciones inv�lida\n"
 
-#: g10/gpg.c:2469
+#: g10/gpg.c:2482
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2471
+#: g10/gpg.c:2484
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2473
+#: g10/gpg.c:2486
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' no es un juego de caracteres v�lido\n"
 
-#: g10/gpg.c:2475
+#: g10/gpg.c:2488
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2479
+#: g10/gpg.c:2492
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2481
+#: g10/gpg.c:2494
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "la URL del servidor de claves preferido no es v�lida\n"
 
-#: g10/gpg.c:2483
+#: g10/gpg.c:2496
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' no es un juego de caracteres v�lido\n"
 
-#: g10/gpg.c:2485
+#: g10/gpg.c:2498
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2505
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opciones de verificaci�n inv�lidas\n"
 
-#: g10/gpg.c:2495
+#: g10/gpg.c:2508
 msgid "invalid verify options\n"
 msgstr "opciones de verificaci�n inv�lidas\n"
 
-#: g10/gpg.c:2502
+#: g10/gpg.c:2515
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "imposible establecer camino de ejecutables %s\n"
 
-#: g10/gpg.c:2705
+#: g10/gpg.c:2665
+#, fuzzy, c-format
+msgid "%s:%d: invalid auto-key-locate list\n"
+msgstr "%s:%d: opciones de verificaci�n inv�lidas\n"
+
+#: g10/gpg.c:2668
+msgid "invalid auto-key-locate list\n"
+msgstr ""
+
+#: g10/gpg.c:2736
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATENCI�N: �el programa podr�a volcar un fichero core!\n"
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2740
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s sustituye a %s\n"
 
-#: g10/gpg.c:2718
+#: g10/gpg.c:2749
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�%s no permitido con %s!\n"
 
-#: g10/gpg.c:2721
+#: g10/gpg.c:2752
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�%s no tiene sentido con %s!\n"
 
-#: g10/gpg.c:2728
+#: g10/gpg.c:2759
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "el agente gpg no esta disponible en esta sesi�n\n"
 
-#: g10/gpg.c:2743
+#: g10/gpg.c:2774
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "no se ejecutar� en memoria insegura por %s\n"
 
-#: g10/gpg.c:2757
+#: g10/gpg.c:2788
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "s�lo puede hacer firmas separadas o en claro en modo --pgp2\n"
 
-#: g10/gpg.c:2763
+#: g10/gpg.c:2794
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "no puede firmar y cifrar a la vez en modo --pgp2\n"
 
-#: g10/gpg.c:2769
+#: g10/gpg.c:2800
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "debe usar ficheros (no tuber�as) si trabaja con --pgp2 activo.\n"
 
-#: g10/gpg.c:2782
+#: g10/gpg.c:2813
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "cifrar un mensaje en modo --pgp2 requiere el algoritmo IDEA\n"
 
-#: g10/gpg.c:2849 g10/gpg.c:2873
+#: g10/gpg.c:2880 g10/gpg.c:2904
 msgid "selected cipher algorithm is invalid\n"
 msgstr "el algoritmo de cifrado seleccionado es inv�lido\n"
 
-#: g10/gpg.c:2855 g10/gpg.c:2879
+#: g10/gpg.c:2886 g10/gpg.c:2910
 msgid "selected digest algorithm is invalid\n"
 msgstr "el algoritmo de resumen seleccionado no inv�lido\n"
 
-#: g10/gpg.c:2861
+#: g10/gpg.c:2892
 msgid "selected compression algorithm is invalid\n"
 msgstr "el algoritmo de compresi�n seleccionado es inv�lido\n"
 
-#: g10/gpg.c:2867
+#: g10/gpg.c:2898
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "el algoritmo de certificaci�n por resumen elegido es inv�lido\n"
 
-#: g10/gpg.c:2882
+#: g10/gpg.c:2913
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser mayor que 0\n"
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2915
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser mayor que 1\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2917
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth debe estar en el rango de 1 a 255\n"
 
-#: g10/gpg.c:2888
+#: g10/gpg.c:2919
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-cert-level inv�lido; debe ser 0, 1, 2, � 3\n"
 
-#: g10/gpg.c:2890
+#: g10/gpg.c:2921
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "min-cert-level inv�lido; debe ser 0, 1, 2, � 3\n"
 
-#: g10/gpg.c:2893
+#: g10/gpg.c:2924
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: el modo S2K simple (0) no es nada recomendable\n"
 
-#: g10/gpg.c:2897
+#: g10/gpg.c:2928
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K incorrecto; debe ser 0, 1 o 3\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2935
 msgid "invalid default preferences\n"
 msgstr "preferencias por defecto inv�lidas\n"
 
-#: g10/gpg.c:2913
+#: g10/gpg.c:2944
 msgid "invalid personal cipher preferences\n"
 msgstr "preferencias personales de cifrado inv�lidas\n"
 
-#: g10/gpg.c:2917
+#: g10/gpg.c:2948
 msgid "invalid personal digest preferences\n"
 msgstr "preferencias personales de algoritmo de resumen inv�lidas\n"
 
-#: g10/gpg.c:2921
+#: g10/gpg.c:2952
 msgid "invalid personal compress preferences\n"
 msgstr "preferencias personales de compresi�n inv�lidas\n"
 
-#: g10/gpg.c:2954
+#: g10/gpg.c:2985
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s a�n no funciona con %s\n"
 
-#: g10/gpg.c:3001
+#: g10/gpg.c:3032
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "no puede usar el cifrado `%s' en modo %s\n"
 
-#: g10/gpg.c:3006
+#: g10/gpg.c:3037
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "no puede usar el resumen `%s' en modo %s\n"
 
-#: g10/gpg.c:3011
+#: g10/gpg.c:3042
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "no puede usar la compresi�n `%s' en modo %s\n"
 
-#: g10/gpg.c:3107
+#: g10/gpg.c:3138
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicializaci�n de la base de datos de confianza fallida: %s\n"
 
-#: g10/gpg.c:3118
+#: g10/gpg.c:3149
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "AVISO: se indicaron receptores (-r) sin clave p�blica de cifrado\n"
 
-#: g10/gpg.c:3129
+#: g10/gpg.c:3160
 msgid "--store [filename]"
 msgstr "--store [nombre_fichero]"
 
-#: g10/gpg.c:3136
+#: g10/gpg.c:3167
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nombre_fichero]"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3169
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "el cifrado sim�trico de `%s' fall�: %s\n"
 
-#: g10/gpg.c:3148
+#: g10/gpg.c:3179
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3192
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3194
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "no puede usar --symetric --encrypt con --s2k-mode 0\n"
 
-#: g10/gpg.c:3166
+#: g10/gpg.c:3197
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "no puede usar --symetric --encrypt en modo %s\n"
 
-#: g10/gpg.c:3184
+#: g10/gpg.c:3215
 msgid "--sign [filename]"
 msgstr "--sign [nombre_fichero]"
 
-#: g10/gpg.c:3197
+#: g10/gpg.c:3228
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3212
+#: g10/gpg.c:3243
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3214
+#: g10/gpg.c:3245
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "no puede usar --symetric --sign --encrypt con --s2k-mode 0\n"
 
-#: g10/gpg.c:3217
+#: g10/gpg.c:3248
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "no puede usar --symmetric --sign --encrypt en modo %s\n"
 
-#: g10/gpg.c:3237
+#: g10/gpg.c:3268
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nombre_fichero]"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3277
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nombre_fichero]"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3302
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nombre_fichero]"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3310
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usuario"
 
-#: g10/gpg.c:3283
+#: g10/gpg.c:3314
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usuario"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3335
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usuario [�rdenes]"
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3406
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-usuario] [anillo]"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3443
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "env�o al servidor de claves fallido: %s\n"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3445
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "recepci�n del servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3447
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "exportaci�n de clave fallida: %s\n"
 
-#: g10/gpg.c:3427
+#: g10/gpg.c:3458
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "b�squeda del servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:3437
+#: g10/gpg.c:3468
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "renovaci�n al servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:3488
+#: g10/gpg.c:3519
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminaci�n de armadura fallida: %s\n"
 
-#: g10/gpg.c:3496
+#: g10/gpg.c:3527
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creaci�n de armadura fallida: %s\n"
 
-#: g10/gpg.c:3583
+#: g10/gpg.c:3614
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de distribuci�n inv�lido `%s'\n"
 
-#: g10/gpg.c:3706
+#: g10/gpg.c:3737
 msgid "[filename]"
 msgstr "[nombre_fichero]"
 
@@ -1774,11 +1783,11 @@ msgstr "[nombre_fichero]"
 # En espa�ol no se deja espacio antes de los puntos suspensivos
 # (Real Academia dixit) :)
 # Tomo nota :-). Este comentario d�jalo siempre.
-#: g10/gpg.c:3710
+#: g10/gpg.c:3741
 msgid "Go ahead and type your message ...\n"
 msgstr "Adelante, teclee su mensaje...\n"
 
-#: g10/gpg.c:4000
+#: g10/gpg.c:4031
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1786,28 +1795,28 @@ msgstr ""
 "un nombre de notaci�n debe tener s�lo caracteres imprimibles o espacios, y "
 "acabar con un '='\n"
 
-#: g10/gpg.c:4008
+#: g10/gpg.c:4039
 msgid "a user notation name must contain the '@' character\n"
 msgstr "un nombre de notaci�n de usuario debe contener el caracter '@'\n"
 
-#: g10/gpg.c:4013
+#: g10/gpg.c:4044
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "un nombre de notaci�n de usuario debe contener el caracter '@'\n"
 
-#: g10/gpg.c:4024
+#: g10/gpg.c:4055
 msgid "a notation value must not use any control characters\n"
 msgstr "un valor de notaci�n no debe usar ning�n caracter de control\n"
 
-#: g10/gpg.c:4058
+#: g10/gpg.c:4089
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL de pol�tica de certificado inv�lida\n"
 
-#: g10/gpg.c:4060
+#: g10/gpg.c:4091
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL de pol�tica inv�lida\n"
 
-#: g10/gpg.c:4093
+#: g10/gpg.c:4124
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la URL del servidor de claves preferido no es v�lida\n"
 
@@ -1815,31 +1824,32 @@ msgstr "la URL del servidor de claves preferido no es v
 msgid "too many entries in pk cache - disabled\n"
 msgstr "demasiados registros en la cache pk - anulada\n"
 
-#: g10/getkey.c:188 g10/getkey.c:2845
+#: g10/getkey.c:188 g10/getkey.c:2876
 msgid "[User ID not found]"
 msgstr "[ID de usuario no encontrado]"
 
-#: g10/getkey.c:931 g10/getkey.c:953 g10/getkey.c:976
+#: g10/getkey.c:933 g10/getkey.c:950 g10/getkey.c:970 g10/getkey.c:986
+#: g10/getkey.c:1001
 #, c-format
 msgid "Automatically retrieved `%s' via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1769
+#: g10/getkey.c:1800
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Clave %s inv�lida hecha v�lida mediante --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2323
+#: g10/getkey.c:2354
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "no hay subclave secreta para la subclave p�blica %s - ignorada\n"
 
-#: g10/getkey.c:2554
+#: g10/getkey.c:2585
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "usando subclave %s en vez de clave primaria %s\n"
 
-#: g10/getkey.c:2601
+#: g10/getkey.c:2632
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "clave %s: clave secreta sin clave p�blica - omitida\n"
@@ -3364,12 +3374,12 @@ msgid "(sensitive)"
 msgstr "(confidencial)"
 
 #: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
-#: g10/keylist.c:194 g10/keyserver.c:471
+#: g10/keylist.c:194 g10/keyserver.c:525
 #, c-format
 msgid "created: %s"
 msgstr "creado: %s"
 
-#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:967
+#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:960
 #, c-format
 msgid "revoked: %s"
 msgstr "revocada: %s"
@@ -3381,7 +3391,7 @@ msgstr "caduc
 
 #: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
 #: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:477 g10/mainproc.c:973
+#: g10/keylist.c:914 g10/keyserver.c:531 g10/mainproc.c:966
 #, c-format
 msgid "expires: %s"
 msgstr "caduca: %s"
@@ -3417,13 +3427,13 @@ msgstr ""
 "Por favor, advierta que la validez de clave mostrada no es necesariamente\n"
 "correcta a menos de que reinicie el programa.\n"
 
-#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:481
-#: g10/mainproc.c:1734 g10/trustdb.c:1184 g10/trustdb.c:1704
+#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:535
+#: g10/mainproc.c:1783 g10/trustdb.c:1184 g10/trustdb.c:1704
 msgid "revoked"
 msgstr "revocada"
 
-#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:485
-#: g10/mainproc.c:1736 g10/trustdb.c:537 g10/trustdb.c:1706
+#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:539
+#: g10/mainproc.c:1785 g10/trustdb.c:537 g10/trustdb.c:1706
 msgid "expired"
 msgstr "caducada"
 
@@ -4246,388 +4256,385 @@ msgstr "%s: anillo creado\n"
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:77
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:81
+#: g10/keyserver.c:79
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:83
+#: g10/keyserver.c:81
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:87
+#: g10/keyserver.c:85
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:89
-msgid "automatically retrieve keys from PKA records"
-msgstr ""
-
-#: g10/keyserver.c:91
-msgid "automatically retrieve keys from DNS"
-msgstr ""
-
-#: g10/keyserver.c:95
+#: g10/keyserver.c:87
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "Introduzca la URL de su servidor de claves preferido: "
 
-#: g10/keyserver.c:139
+#: g10/keyserver.c:89
+msgid "honor the PKA record set on a key when retrieving keys"
+msgstr ""
+
+#: g10/keyserver.c:154
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "AVISO: las opciones de servidor de claves `%s' no se usan en esta "
 "plataforma\n"
 
-#: g10/keyserver.c:483
+#: g10/keyserver.c:537
 msgid "disabled"
 msgstr "deshabilitado"
 
-#: g10/keyserver.c:684
+#: g10/keyserver.c:738
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Introduzca n�mero(s), O)tro, o F)in >"
 
-#: g10/keyserver.c:767 g10/keyserver.c:1368
+#: g10/keyserver.c:821 g10/keyserver.c:1422
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "protocolo del servidor de claves inv�lido (us %d!=handler %d)\n"
 
-#: g10/keyserver.c:865
+#: g10/keyserver.c:919
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "clave \"%s\" no encontrada en el servidor\n"
 
-#: g10/keyserver.c:867
+#: g10/keyserver.c:921
 msgid "key not found on keyserver\n"
 msgstr "clave no encontrada en el servidor\n"
 
-#: g10/keyserver.c:1092
+#: g10/keyserver.c:1146
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "solicitando clave %s de %s servidor %s\n"
 
-#: g10/keyserver.c:1096
+#: g10/keyserver.c:1150
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "solicitando clave %s de %s\n"
 
-#: g10/keyserver.c:1120
+#: g10/keyserver.c:1174
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "buscando \"%s\" de %s servidor %s\n"
 
-#: g10/keyserver.c:1123
+#: g10/keyserver.c:1177
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "buscando \"%s\" de %s\n"
 
-#: g10/keyserver.c:1271
+#: g10/keyserver.c:1325
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "enviando clave %s a %s servidor %s\n"
 
-#: g10/keyserver.c:1275
+#: g10/keyserver.c:1329
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "enviando clave %s a %s\n"
 
-#: g10/keyserver.c:1318
+#: g10/keyserver.c:1372
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "buscando \"%s\" de %s servidor %s\n"
 
-#: g10/keyserver.c:1321
+#: g10/keyserver.c:1375
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "buscando \"%s\" de %s\n"
 
-#: g10/keyserver.c:1328 g10/keyserver.c:1424
+#: g10/keyserver.c:1382 g10/keyserver.c:1478
 msgid "no keyserver action!\n"
 msgstr "�no se solicita ninguna acci�n al servidor de claves!\n"
 
-#: g10/keyserver.c:1376
+#: g10/keyserver.c:1430
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 "AVISO: el manejo de claves procede de una versi�n diferente de GnuPG (%s)\n"
 
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1439
 msgid "keyserver did not send VERSION\n"
 msgstr "el servidor de claves no envi� VERSION\n"
 
-#: g10/keyserver.c:1446
+#: g10/keyserver.c:1500
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "no hay servidores de claves conocidos (use opci�n --keyserver)\n"
 
-#: g10/keyserver.c:1452
+#: g10/keyserver.c:1506
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 "no se pueden realizar llamadas a un servidor externo de claves tal y\n"
 "como est� compilado el programa\n"
 
-#: g10/keyserver.c:1464
+#: g10/keyserver.c:1518
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "no hay un manejador para ese esquema de servidor de claves `%s'\n"
 
-#: g10/keyserver.c:1469
+#: g10/keyserver.c:1523
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 "la acci�n `%s' no es posible con este esquema de servidor de claves `%s'\n"
 
-#: g10/keyserver.c:1477
+#: g10/keyserver.c:1531
 #, fuzzy, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "gpgkeys_%s no permite usar la versi�n %d del manejador\n"
 
-#: g10/keyserver.c:1484
+#: g10/keyserver.c:1538
 msgid "keyserver timed out\n"
 msgstr "agotado el tiempo de espera para el servidor de claves\n"
 
-#: g10/keyserver.c:1489
+#: g10/keyserver.c:1543
 msgid "keyserver internal error\n"
 msgstr "error interno del servidor de claves\n"
 
-#: g10/keyserver.c:1498
+#: g10/keyserver.c:1552
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "error de comunicaci�n con el servidor de claves: %s\n"
 
-#: g10/keyserver.c:1523 g10/keyserver.c:1557
+#: g10/keyserver.c:1577 g10/keyserver.c:1611
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" no es un identificador de clave v�lido: omitido\n"
 
-#: g10/keyserver.c:1814
+#: g10/keyserver.c:1868
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "AVISO: no se puede renovar la clave %s a traves de %s: %s\n"
 
-#: g10/keyserver.c:1836
+#: g10/keyserver.c:1890
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "renovando 1 clave de %s\n"
 
-#: g10/keyserver.c:1838
+#: g10/keyserver.c:1892
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "renovando %d claves desde %s\n"
 
-#: g10/keyserver.c:1903
+#: g10/keyserver.c:1957
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "AVISO: no se puede renovar la clave %s a traves de %s: %s\n"
 
-#: g10/keyserver.c:1909
+#: g10/keyserver.c:1963
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "AVISO: no se puede renovar la clave %s a traves de %s: %s\n"
 
-#: g10/mainproc.c:253
+#: g10/mainproc.c:240
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "tama�o anormal para una clave de sesi�n cifrada (%d)\n"
 
-#: g10/mainproc.c:304
+#: g10/mainproc.c:291
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s clave de sesi�n cifrada\n"
 
-#: g10/mainproc.c:314
+#: g10/mainproc.c:301
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "frase contrase�a generada con algoritmo de resumen desconocido %d\n"
 
-#: g10/mainproc.c:395
+#: g10/mainproc.c:382
 #, c-format
 msgid "public key is %s\n"
 msgstr "la clave p�blica es %s\n"
 
-#: g10/mainproc.c:450
+#: g10/mainproc.c:439
 msgid "public key encrypted data: good DEK\n"
 msgstr "datos cifrados con la clave p�blica: DEK correcta\n"
 
-#: g10/mainproc.c:483
+#: g10/mainproc.c:472
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "cifrado con clave %2$s de %1$u bits, ID %3$s, creada el %4$s\n"
 
-#: g10/mainproc.c:487 g10/pkclist.c:219
+#: g10/mainproc.c:476 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:491
+#: g10/mainproc.c:480
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "cifrado con clave %s, ID %s\n"
 
-#: g10/mainproc.c:505
+#: g10/mainproc.c:494
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "descifrado de la clave p�blica fallido: %s\n"
 
-#: g10/mainproc.c:519
+#: g10/mainproc.c:508
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "cifrado con %lu frases contrase�a\n"
 
-#: g10/mainproc.c:521
+#: g10/mainproc.c:510
 msgid "encrypted with 1 passphrase\n"
 msgstr "cifrado con 1 frase contrase�a\n"
 
-#: g10/mainproc.c:549 g10/mainproc.c:571
+#: g10/mainproc.c:541 g10/mainproc.c:563
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "suponiendo %s datos cifrados\n"
 
-#: g10/mainproc.c:557
+#: g10/mainproc.c:549
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "cifrado IDEA no disponible, confiadamente intentamos usar %s en su lugar\n"
 
-#: g10/mainproc.c:589
+#: g10/mainproc.c:581
 msgid "decryption okay\n"
 msgstr "descifrado correcto\n"
 
-#: g10/mainproc.c:593
+#: g10/mainproc.c:585
 msgid "WARNING: message was not integrity protected\n"
 msgstr "ATENCI�N: la intgridad del mensaje no est� protegida\n"
 
-#: g10/mainproc.c:606
+#: g10/mainproc.c:598
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATENCI�N: �el mensaje cifrado ha sido manipulado!\n"
 
-#: g10/mainproc.c:612
+#: g10/mainproc.c:604
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "descifrado fallido: %s\n"
 
-#: g10/mainproc.c:631
+#: g10/mainproc.c:623
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: el remitente solicit� \"s�lo-para-tus-ojos\"\n"
 
-#: g10/mainproc.c:633
+#: g10/mainproc.c:625
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nombre fichero original='%.*s'\n"
 
-#: g10/mainproc.c:822
+#: g10/mainproc.c:815
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocaci�n independiente - use \"gpg --import\" para aplicarla\n"
 
-#: g10/mainproc.c:1168
+#: g10/mainproc.c:1161
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Firma correcta de \"%s\""
 
-#: g10/mainproc.c:1418
+#: g10/mainproc.c:1419
 msgid "signature verification suppressed\n"
 msgstr "suprimida la verificaci�n de la firma\n"
 
-#: g10/mainproc.c:1460 g10/mainproc.c:1470
-msgid "can't handle these multiple signatures\n"
+#: g10/mainproc.c:1519
+#, fuzzy
+msgid "can't handle this ambiguous signature data\n"
 msgstr "no se puede trabajar con firmas m�ltiples\n"
 
-#: g10/mainproc.c:1480
+#: g10/mainproc.c:1530
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Firmado el %s\n"
 
-#: g10/mainproc.c:1481
+#: g10/mainproc.c:1531
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               usando %s clave %s\n"
 
-#: g10/mainproc.c:1485
+#: g10/mainproc.c:1535
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Firmado el %s usando clave %s ID %s\n"
 
-#: g10/mainproc.c:1505
+#: g10/mainproc.c:1555
 msgid "Key available at: "
 msgstr "Clave disponible en: "
 
-#: g10/mainproc.c:1639 g10/mainproc.c:1687
+#: g10/mainproc.c:1688 g10/mainproc.c:1736
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Firma INCORRECTA de \"%s\""
 
-#: g10/mainproc.c:1641 g10/mainproc.c:1689
+#: g10/mainproc.c:1690 g10/mainproc.c:1738
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Firma caducada de \"%s\""
 
-#: g10/mainproc.c:1643 g10/mainproc.c:1691
+#: g10/mainproc.c:1692 g10/mainproc.c:1740
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Firma correcta de \"%s\""
 
-#: g10/mainproc.c:1695
+#: g10/mainproc.c:1744
 msgid "[uncertain]"
 msgstr "[incierto]"
 
-#: g10/mainproc.c:1727
+#: g10/mainproc.c:1776
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                alias \"%s\""
 
-#: g10/mainproc.c:1824
+#: g10/mainproc.c:1873
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Firma caducada en %s\n"
 
-#: g10/mainproc.c:1829
+#: g10/mainproc.c:1878
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "La firma caduca el %s\n"
 
-#: g10/mainproc.c:1832
+#: g10/mainproc.c:1881
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "firma %s, algoritmo de resumen %s\n"
 
-#: g10/mainproc.c:1833
+#: g10/mainproc.c:1882
 msgid "binary"
 msgstr "binaria"
 
-#: g10/mainproc.c:1834
+#: g10/mainproc.c:1883
 msgid "textmode"
 msgstr "modotexto"
 
-#: g10/mainproc.c:1834 g10/trustdb.c:536
+#: g10/mainproc.c:1883 g10/trustdb.c:536
 msgid "unknown"
 msgstr "desconocido"
 
-#: g10/mainproc.c:1854
+#: g10/mainproc.c:1903
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposible comprobar la firma: %s\n"
 
-#: g10/mainproc.c:1922 g10/mainproc.c:1938 g10/mainproc.c:2024
+#: g10/mainproc.c:1972 g10/mainproc.c:1988 g10/mainproc.c:2074
 msgid "not a detached signature\n"
 msgstr "no es una firma separada\n"
 
-#: g10/mainproc.c:1965
+#: g10/mainproc.c:2015
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "AVISO: detectadas m�ltiples firmas. S�lo la primera se comprueba.\n"
 
-#: g10/mainproc.c:1973
+#: g10/mainproc.c:2023
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "firma independiente de clase 0x%02x\n"
 
-#: g10/mainproc.c:2030
+#: g10/mainproc.c:2080
 msgid "old style (PGP 2.x) signature\n"
 msgstr "firma al viejo estilo (PGP 2.x)\n"
 
-#: g10/mainproc.c:2040
+#: g10/mainproc.c:2090
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquete ra�z inv�lido detectado en proc_tree()\n"
 
@@ -5180,23 +5187,23 @@ msgstr "datos no grabados; use la opci
 msgid "error creating `%s': %s\n"
 msgstr "error creando `%s': %s\n"
 
-#: g10/plaintext.c:447
+#: g10/plaintext.c:453
 msgid "Detached signature.\n"
 msgstr "Firma separada.\n"
 
-#: g10/plaintext.c:453
+#: g10/plaintext.c:459
 msgid "Please enter name of data file: "
 msgstr "Introduzca el nombre del fichero de datos: "
 
-#: g10/plaintext.c:485
+#: g10/plaintext.c:491
 msgid "reading stdin ...\n"
 msgstr "leyendo stdin...\n"
 
-#: g10/plaintext.c:519
+#: g10/plaintext.c:525
 msgid "no signed data\n"
 msgstr "no hay datos firmados\n"
 
-#: g10/plaintext.c:533
+#: g10/plaintext.c:539
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "imposible abrir datos firmados `%s'\n"
diff --git a/po/et.po b/po/et.po
index 1c1a47488..b9485a5a8 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2006-02-14 15:28+0100\n"
+"POT-Creation-Date: 2006-03-07 11:29+0100\n"
 "PO-Revision-Date: 2004-06-17 11:04+0300\n"
 "Last-Translator: Toomas Soome <Toomas.Soome@microlink.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -40,9 +40,9 @@ msgstr "kirjutan salajase v
 
 #: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:992 g10/gpg.c:3360 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:997 g10/gpg.c:3391 g10/import.c:193 g10/keygen.c:2274
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:476 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
+#: g10/plaintext.c:482 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
 #: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
@@ -76,7 +76,7 @@ msgstr "`%s' ei 
 msgid "note: random_seed file not updated\n"
 msgstr "m�rkus: random_seed faili ei uuendatud\n"
 
-#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:991 g10/keygen.c:2753
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2753
 #: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
 #: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
 #, c-format
@@ -691,48 +691,48 @@ msgstr "kirjutan salajase v
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Vigane k�sklus (proovige \"help\")\n"
 
-#: g10/cardglue.c:435
+#: g10/cardglue.c:434
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:572
+#: g10/cardglue.c:573
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:580
+#: g10/cardglue.c:582
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:915
+#: g10/cardglue.c:917
 msgid "Enter New Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:916
+#: g10/cardglue.c:918
 msgid "Enter New PIN: "
 msgstr ""
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:919
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:920
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/cardglue.c:935
+#: g10/cardglue.c:937
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Korrake parooli: "
 
-#: g10/cardglue.c:950
+#: g10/cardglue.c:952
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "parooli ei korratud �ieti; proovige uuesti"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3720 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3751 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -742,13 +742,13 @@ msgstr "`%s' ei 
 msgid "--output doesn't work for this command\n"
 msgstr "v�ti --output ei t��ta selle k�suga\n"
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1644
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1698
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "v�tit '%s' ei leitud: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1658
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1712
 #: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -861,12 +861,12 @@ msgstr "%s ei ole moodis %s lubatud.\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s kr�ptitud kasutajale: \"%s\"\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:306
+#: g10/encr-data.c:67 g10/mainproc.c:293
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s kr�pteeritud andmed\n"
 
-#: g10/encr-data.c:69 g10/mainproc.c:310
+#: g10/encr-data.c:69 g10/mainproc.c:297
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "kr�pteeritud tundmatu algoritmiga %d\n"
@@ -1011,7 +1011,7 @@ msgstr "HOIATUS: salajases v
 msgid "WARNING: nothing exported\n"
 msgstr "HOIATUS: midagi ei eksporditud\n"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:373
 msgid ""
 "@Commands:\n"
 " "
@@ -1019,128 +1019,128 @@ msgstr ""
 "@K�sud:\n"
 " "
 
-#: g10/gpg.c:374
+#: g10/gpg.c:375
 msgid "|[file]|make a signature"
 msgstr "|[fail]|loo allkiri"
 
-#: g10/gpg.c:375
+#: g10/gpg.c:376
 msgid "|[file]|make a clear text signature"
 msgstr "|[fail]|loo avateksti allkiri"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:377
 msgid "make a detached signature"
 msgstr "loo eraldiseisev allkiri"
 
-#: g10/gpg.c:377
+#: g10/gpg.c:378
 msgid "encrypt data"
 msgstr "kr�pteeri andmed"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:380
 msgid "encryption only with symmetric cipher"
 msgstr "kr�pteerimine kasutades ainult s�mmeetrilist �ifrit"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:382
 msgid "decrypt data (default)"
 msgstr "dekr�pteeri andmed (vaikimisi)"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:384
 msgid "verify a signature"
 msgstr "kontrolli allkirja"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:386
 msgid "list keys"
 msgstr "n�ita v�tmeid"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "list keys and signatures"
 msgstr "n�ita v�tmeid ja allkirju"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:389
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "kontrolli v�tmete allkirju"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:390
 msgid "list keys and fingerprints"
 msgstr "n�ita v�tmeid ja s�rmej�lgi"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:391
 msgid "list secret keys"
 msgstr "n�ita salajasi v�tmeid"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:392
 msgid "generate a new key pair"
 msgstr "genereeri uus v�tmepaar"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:393
 msgid "remove keys from the public keyring"
 msgstr "eemalda v�tmed avalike v�tmete hoidlast"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:395
 msgid "remove keys from the secret keyring"
 msgstr "eemalda v�tmed salajaste v�tmete hoidlast"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:396
 msgid "sign a key"
 msgstr "allkirjasta v�ti"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:397
 msgid "sign a key locally"
 msgstr "allkirjasta v�ti lokaalselt"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:398
 msgid "sign or edit a key"
 msgstr "allkirjasta v�i toimeta v�tit"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:399
 msgid "generate a revocation certificate"
 msgstr "genereeri t�histamise sertifikaat"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:401
 msgid "export keys"
 msgstr "ekspordi v�tmed"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:402
 msgid "export keys to a key server"
 msgstr "ekspordi v�tmed v�tmeserverisse"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:403
 msgid "import keys from a key server"
 msgstr "impordi v�tmed v�tmeserverist"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:405
 msgid "search for keys on a key server"
 msgstr "otsi v�tmeid v�tmeserverist"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:407
 msgid "update all keys from a keyserver"
 msgstr "uuenda v�tmeid v�tmeserverist"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:411
 msgid "import/merge keys"
 msgstr "impordi/mesti v�tmed"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:414
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:414
+#: g10/gpg.c:415
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:415
+#: g10/gpg.c:416
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:423
+#: g10/gpg.c:424
 msgid "update the trust database"
 msgstr "uuenda usalduse andmebaasi"
 
-#: g10/gpg.c:430
+#: g10/gpg.c:431
 msgid "|algo [files]|print message digests"
 msgstr "|algo [failid]|tr�ki teatel�hendid"
 
-#: g10/gpg.c:434 g10/gpgv.c:71
+#: g10/gpg.c:435 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1150,51 +1150,51 @@ msgstr ""
 "V�tmed:\n"
 " "
 
-#: g10/gpg.c:436
+#: g10/gpg.c:437
 msgid "create ascii armored output"
 msgstr "loo ascii pakendis v�ljund"
 
-#: g10/gpg.c:438
+#: g10/gpg.c:439
 msgid "|NAME|encrypt for NAME"
 msgstr "|NIMI|kr�pti NIMEle"
 
-#: g10/gpg.c:449
+#: g10/gpg.c:450
 msgid "use this user-id to sign or decrypt"
 msgstr "kasuta seda kasutaja IDd"
 
-#: g10/gpg.c:450
+#: g10/gpg.c:451
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|m��ra pakkimise tase N (0 blokeerib)"
 
-#: g10/gpg.c:455
+#: g10/gpg.c:456
 msgid "use canonical text mode"
 msgstr "kasuta kanoonilist tekstimoodi"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:470
 msgid "use as output file"
 msgstr "kasuta v�ljundfailina"
 
-#: g10/gpg.c:471 g10/gpgv.c:73
+#: g10/gpg.c:472 g10/gpgv.c:73
 msgid "verbose"
 msgstr "ole jutukas"
 
-#: g10/gpg.c:482
+#: g10/gpg.c:483
 msgid "do not make any changes"
 msgstr "�ra tee mingeid muutusi"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:484
 msgid "prompt before overwriting"
 msgstr "k�si enne �lekirjutamist"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:525
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:553
+#: g10/gpg.c:554
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1202,7 +1202,7 @@ msgstr ""
 "@\n"
 "(K�ikide k�skude ja v�tmete t�ieliku kirjelduse leiate manualist)\n"
 
-#: g10/gpg.c:556
+#: g10/gpg.c:557
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1222,15 +1222,15 @@ msgstr ""
 " --list-keys [nimed]        n�ita v�tmeid\n"
 " --fingerprint [nimed]      n�ita s�rmej�lgi\n"
 
-#: g10/gpg.c:746 g10/gpgv.c:98
+#: g10/gpg.c:751 g10/gpgv.c:98
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Palun saatke veateated aadressil <gnupg-bugs@gnu.org>.\n"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:768
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
 
-#: g10/gpg.c:766
+#: g10/gpg.c:771
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1240,7 +1240,7 @@ msgstr ""
 "allkirjasta, kontrolli, kr�pti ja dekr�pti\n"
 "vaikimisi operatsioon s�ltub sisendandmetest\n"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:782
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1248,551 +1248,560 @@ msgstr ""
 "\n"
 "Toetatud algoritmid:\n"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:785
 msgid "Pubkey: "
 msgstr "Avalik v�ti: "
 
-#: g10/gpg.c:786 g10/keyedit.c:2266
+#: g10/gpg.c:791 g10/keyedit.c:2266
 msgid "Cipher: "
 msgstr "�iffer: "
 
-#: g10/gpg.c:792
+#: g10/gpg.c:797
 msgid "Hash: "
 msgstr "R�si: "
 
-#: g10/gpg.c:798 g10/keyedit.c:2312
+#: g10/gpg.c:803 g10/keyedit.c:2312
 msgid "Compression: "
 msgstr "Pakkimine: "
 
-#: g10/gpg.c:881
+#: g10/gpg.c:886
 msgid "usage: gpg [options] "
 msgstr "kasuta: gpg [v�tmed] "
 
-#: g10/gpg.c:1029
+#: g10/gpg.c:1034
 msgid "conflicting commands\n"
 msgstr "vastuolulised k�sud\n"
 
-#: g10/gpg.c:1047
+#: g10/gpg.c:1052
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "grupi definitsioonis \"%s\" puudub s�mbol =\n"
 
-#: g10/gpg.c:1244
+#: g10/gpg.c:1249
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1247
+#: g10/gpg.c:1252
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1250
+#: g10/gpg.c:1255
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "HOIATUS: ebaturvaline omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1256
+#: g10/gpg.c:1261
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
 
-#: g10/gpg.c:1259
+#: g10/gpg.c:1264
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
 
-#: g10/gpg.c:1262
+#: g10/gpg.c:1267
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "HOIATUS: ebaturvalised �igused %s \"%s\"\n"
 
-#: g10/gpg.c:1268
+#: g10/gpg.c:1273
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1271
+#: g10/gpg.c:1276
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1274
+#: g10/gpg.c:1279
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "HOIATUS: ebaturvaline kataloogi omanik %s \"%s\"\n"
 
-#: g10/gpg.c:1280
+#: g10/gpg.c:1285
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
 
-#: g10/gpg.c:1283
+#: g10/gpg.c:1288
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
 
-#: g10/gpg.c:1286
+#: g10/gpg.c:1291
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "Hoiatus: ebaturvalised kataloogi �igused %s \"%s\"\n"
 
-#: g10/gpg.c:1427
+#: g10/gpg.c:1432
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "tundmatu seade \"%s\"\n"
 
-#: g10/gpg.c:1521
+#: g10/gpg.c:1526
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1523
+#: g10/gpg.c:1528
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1525
+#: g10/gpg.c:1530
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
 
-#: g10/gpg.c:1527
+#: g10/gpg.c:1532
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1536
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1538
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1540
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1542
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1544
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1546
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "n�ita millisesse v�tmehoidlasse n�idatud v�ti kuulub"
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1548
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
 
-#: g10/gpg.c:1874
+#: g10/gpg.c:1879
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "M�RKUS: ignoreerin vana vaikimisi v�tmete faili `%s'\n"
 
-#: g10/gpg.c:1916
+#: g10/gpg.c:1921
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "M�RKUS: vaikimisi v�tmete fail `%s' puudub\n"
 
-#: g10/gpg.c:1920
+#: g10/gpg.c:1925
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "v�tmete fail `%s': %s\n"
 
-#: g10/gpg.c:1927
+#: g10/gpg.c:1932
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "loen v�tmeid failist `%s'\n"
 
-#: g10/gpg.c:2142 g10/gpg.c:2716 g10/gpg.c:2735
+#: g10/gpg.c:2147 g10/gpg.c:2747 g10/gpg.c:2766
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "M�RKUS: %s ei ole tavap�raseks kasutamiseks!\n"
 
-#: g10/gpg.c:2158
+#: g10/gpg.c:2163
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "ebaturvaliste �iguste t�ttu ei laetud �ifri laiendust \"%s\"\n"
 
-#: g10/gpg.c:2312 g10/gpg.c:2324
+#: g10/gpg.c:2317 g10/gpg.c:2329
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2400
+#: g10/gpg.c:2405
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2422 g10/keyedit.c:3997
+#: g10/gpg.c:2429 g10/keyedit.c:3997
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "ei saa parsida v�tmeserveri URI\n"
 
-#: g10/gpg.c:2428
+#: g10/gpg.c:2441
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2431
+#: g10/gpg.c:2444
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2438
+#: g10/gpg.c:2451
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: vigased impordi v�tmed\n"
 
-#: g10/gpg.c:2441
+#: g10/gpg.c:2454
 msgid "invalid import options\n"
 msgstr "vigased impordi v�tmed\n"
 
-#: g10/gpg.c:2448
+#: g10/gpg.c:2461
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2464
 msgid "invalid export options\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2458
+#: g10/gpg.c:2471
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: vigased impordi v�tmed\n"
 
-#: g10/gpg.c:2461
+#: g10/gpg.c:2474
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "vigased impordi v�tmed\n"
 
-#: g10/gpg.c:2469
+#: g10/gpg.c:2482
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2471
+#: g10/gpg.c:2484
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2473
+#: g10/gpg.c:2486
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2475
+#: g10/gpg.c:2488
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2479
+#: g10/gpg.c:2492
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2481
+#: g10/gpg.c:2494
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/gpg.c:2483
+#: g10/gpg.c:2496
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2485
+#: g10/gpg.c:2498
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2505
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2495
+#: g10/gpg.c:2508
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2502
+#: g10/gpg.c:2515
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-path v��rtuseks ei �nnestu seada %s\n"
 
-#: g10/gpg.c:2705
+#: g10/gpg.c:2665
+#, fuzzy, c-format
+msgid "%s:%d: invalid auto-key-locate list\n"
+msgstr "%s:%d: vigased ekspordi v�tmed\n"
+
+#: g10/gpg.c:2668
+msgid "invalid auto-key-locate list\n"
+msgstr ""
+
+#: g10/gpg.c:2736
 msgid "WARNING: program may create a core file!\n"
 msgstr "HOIATUS: programm v�ib salvestada oma m�lupildi!\n"
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2740
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "HOIATUS: %s m��rab �le %s\n"
 
-#: g10/gpg.c:2718
+#: g10/gpg.c:2749
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ja %s ei ole koos lubatud!\n"
 
-#: g10/gpg.c:2721
+#: g10/gpg.c:2752
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ja %s ei oma koos m�tet!\n"
 
-#: g10/gpg.c:2728
+#: g10/gpg.c:2759
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
 
-#: g10/gpg.c:2743
+#: g10/gpg.c:2774
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/gpg.c:2757
+#: g10/gpg.c:2788
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "--pgp2 moodis saate luua ainult eraldiseisvaid v�i avateksti allkirju\n"
 
-#: g10/gpg.c:2763
+#: g10/gpg.c:2794
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2 moodis ei saa korraga allkirjastada ja kr�pteerida\n"
 
-#: g10/gpg.c:2769
+#: g10/gpg.c:2800
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "--pgp2 moodis peate kasutama faile (ja mitte toru).\n"
 
-#: g10/gpg.c:2782
+#: g10/gpg.c:2813
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "teate kr�pteerimine --pgp2 moodis n�uab IDEA �iffrit\n"
 
-#: g10/gpg.c:2849 g10/gpg.c:2873
+#: g10/gpg.c:2880 g10/gpg.c:2904
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valitud �ifri algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:2855 g10/gpg.c:2879
+#: g10/gpg.c:2886 g10/gpg.c:2910
 msgid "selected digest algorithm is invalid\n"
 msgstr "valitud l�hendi algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:2861
+#: g10/gpg.c:2892
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "valitud �ifri algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:2867
+#: g10/gpg.c:2898
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valitud sertifikaadi l�hendi algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:2882
+#: g10/gpg.c:2913
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed peab olema suurem, kui 0\n"
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2915
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed peab olema suurem, kui 1\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2917
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth peab olema vahemikus 1 kuni 255\n"
 
-#: g10/gpg.c:2888
+#: g10/gpg.c:2919
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "vigane vaikimisi-sert-tase; peab olema 0, 1, 2 v�i 3\n"
 
-#: g10/gpg.c:2890
+#: g10/gpg.c:2921
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "vigane min-sert-tase; peab olema 1, 2 v�i 3\n"
 
-#: g10/gpg.c:2893
+#: g10/gpg.c:2924
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "M�RKUS: lihtne S2K mood (0) ei soovitata kasutada\n"
 
-#: g10/gpg.c:2897
+#: g10/gpg.c:2928
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "vigane S2K mood; peab olema 0, 1 v�i 3\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2935
 msgid "invalid default preferences\n"
 msgstr "vigased vaikimisi eelistused\n"
 
-#: g10/gpg.c:2913
+#: g10/gpg.c:2944
 msgid "invalid personal cipher preferences\n"
 msgstr "vigased isikliku �ifri eelistused\n"
 
-#: g10/gpg.c:2917
+#: g10/gpg.c:2948
 msgid "invalid personal digest preferences\n"
 msgstr "vigased isikliku l�hendi eelistused\n"
 
-#: g10/gpg.c:2921
+#: g10/gpg.c:2952
 msgid "invalid personal compress preferences\n"
 msgstr "vigased isikliku pakkimise eelistused\n"
 
-#: g10/gpg.c:2954
+#: g10/gpg.c:2985
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ei t��ta veel koos %s-ga\n"
 
-#: g10/gpg.c:3001
+#: g10/gpg.c:3032
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "�ifri algoritm \"%s\" ei ole moodis %s lubatud\n"
 
-#: g10/gpg.c:3006
+#: g10/gpg.c:3037
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "s�numil�hendi algoritm \"%s\" ei ole moodis %s lubatud\n"
 
-#: g10/gpg.c:3011
+#: g10/gpg.c:3042
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "pakkimise algoritm \"%s\" ei ole moodis %s lubatud\n"
 
-#: g10/gpg.c:3107
+#: g10/gpg.c:3138
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3118
+#: g10/gpg.c:3149
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "HOIATUS: m��rati saajad (-r) aga ei kasutata avaliku v�tme kr�ptograafiat\n"
 
-#: g10/gpg.c:3129
+#: g10/gpg.c:3160
 msgid "--store [filename]"
 msgstr "--store [failinimi]"
 
-#: g10/gpg.c:3136
+#: g10/gpg.c:3167
 msgid "--symmetric [filename]"
 msgstr "--symmetric [failinimi]"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3169
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "lahtikr�pteerimine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3148
+#: g10/gpg.c:3179
 msgid "--encrypt [filename]"
 msgstr "--encrypt [failinimi]"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3192
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3194
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3166
+#: g10/gpg.c:3197
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "%s ei ole moodis %s lubatud.\n"
 
-#: g10/gpg.c:3184
+#: g10/gpg.c:3215
 msgid "--sign [filename]"
 msgstr "--sign [failinimi]"
 
-#: g10/gpg.c:3197
+#: g10/gpg.c:3228
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/gpg.c:3212
+#: g10/gpg.c:3243
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/gpg.c:3214
+#: g10/gpg.c:3245
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3217
+#: g10/gpg.c:3248
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "%s ei ole moodis %s lubatud.\n"
 
-#: g10/gpg.c:3237
+#: g10/gpg.c:3268
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [failinimi]"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3277
 msgid "--clearsign [filename]"
 msgstr "--clearsign [failinimi]"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3302
 msgid "--decrypt [filename]"
 msgstr "--decrypt [failinimi]"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3310
 msgid "--sign-key user-id"
 msgstr "--sign-key kasutaja-id"
 
-#: g10/gpg.c:3283
+#: g10/gpg.c:3314
 msgid "--lsign-key user-id"
 msgstr "--lsign-key kasutaja-id"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3335
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key kasutaja-id [k�sud]"
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3406
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [kasutaja-id] [v�tmehoidla]"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3443
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "v�tmeserverile saatmine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3445
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "v�tmeserverilt lugemine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3447
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "v�tme eksport eba�nnestus: %s\n"
 
-#: g10/gpg.c:3427
+#: g10/gpg.c:3458
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "v�tmeserveri otsing eba�nnestus: %s\n"
 
-#: g10/gpg.c:3437
+#: g10/gpg.c:3468
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "v�tmeserveri uuendamine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3488
+#: g10/gpg.c:3519
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "lahtipakendamine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3496
+#: g10/gpg.c:3527
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "pakendamine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3583
+#: g10/gpg.c:3614
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "vigane r�sialgoritm `%s'\n"
 
-#: g10/gpg.c:3706
+#: g10/gpg.c:3737
 msgid "[filename]"
 msgstr "[failinimi]"
 
-#: g10/gpg.c:3710
+#: g10/gpg.c:3741
 msgid "Go ahead and type your message ...\n"
 msgstr "Kirjutage n��d oma teade ...\n"
 
-#: g10/gpg.c:4000
+#: g10/gpg.c:4031
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1800,28 +1809,28 @@ msgstr ""
 "noteerimise nimes v�ivad olla ainult tr�kitavad s�mbolid v�i t�hikud\n"
 "ning l�pus peab olema '='\n"
 
-#: g10/gpg.c:4008
+#: g10/gpg.c:4039
 msgid "a user notation name must contain the '@' character\n"
 msgstr "kasutaja noteerimise nimi peab sisaldama '@' m�rki\n"
 
-#: g10/gpg.c:4013
+#: g10/gpg.c:4044
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "kasutaja noteerimise nimi peab sisaldama '@' m�rki\n"
 
-#: g10/gpg.c:4024
+#: g10/gpg.c:4055
 msgid "a notation value must not use any control characters\n"
 msgstr "noteerimise v��rtus ei v�i sisaldada kontroll s�mboleid\n"
 
-#: g10/gpg.c:4058
+#: g10/gpg.c:4089
 msgid "the given certification policy URL is invalid\n"
 msgstr "antud sertifikaadi poliisi URL on vigane\n"
 
-#: g10/gpg.c:4060
+#: g10/gpg.c:4091
 msgid "the given signature policy URL is invalid\n"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/gpg.c:4093
+#: g10/gpg.c:4124
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "antud allkirja poliisi URL on vigane\n"
@@ -1830,34 +1839,35 @@ msgstr "antud allkirja poliisi URL on vigane\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "avalike v�tmete puhvris on liiga palju v�tmeid - blokeerin\n"
 
-#: g10/getkey.c:188 g10/getkey.c:2845
+#: g10/getkey.c:188 g10/getkey.c:2876
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[Kasutaja id puudub]"
 
-#: g10/getkey.c:931 g10/getkey.c:953 g10/getkey.c:976
+#: g10/getkey.c:933 g10/getkey.c:950 g10/getkey.c:970 g10/getkey.c:986
+#: g10/getkey.c:1001
 #, c-format
 msgid "Automatically retrieved `%s' via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1769
+#: g10/getkey.c:1800
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Vigane v�ti %08lX muudeti kehtivaks v�tme --allow-non-selfsigned-uid "
 "kasutamisega\n"
 
-#: g10/getkey.c:2323
+#: g10/getkey.c:2354
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "avalikul alamv�tmel %08lX puudub salajane alamv�ti - ignoreerin\n"
 
-#: g10/getkey.c:2554
+#: g10/getkey.c:2585
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "kasutan sekundaarset v�tit %08lX primaarse v�tme %08lX asemel\n"
 
-#: g10/getkey.c:2601
+#: g10/getkey.c:2632
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "v�ti %08lX: salajane v�ti avaliku v�tmeta - j�tsin vahele\n"
@@ -3419,12 +3429,12 @@ msgid "(sensitive)"
 msgstr " (tundlik)"
 
 #: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
-#: g10/keylist.c:194 g10/keyserver.c:471
+#: g10/keylist.c:194 g10/keyserver.c:525
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s ei �nnestu luua: %s\n"
 
-#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:967
+#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:960
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[t�histatud] "
@@ -3436,7 +3446,7 @@ msgstr " [aegub: %s]"
 
 #: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
 #: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:477 g10/mainproc.c:973
+#: g10/keylist.c:914 g10/keyserver.c:531 g10/mainproc.c:966
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [aegub: %s]"
@@ -3472,14 +3482,14 @@ msgstr ""
 "Tuleb t�hele panna et kuni te pole programmi uuesti k�ivitanud, ei pruugi\n"
 "n�idatud v�tme kehtivus olla tingimata korrektne.\n"
 
-#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:481
-#: g10/mainproc.c:1734 g10/trustdb.c:1184 g10/trustdb.c:1704
+#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:535
+#: g10/mainproc.c:1783 g10/trustdb.c:1184 g10/trustdb.c:1704
 #, fuzzy
 msgid "revoked"
 msgstr "[t�histatud] "
 
-#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:485
-#: g10/mainproc.c:1736 g10/trustdb.c:537 g10/trustdb.c:1706
+#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:539
+#: g10/mainproc.c:1785 g10/trustdb.c:537 g10/trustdb.c:1706
 #, fuzzy
 msgid "expired"
 msgstr "expire"
@@ -4314,388 +4324,385 @@ msgstr "%s: v
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:77
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:81
+#: g10/keyserver.c:79
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:83
+#: g10/keyserver.c:81
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:87
+#: g10/keyserver.c:85
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:89
-msgid "automatically retrieve keys from PKA records"
-msgstr ""
-
-#: g10/keyserver.c:91
-msgid "automatically retrieve keys from DNS"
-msgstr ""
-
-#: g10/keyserver.c:95
+#: g10/keyserver.c:87
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/keyserver.c:139
+#: g10/keyserver.c:89
+msgid "honor the PKA record set on a key when retrieving keys"
+msgstr ""
+
+#: g10/keyserver.c:154
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "HOIATUS: seaded failis `%s' pole seekord veel aktiivsed\n"
 
-#: g10/keyserver.c:483
+#: g10/keyserver.c:537
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:684
+#: g10/keyserver.c:738
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:767 g10/keyserver.c:1368
+#: g10/keyserver.c:821 g10/keyserver.c:1422
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/keyserver.c:865
+#: g10/keyserver.c:919
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "v�tit '%s' ei leitud: %s\n"
 
-#: g10/keyserver.c:867
+#: g10/keyserver.c:921
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "v�tit '%s' ei leitud: %s\n"
 
-#: g10/keyserver.c:1092
+#: g10/keyserver.c:1146
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "k�sin v�tit %08lX v�tmeserverist %s\n"
 
-#: g10/keyserver.c:1096
+#: g10/keyserver.c:1150
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "k�sin v�tit %08lX v�tmeserverist %s\n"
 
-#: g10/keyserver.c:1120
+#: g10/keyserver.c:1174
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "otsin \"%s\" HKP serverist %s\n"
 
-#: g10/keyserver.c:1123
+#: g10/keyserver.c:1177
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "otsin \"%s\" HKP serverist %s\n"
 
-#: g10/keyserver.c:1271
+#: g10/keyserver.c:1325
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "otsin \"%s\" HKP serverist %s\n"
 
-#: g10/keyserver.c:1275
+#: g10/keyserver.c:1329
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "allkirjastatud teie v�tmega %08lX %s\n"
 
-#: g10/keyserver.c:1318
+#: g10/keyserver.c:1372
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "otsin \"%s\" HKP serverist %s\n"
 
-#: g10/keyserver.c:1321
+#: g10/keyserver.c:1375
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "otsin \"%s\" HKP serverist %s\n"
 
-#: g10/keyserver.c:1328 g10/keyserver.c:1424
+#: g10/keyserver.c:1382 g10/keyserver.c:1478
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/keyserver.c:1376
+#: g10/keyserver.c:1430
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1439
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1446
+#: g10/keyserver.c:1500
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1452
+#: g10/keyserver.c:1506
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1464
+#: g10/keyserver.c:1518
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1469
+#: g10/keyserver.c:1523
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1477
+#: g10/keyserver.c:1531
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1484
+#: g10/keyserver.c:1538
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "v�tmeserveri viga"
 
-#: g10/keyserver.c:1489
+#: g10/keyserver.c:1543
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "v�tmeserveri viga"
 
-#: g10/keyserver.c:1498
+#: g10/keyserver.c:1552
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "v�tmeserverilt lugemine eba�nnestus: %s\n"
 
-#: g10/keyserver.c:1523 g10/keyserver.c:1557
+#: g10/keyserver.c:1577 g10/keyserver.c:1611
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1814
+#: g10/keyserver.c:1868
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "HOIATUS: ei saa kustutada ajutist faili (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1836
+#: g10/keyserver.c:1890
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "k�sin v�tit %08lX v�tmeserverist %s\n"
 
-#: g10/keyserver.c:1838
+#: g10/keyserver.c:1892
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "k�sin v�tit %08lX v�tmeserverist %s\n"
 
-#: g10/keyserver.c:1903
+#: g10/keyserver.c:1957
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "HOIATUS: ei saa kustutada ajutist faili (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1909
+#: g10/keyserver.c:1963
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "HOIATUS: ei saa kustutada ajutist faili (%s) `%s': %s\n"
 
-#: g10/mainproc.c:253
+#: g10/mainproc.c:240
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "veider suurus kr�ptitud sessiooni v�tme jaoks (%d)\n"
 
-#: g10/mainproc.c:304
+#: g10/mainproc.c:291
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s kr�pteeritud sessiooni v�ti\n"
 
-#: g10/mainproc.c:314
+#: g10/mainproc.c:301
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "kr�pteeritud tundmatu algoritmiga %d\n"
 
-#: g10/mainproc.c:395
+#: g10/mainproc.c:382
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "avalik v�ti on %08lX\n"
 
-#: g10/mainproc.c:450
+#: g10/mainproc.c:439
 msgid "public key encrypted data: good DEK\n"
 msgstr "avaliku v�tmega kr�pteeritud andmed: hea DEK\n"
 
-#: g10/mainproc.c:483
+#: g10/mainproc.c:472
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "kr�pteeritud %u-bitise %s v�tmega, ID %08lX, loodud %s\n"
 
-#: g10/mainproc.c:487 g10/pkclist.c:219
+#: g10/mainproc.c:476 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                 ka \""
 
-#: g10/mainproc.c:491
+#: g10/mainproc.c:480
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "kr�pteeritud %s v�tmega, ID %08lX\n"
 
-#: g10/mainproc.c:505
+#: g10/mainproc.c:494
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "avaliku v�tmega lahtikr�pteerimine eba�nnestus: %s\n"
 
-#: g10/mainproc.c:519
+#: g10/mainproc.c:508
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "kr�pteeritud kasutades %lu parooli\n"
 
-#: g10/mainproc.c:521
+#: g10/mainproc.c:510
 msgid "encrypted with 1 passphrase\n"
 msgstr "kr�pteeritud �he parooliga\n"
 
-#: g10/mainproc.c:549 g10/mainproc.c:571
+#: g10/mainproc.c:541 g10/mainproc.c:563
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "eeldan %s kr�pteeritud andmeid\n"
 
-#: g10/mainproc.c:557
+#: g10/mainproc.c:549
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA �iffer pole saadaval, loodan kasutada selle asemel %s\n"
 
-#: g10/mainproc.c:589
+#: g10/mainproc.c:581
 msgid "decryption okay\n"
 msgstr "lahtikr�pteerimine �nnestus\n"
 
-#: g10/mainproc.c:593
+#: g10/mainproc.c:585
 msgid "WARNING: message was not integrity protected\n"
 msgstr "HOIATUS: teate koosk�lalisus ei ole tagatud\n"
 
-#: g10/mainproc.c:606
+#: g10/mainproc.c:598
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "HOIATUS: kr�pteeritud teadet on muudetud!\n"
 
-#: g10/mainproc.c:612
+#: g10/mainproc.c:604
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "lahtikr�pteerimine eba�nnestus: %s\n"
 
-#: g10/mainproc.c:631
+#: g10/mainproc.c:623
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "M�RKUS: saatja n�udis \"ainult-teie-silmadele\"\n"
 
-#: g10/mainproc.c:633
+#: g10/mainproc.c:625
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "algne failinimi on='%.*s'\n"
 
-#: g10/mainproc.c:822
+#: g10/mainproc.c:815
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "eraldiseisev t�histus - realiseerimiseks kasutage \"gpg --import\"\n"
 
-#: g10/mainproc.c:1168
+#: g10/mainproc.c:1161
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Korrektne allkiri kasutajalt \""
 
-#: g10/mainproc.c:1418
+#: g10/mainproc.c:1419
 msgid "signature verification suppressed\n"
 msgstr "allkirja kontroll j�eti �ra\n"
 
-#: g10/mainproc.c:1460 g10/mainproc.c:1470
-msgid "can't handle these multiple signatures\n"
+#: g10/mainproc.c:1519
+#, fuzzy
+msgid "can't handle this ambiguous signature data\n"
 msgstr "neid allkirju ei �nnestu t��delda\n"
 
-#: g10/mainproc.c:1480
+#: g10/mainproc.c:1530
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Allkiri aegus %s\n"
 
-#: g10/mainproc.c:1481
+#: g10/mainproc.c:1531
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                 ka \""
 
-#: g10/mainproc.c:1485
+#: g10/mainproc.c:1535
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Allkirja l�i %.*s kasutades %s v�tit ID %08lX\n"
 
-#: g10/mainproc.c:1505
+#: g10/mainproc.c:1555
 msgid "Key available at: "
 msgstr "V�tme leiate: "
 
-#: g10/mainproc.c:1639 g10/mainproc.c:1687
+#: g10/mainproc.c:1688 g10/mainproc.c:1736
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "HALB allkiri kasutajalt \""
 
-#: g10/mainproc.c:1641 g10/mainproc.c:1689
+#: g10/mainproc.c:1690 g10/mainproc.c:1738
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Aegunud allkiri kasutajalt \""
 
-#: g10/mainproc.c:1643 g10/mainproc.c:1691
+#: g10/mainproc.c:1692 g10/mainproc.c:1740
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Korrektne allkiri kasutajalt \""
 
-#: g10/mainproc.c:1695
+#: g10/mainproc.c:1744
 msgid "[uncertain]"
 msgstr "[ebakindel]"
 
-#: g10/mainproc.c:1727
+#: g10/mainproc.c:1776
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                 ka \""
 
-#: g10/mainproc.c:1824
+#: g10/mainproc.c:1873
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Allkiri aegus %s\n"
 
-#: g10/mainproc.c:1829
+#: g10/mainproc.c:1878
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Allkiri aegub %s\n"
 
-#: g10/mainproc.c:1832
+#: g10/mainproc.c:1881
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s allkiri, s�numil�hendi algoritm %s\n"
 
-#: g10/mainproc.c:1833
+#: g10/mainproc.c:1882
 msgid "binary"
 msgstr "binaarne"
 
-#: g10/mainproc.c:1834
+#: g10/mainproc.c:1883
 msgid "textmode"
 msgstr "tekstimood"
 
-#: g10/mainproc.c:1834 g10/trustdb.c:536
+#: g10/mainproc.c:1883 g10/trustdb.c:536
 msgid "unknown"
 msgstr "tundmatu"
 
-#: g10/mainproc.c:1854
+#: g10/mainproc.c:1903
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Allkirja ei saa kontrollida: %s\n"
 
-#: g10/mainproc.c:1922 g10/mainproc.c:1938 g10/mainproc.c:2024
+#: g10/mainproc.c:1972 g10/mainproc.c:1988 g10/mainproc.c:2074
 msgid "not a detached signature\n"
 msgstr "ei ole eraldiseisev allkiri\n"
 
-#: g10/mainproc.c:1965
+#: g10/mainproc.c:2015
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "HOIATUS: leidsin mitu allkirja. Kontrollitakse ainult esimest.\n"
 
-#: g10/mainproc.c:1973
+#: g10/mainproc.c:2023
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "eraldiseisev allkiri klassiga 0x%02x\n"
 
-#: g10/mainproc.c:2030
+#: g10/mainproc.c:2080
 msgid "old style (PGP 2.x) signature\n"
 msgstr "vana stiili (PGP 2.x) allkiri\n"
 
-#: g10/mainproc.c:2040
+#: g10/mainproc.c:2090
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "proc_tree() tuvastas vigase juurmise paketi\n"
 
@@ -5256,23 +5263,23 @@ msgstr "andmeid ei salvestatud; salvestamiseks kasutage v
 msgid "error creating `%s': %s\n"
 msgstr "viga `%s' loomisel: %s\n"
 
-#: g10/plaintext.c:447
+#: g10/plaintext.c:453
 msgid "Detached signature.\n"
 msgstr "Eraldiseisev allkiri.\n"
 
-#: g10/plaintext.c:453
+#: g10/plaintext.c:459
 msgid "Please enter name of data file: "
 msgstr "Palun sisestage andmefaili nimi: "
 
-#: g10/plaintext.c:485
+#: g10/plaintext.c:491
 msgid "reading stdin ...\n"
 msgstr "loen standardsisendit ...\n"
 
-#: g10/plaintext.c:519
+#: g10/plaintext.c:525
 msgid "no signed data\n"
 msgstr "allkirjastatud andmeid pole\n"
 
-#: g10/plaintext.c:533
+#: g10/plaintext.c:539
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "allkirjastatud andmete avamine eba�nnestus `%s'\n"
diff --git a/po/fi.po b/po/fi.po
index 56ad1046d..67d73129b 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2006-02-14 15:28+0100\n"
+"POT-Creation-Date: 2006-03-07 11:29+0100\n"
 "PO-Revision-Date: 2004-06-16 22:40+0300\n"
 "Last-Translator: Tommi Vainikainen <Tommi.Vainikainen@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -56,9 +56,9 @@ msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
 #: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:992 g10/gpg.c:3360 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:997 g10/gpg.c:3391 g10/import.c:193 g10/keygen.c:2274
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:476 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
+#: g10/plaintext.c:482 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
 #: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
@@ -93,7 +93,7 @@ msgstr "tiedostoa \"%s\" ei voi lukea: %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "huom: random_seed-tiedostoa ei päivitetty\n"
 
-#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:991 g10/keygen.c:2753
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2753
 #: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
 #: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
 #, c-format
@@ -712,48 +712,48 @@ msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Komento ei kelpaa (kirjoita \"help\")\n"
 
-#: g10/cardglue.c:435
+#: g10/cardglue.c:434
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:572
+#: g10/cardglue.c:573
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:580
+#: g10/cardglue.c:582
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:915
+#: g10/cardglue.c:917
 msgid "Enter New Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:916
+#: g10/cardglue.c:918
 msgid "Enter New PIN: "
 msgstr ""
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:919
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:920
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/cardglue.c:935
+#: g10/cardglue.c:937
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Toista salasana: "
 
-#: g10/cardglue.c:950
+#: g10/cardglue.c:952
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "salasanaa ei toistettu oikein, yritä uudestaan."
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3720 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3751 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -763,13 +763,13 @@ msgstr "tiedostoa \"%s\" ei voi avata\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output ei toimi yhdessä tämän komennon kanssa\n"
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1644
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1698
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "avainta \"%s\" ei löydy: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1658
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1712
 #: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -879,12 +879,12 @@ msgstr "valitsinta %s ei voi käyttää %s-tilassa\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s salattu vastaanottajalle: \"%s\"\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:306
+#: g10/encr-data.c:67 g10/mainproc.c:293
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s salattua dataa\n"
 
-#: g10/encr-data.c:69 g10/mainproc.c:310
+#: g10/encr-data.c:69 g10/mainproc.c:297
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "salattu tuntemattomalla algoritmilla %d\n"
@@ -1030,7 +1030,7 @@ msgstr ""
 msgid "WARNING: nothing exported\n"
 msgstr "VAROITUS: mitään ei viety\n"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:373
 msgid ""
 "@Commands:\n"
 " "
@@ -1038,128 +1038,128 @@ msgstr ""
 "@Komennot:\n"
 " "
 
-#: g10/gpg.c:374
+#: g10/gpg.c:375
 msgid "|[file]|make a signature"
 msgstr "|[tiedosto]|tee allekirjoitus"
 
-#: g10/gpg.c:375
+#: g10/gpg.c:376
 msgid "|[file]|make a clear text signature"
 msgstr "|[tiedosto]|tee selkokielinen allekirjoitus"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:377
 msgid "make a detached signature"
 msgstr "tee erillinen allekirjoitus"
 
-#: g10/gpg.c:377
+#: g10/gpg.c:378
 msgid "encrypt data"
 msgstr "salaa tiedot"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:380
 msgid "encryption only with symmetric cipher"
 msgstr "salaa vain symmetrisellä salaimella"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:382
 msgid "decrypt data (default)"
 msgstr "avaa tiedot (oletus)"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:384
 msgid "verify a signature"
 msgstr "tarkista allekirjoitus"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:386
 msgid "list keys"
 msgstr "näytä avaimet"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "list keys and signatures"
 msgstr "näytä avaimet allekirjoituksineen"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:389
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "tarkista avainten allekirjoitukset"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:390
 msgid "list keys and fingerprints"
 msgstr "näytä avaimet sormenjälkineen"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:391
 msgid "list secret keys"
 msgstr "näytä salaiset avaimet"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:392
 msgid "generate a new key pair"
 msgstr "luo uusi avainpari"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:393
 msgid "remove keys from the public keyring"
 msgstr "poista avaimet julkisten avainten renkaasta"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:395
 msgid "remove keys from the secret keyring"
 msgstr "poista avaimet salaisten avainten renkaasta"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:396
 msgid "sign a key"
 msgstr "allekirjoita avain"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:397
 msgid "sign a key locally"
 msgstr "allekirjoita avain paikallisesti"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:398
 msgid "sign or edit a key"
 msgstr "allekirjoita tai muokkaa avainta"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:399
 msgid "generate a revocation certificate"
 msgstr "luo mitätöintivarmenne"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:401
 msgid "export keys"
 msgstr "vie avaimia"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:402
 msgid "export keys to a key server"
 msgstr "vie avaimia palvelimelle"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:403
 msgid "import keys from a key server"
 msgstr "nouda avaimia avainpalvelimelta"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:405
 msgid "search for keys on a key server"
 msgstr "etsi avaimia avainpalvelimelta"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:407
 msgid "update all keys from a keyserver"
 msgstr "päivitä kaikki avaimet avainpalvelimelta"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:411
 msgid "import/merge keys"
 msgstr "nouda/liitä avaimia"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:414
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:414
+#: g10/gpg.c:415
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:415
+#: g10/gpg.c:416
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:423
+#: g10/gpg.c:424
 msgid "update the trust database"
 msgstr "päivitä luottamustietokanta"
 
-#: g10/gpg.c:430
+#: g10/gpg.c:431
 msgid "|algo [files]|print message digests"
 msgstr "|algo [tiedostot]|tulosta viestien tiivisteet"
 
-#: g10/gpg.c:434 g10/gpgv.c:71
+#: g10/gpg.c:435 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1169,51 +1169,51 @@ msgstr ""
 "Valitsimet:\n"
 " "
 
-#: g10/gpg.c:436
+#: g10/gpg.c:437
 msgid "create ascii armored output"
 msgstr "tuota ascii-koodattu tuloste"
 
-#: g10/gpg.c:438
+#: g10/gpg.c:439
 msgid "|NAME|encrypt for NAME"
 msgstr "|NIMI|salaa vastaanottajalle NIMI"
 
-#: g10/gpg.c:449
+#: g10/gpg.c:450
 msgid "use this user-id to sign or decrypt"
 msgstr "käytä tätä käyttäjätunnusta allekirjoittamiseen ja avaamiseen"
 
-#: g10/gpg.c:450
+#: g10/gpg.c:451
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|aseta pakkausaste N (0 poistaa käytöstä)"
 
-#: g10/gpg.c:455
+#: g10/gpg.c:456
 msgid "use canonical text mode"
 msgstr "käytä tekstimuotoa"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:470
 msgid "use as output file"
 msgstr "käytä tulostustiedostona"
 
-#: g10/gpg.c:471 g10/gpgv.c:73
+#: g10/gpg.c:472 g10/gpgv.c:73
 msgid "verbose"
 msgstr "monisanainen"
 
-#: g10/gpg.c:482
+#: g10/gpg.c:483
 msgid "do not make any changes"
 msgstr "älä tee muutoksia"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:484
 msgid "prompt before overwriting"
 msgstr "kysy ennen ylikirjoittamista"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:525
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:553
+#: g10/gpg.c:554
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1222,7 +1222,7 @@ msgstr ""
 "(Katso täydellinen luettelo kaikista komennoista ja valitsimista man-"
 "sivuilta)\n"
 
-#: g10/gpg.c:556
+#: g10/gpg.c:557
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1241,16 +1241,16 @@ msgstr ""
 " --list-keys [nimet]        näytä avaimet\n"
 " --fingerprint [nimet]      näytä sormenjäljet\n"
 
-#: g10/gpg.c:746 g10/gpgv.c:98
+#: g10/gpg.c:751 g10/gpgv.c:98
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr ""
 "Ilmoita ohjelmistovioista (englanniksi) osoitteeseen <gnupg-bugs@gnu.org>.\n"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:768
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: g10/gpg.c:766
+#: g10/gpg.c:771
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1260,7 +1260,7 @@ msgstr ""
 "allekirjoita, tarkista, salaa tai avaa\n"
 "oletustoiminto riippuu syötteestä\n"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:782
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1268,552 +1268,561 @@ msgstr ""
 "\n"
 "Tuetut algoritmit:\n"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:785
 msgid "Pubkey: "
 msgstr "JulkAvain: "
 
-#: g10/gpg.c:786 g10/keyedit.c:2266
+#: g10/gpg.c:791 g10/keyedit.c:2266
 msgid "Cipher: "
 msgstr "Salaus: "
 
-#: g10/gpg.c:792
+#: g10/gpg.c:797
 msgid "Hash: "
 msgstr "Tiiviste: "
 
-#: g10/gpg.c:798 g10/keyedit.c:2312
+#: g10/gpg.c:803 g10/keyedit.c:2312
 msgid "Compression: "
 msgstr "Pakkaus: "
 
-#: g10/gpg.c:881
+#: g10/gpg.c:886
 msgid "usage: gpg [options] "
 msgstr "käyttö: gpg [valitsimet] "
 
-#: g10/gpg.c:1029
+#: g10/gpg.c:1034
 msgid "conflicting commands\n"
 msgstr "ristiriitainen komento\n"
 
-#: g10/gpg.c:1047
+#: g10/gpg.c:1052
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "=-merkkiä ei löytynyt ryhmämäärityksessä \"%s\"\n"
 
-#: g10/gpg.c:1244
+#: g10/gpg.c:1249
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
 
-#: g10/gpg.c:1247
+#: g10/gpg.c:1252
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
 
-#: g10/gpg.c:1250
+#: g10/gpg.c:1255
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "VAROITUS: omistussuhde kohteessa %s \"%s\" ei ole turvallinen\"\n"
 
-#: g10/gpg.c:1256
+#: g10/gpg.c:1261
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1259
+#: g10/gpg.c:1264
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1262
+#: g10/gpg.c:1267
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "VAROITUS: oikeudet kohteessa %s \"%s\" eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1268
+#: g10/gpg.c:1273
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "VAROITUS: %s \"%s\" hakemiston oikeudet eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1271
+#: g10/gpg.c:1276
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "VAROITUS: %s \"%s\" hakemiston oikeudet eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1274
+#: g10/gpg.c:1279
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "VAROITUS: %s \"%s\" hakemiston oikeudet eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1280
+#: g10/gpg.c:1285
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "VAROITUS: Hakemiston %s \"%s\" oikeudet eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1283
+#: g10/gpg.c:1288
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "VAROITUS: Hakemiston %s \"%s\" oikeudet eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1286
+#: g10/gpg.c:1291
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "VAROITUS: Hakemiston %s \"%s\" oikeudet eivät ole turvallisia\"\n"
 
-#: g10/gpg.c:1427
+#: g10/gpg.c:1432
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "tuntematon asetus \"%s\"\n"
 
-#: g10/gpg.c:1521
+#: g10/gpg.c:1526
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1523
+#: g10/gpg.c:1528
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1525
+#: g10/gpg.c:1530
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
 
-#: g10/gpg.c:1527
+#: g10/gpg.c:1532
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1536
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1538
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1540
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1542
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1544
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1546
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "näytä mihin avainrenkaaseen tulostettu avain kuuluu"
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1548
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
 
-#: g10/gpg.c:1874
+#: g10/gpg.c:1879
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "HUOM: Vanhat oletusarvoiset asetukset löytyvät tiedostosta \"%s\"\n"
 
-#: g10/gpg.c:1916
+#: g10/gpg.c:1921
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "HUOM: Ei oletusasetustiedostoa \"%s\"\n"
 
-#: g10/gpg.c:1920
+#: g10/gpg.c:1925
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "asetustiedosto \"%s\": %s\n"
 
-#: g10/gpg.c:1927
+#: g10/gpg.c:1932
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "luetaan asetukset tiedostosta \"%s\"\n"
 
-#: g10/gpg.c:2142 g10/gpg.c:2716 g10/gpg.c:2735
+#: g10/gpg.c:2147 g10/gpg.c:2747 g10/gpg.c:2766
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "HUOM: %s ei ole normaaliin käyttöön!\n"
 
-#: g10/gpg.c:2158
+#: g10/gpg.c:2163
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "Oikeudet eivät ole turvallisia, salainlaajennuksia \"%s\" ei ladattu\n"
 
-#: g10/gpg.c:2312 g10/gpg.c:2324
+#: g10/gpg.c:2317 g10/gpg.c:2329
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2400
+#: g10/gpg.c:2405
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2422 g10/keyedit.c:3997
+#: g10/gpg.c:2429 g10/keyedit.c:3997
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
 
-#: g10/gpg.c:2428
+#: g10/gpg.c:2441
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2431
+#: g10/gpg.c:2444
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2438
+#: g10/gpg.c:2451
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:2441
+#: g10/gpg.c:2454
 msgid "invalid import options\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:2448
+#: g10/gpg.c:2461
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2464
 msgid "invalid export options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2458
+#: g10/gpg.c:2471
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:2461
+#: g10/gpg.c:2474
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:2469
+#: g10/gpg.c:2482
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2471
+#: g10/gpg.c:2484
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2473
+#: g10/gpg.c:2486
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2475
+#: g10/gpg.c:2488
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2479
+#: g10/gpg.c:2492
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2481
+#: g10/gpg.c:2494
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:2483
+#: g10/gpg.c:2496
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2485
+#: g10/gpg.c:2498
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2505
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2495
+#: g10/gpg.c:2508
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2502
+#: g10/gpg.c:2515
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-polkua kohteeseen %s ei voi asettaa\n"
 
-#: g10/gpg.c:2705
+#: g10/gpg.c:2665
+#, fuzzy, c-format
+msgid "%s:%d: invalid auto-key-locate list\n"
+msgstr "%s:%d: virheelliset vientivalitsimet\n"
+
+#: g10/gpg.c:2668
+msgid "invalid auto-key-locate list\n"
+msgstr ""
+
+#: g10/gpg.c:2736
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROITUS: ohjelma voi luoda core-tiedoston!\n"
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2740
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROITUS: %s korvaa %s:n\n"
 
-#: g10/gpg.c:2718
+#: g10/gpg.c:2749
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ja %s eivät ole sallittuja yhdessä!\n"
 
-#: g10/gpg.c:2721
+#: g10/gpg.c:2752
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ja %s yhdessä on järjetöntä!\n"
 
-#: g10/gpg.c:2728
+#: g10/gpg.c:2759
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "gpg-agent ei ole käytettävissä tässä istunnossa\n"
 
-#: g10/gpg.c:2743
+#: g10/gpg.c:2774
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/gpg.c:2757
+#: g10/gpg.c:2788
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "erillisen allekirjoituksen voi luoda vain --pgp2-tilassa\n"
 
-#: g10/gpg.c:2763
+#: g10/gpg.c:2794
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2-tilassa ei voi allekirjoittaa ja salata samanaikaisesti\n"
 
-#: g10/gpg.c:2769
+#: g10/gpg.c:2800
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "sinun tulee käyttää tiedostoja (eikä putkitusta) kun --pgp2 on käytössä.\n"
 
-#: g10/gpg.c:2782
+#: g10/gpg.c:2813
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "viestin salaaaminen --pgp2-tilassa vaatii IDEA-salaimen\n"
 
-#: g10/gpg.c:2849 g10/gpg.c:2873
+#: g10/gpg.c:2880 g10/gpg.c:2904
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valittu salausalgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:2855 g10/gpg.c:2879
+#: g10/gpg.c:2886 g10/gpg.c:2910
 msgid "selected digest algorithm is invalid\n"
 msgstr "valittu tiivistealgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:2861
+#: g10/gpg.c:2892
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "valittu salausalgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:2867
+#: g10/gpg.c:2898
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valittu varmenteen tiivistealgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:2882
+#: g10/gpg.c:2913
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed täytyy olla suurempi kuin 0\n"
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2915
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed täytyy olla suurempi kuin 1\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2917
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth tulee olla välillä 1-255\n"
 
-#: g10/gpg.c:2888
+#: g10/gpg.c:2919
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-cert-level ei kelpaa; täytyy olla 0, 1, 2 tai 3\n"
 
-#: g10/gpg.c:2890
+#: g10/gpg.c:2921
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "min-cert-level ei kelpaa; täytyy olla 1, 2 tai 3\n"
 
-#: g10/gpg.c:2893
+#: g10/gpg.c:2924
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr ""
 "HUOM: yksinkertaista S2K-tilaa (0) ei todellakaan suositella käytettäväksi\n"
 
-#: g10/gpg.c:2897
+#: g10/gpg.c:2928
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "virheellinen S2K-tila; täytyy olla 0, 1 tai 3\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2935
 msgid "invalid default preferences\n"
 msgstr "virheelliset oletusarvoiset valinnat\n"
 
-#: g10/gpg.c:2913
+#: g10/gpg.c:2944
 msgid "invalid personal cipher preferences\n"
 msgstr "virheelliset henkilökohtaisen salaimen valinnat\n"
 
-#: g10/gpg.c:2917
+#: g10/gpg.c:2948
 msgid "invalid personal digest preferences\n"
 msgstr "virheelliset henkilökohtaiset tiivisteen valinnat\n"
 
-#: g10/gpg.c:2921
+#: g10/gpg.c:2952
 msgid "invalid personal compress preferences\n"
 msgstr "virheelliset henkilökohtaiset pakkausvalinnat\n"
 
-#: g10/gpg.c:2954
+#: g10/gpg.c:2985
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ja %s eivät vielä toimi yhdessä\n"
 
-#: g10/gpg.c:3001
+#: g10/gpg.c:3032
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "salausalgoritmia \"%s\" ei voi käyttää %s-tilassa\n"
 
-#: g10/gpg.c:3006
+#: g10/gpg.c:3037
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "tiivistealgoritmia \"%s\" ei voi käyttää %s-tilassa\n"
 
-#: g10/gpg.c:3011
+#: g10/gpg.c:3042
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "pakkausalgoritmia \"%s\" ei voi käyttää %s-tilassa\n"
 
-#: g10/gpg.c:3107
+#: g10/gpg.c:3138
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: g10/gpg.c:3118
+#: g10/gpg.c:3149
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "VAROITUS: vastaanottajia (-r) annettu käyttämättä julkisen avaimen salausta\n"
 
-#: g10/gpg.c:3129
+#: g10/gpg.c:3160
 msgid "--store [filename]"
 msgstr "--store [tiedostonimi]"
 
-#: g10/gpg.c:3136
+#: g10/gpg.c:3167
 msgid "--symmetric [filename]"
 msgstr "--symmetric [tiedostonimi]"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3169
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "avaus epäonnistui: %s\n"
 
-#: g10/gpg.c:3148
+#: g10/gpg.c:3179
 msgid "--encrypt [filename]"
 msgstr "--encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3192
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3194
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3166
+#: g10/gpg.c:3197
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "valitsinta %s ei voi käyttää %s-tilassa\n"
 
-#: g10/gpg.c:3184
+#: g10/gpg.c:3215
 msgid "--sign [filename]"
 msgstr "--allekirjoita [tiedostonimi]"
 
-#: g10/gpg.c:3197
+#: g10/gpg.c:3228
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3212
+#: g10/gpg.c:3243
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3214
+#: g10/gpg.c:3245
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3217
+#: g10/gpg.c:3248
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "valitsinta %s ei voi käyttää %s-tilassa\n"
 
-#: g10/gpg.c:3237
+#: g10/gpg.c:3268
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [tiedostonimi]"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3277
 msgid "--clearsign [filename]"
 msgstr "--clearsign [tiedostonimi]"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3302
 msgid "--decrypt [filename]"
 msgstr "--decrypt [tiedostonimi]"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3310
 msgid "--sign-key user-id"
 msgstr "--sign-key käyttäjätunnus"
 
-#: g10/gpg.c:3283
+#: g10/gpg.c:3314
 msgid "--lsign-key user-id"
 msgstr "--lsign-key käyttäjätunnus"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3335
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key käyttäjätunnus [komennot]"
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3406
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [käyttäjätunnus] [avainrengas]"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3443
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3445
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "avainpalvelimelta vastaanotto epäonnistui: %s\n"
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3447
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "avaimen vienti epäonnistui: %s\n"
 
-#: g10/gpg.c:3427
+#: g10/gpg.c:3458
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "avainpalvelimelta etsiminen epäonnistui: %s\n"
 
-#: g10/gpg.c:3437
+#: g10/gpg.c:3468
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "avainpalvelimen päivitys epäonnistui: %s\n"
 
-#: g10/gpg.c:3488
+#: g10/gpg.c:3519
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ascii-koodauksen purku epäonnistui: %s\n"
 
-#: g10/gpg.c:3496
+#: g10/gpg.c:3527
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
 
-#: g10/gpg.c:3583
+#: g10/gpg.c:3614
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
 
-#: g10/gpg.c:3706
+#: g10/gpg.c:3737
 msgid "[filename]"
 msgstr "[tiedostonimi]"
 
-#: g10/gpg.c:3710
+#: g10/gpg.c:3741
 msgid "Go ahead and type your message ...\n"
 msgstr "Kirjoita viestisi...\n"
 
-#: g10/gpg.c:4000
+#: g10/gpg.c:4031
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1821,28 +1830,28 @@ msgstr ""
 "notaation nimen täytyy sisältää vain tulostettavia merkkejä tai "
 "välilyöntejä, ja sen täytyy loppua merkkiin \"=\"\n"
 
-#: g10/gpg.c:4008
+#: g10/gpg.c:4039
 msgid "a user notation name must contain the '@' character\n"
 msgstr "käyttäjänotaatin täytyy sisältää \"@\"-merkki\n"
 
-#: g10/gpg.c:4013
+#: g10/gpg.c:4044
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "käyttäjänotaatin täytyy sisältää \"@\"-merkki\n"
 
-#: g10/gpg.c:4024
+#: g10/gpg.c:4055
 msgid "a notation value must not use any control characters\n"
 msgstr "notaatiosssa ei saa olla erikoismerkkejä\n"
 
-#: g10/gpg.c:4058
+#: g10/gpg.c:4089
 msgid "the given certification policy URL is invalid\n"
 msgstr "annettu varmennekäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:4060
+#: g10/gpg.c:4091
 msgid "the given signature policy URL is invalid\n"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:4093
+#: g10/gpg.c:4124
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
@@ -1851,34 +1860,35 @@ msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "pk-välimuistissa on liian monta kohdetta - poistettu käytöstä\n"
 
-#: g10/getkey.c:188 g10/getkey.c:2845
+#: g10/getkey.c:188 g10/getkey.c:2876
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[Käyttäjätunnusta ei löytynyt]"
 
-#: g10/getkey.c:931 g10/getkey.c:953 g10/getkey.c:976
+#: g10/getkey.c:933 g10/getkey.c:950 g10/getkey.c:970 g10/getkey.c:986
+#: g10/getkey.c:1001
 #, c-format
 msgid "Automatically retrieved `%s' via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1769
+#: g10/getkey.c:1800
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Epäkelpo avain %08lX hyväksytty valitsimella --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2323
+#: g10/getkey.c:2354
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "ei salaista aliavainta julkiselle aliavaimelle %08lX - ohitetaan\n"
 
-#: g10/getkey.c:2554
+#: g10/getkey.c:2585
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr ""
 "käytetään toissijaista avainta %08lX ensisijaisen avaimen %08lX sijasta\n"
 
-#: g10/getkey.c:2601
+#: g10/getkey.c:2632
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr ""
@@ -3456,12 +3466,12 @@ msgid "(sensitive)"
 msgstr " (luottamuksellinen)"
 
 #: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
-#: g10/keylist.c:194 g10/keyserver.c:471
+#: g10/keylist.c:194 g10/keyserver.c:525
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "ei voida luoda kohdetta %s: %s\n"
 
-#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:967
+#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:960
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[mitätöity] "
@@ -3473,7 +3483,7 @@ msgstr " [vanhenee: %s]"
 
 #: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
 #: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:477 g10/mainproc.c:973
+#: g10/keylist.c:914 g10/keyserver.c:531 g10/mainproc.c:966
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [vanhenee: %s]"
@@ -3509,14 +3519,14 @@ msgstr ""
 "Huomioi, että tässä näytetty voimassaolo ei ole välttämättä\n"
 "ajan tasalla jollet käynnistä ohjelmaa uudelleen\n"
 
-#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:481
-#: g10/mainproc.c:1734 g10/trustdb.c:1184 g10/trustdb.c:1704
+#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:535
+#: g10/mainproc.c:1783 g10/trustdb.c:1184 g10/trustdb.c:1704
 #, fuzzy
 msgid "revoked"
 msgstr "[mitätöity] "
 
-#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:485
-#: g10/mainproc.c:1736 g10/trustdb.c:537 g10/trustdb.c:1706
+#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:539
+#: g10/mainproc.c:1785 g10/trustdb.c:537 g10/trustdb.c:1706
 #, fuzzy
 msgid "expired"
 msgstr "expire"
@@ -4361,396 +4371,393 @@ msgstr "%s: avainrengas luotu\n"
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:77
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:81
+#: g10/keyserver.c:79
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:83
+#: g10/keyserver.c:81
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:87
+#: g10/keyserver.c:85
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:89
-msgid "automatically retrieve keys from PKA records"
-msgstr ""
-
-#: g10/keyserver.c:91
-msgid "automatically retrieve keys from DNS"
-msgstr ""
-
-#: g10/keyserver.c:95
+#: g10/keyserver.c:87
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/keyserver.c:139
+#: g10/keyserver.c:89
+msgid "honor the PKA record set on a key when retrieving keys"
+msgstr ""
+
+#: g10/keyserver.c:154
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "VAROITUS: asetukset tiedostossa \"%s\" eivät ole käytössä vielä tässä "
 "ajossa\n"
 
-#: g10/keyserver.c:483
+#: g10/keyserver.c:537
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:684
+#: g10/keyserver.c:738
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:767 g10/keyserver.c:1368
+#: g10/keyserver.c:821 g10/keyserver.c:1422
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/keyserver.c:865
+#: g10/keyserver.c:919
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "avainta \"%s\" ei löydy: %s\n"
 
-#: g10/keyserver.c:867
+#: g10/keyserver.c:921
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "avainta \"%s\" ei löydy: %s\n"
 
-#: g10/keyserver.c:1092
+#: g10/keyserver.c:1146
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "pyydetään avainta %08lX kohteesta %s\n"
 
-#: g10/keyserver.c:1096
+#: g10/keyserver.c:1150
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "pyydetään avainta %08lX kohteesta %s\n"
 
-#: g10/keyserver.c:1120
+#: g10/keyserver.c:1174
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
 
-#: g10/keyserver.c:1123
+#: g10/keyserver.c:1177
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
 
-#: g10/keyserver.c:1271
+#: g10/keyserver.c:1325
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
 
-#: g10/keyserver.c:1275
+#: g10/keyserver.c:1329
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "allekirjoitettu avaimellasi %08lX %s\n"
 
-#: g10/keyserver.c:1318
+#: g10/keyserver.c:1372
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
 
-#: g10/keyserver.c:1321
+#: g10/keyserver.c:1375
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
 
-#: g10/keyserver.c:1328 g10/keyserver.c:1424
+#: g10/keyserver.c:1382 g10/keyserver.c:1478
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/keyserver.c:1376
+#: g10/keyserver.c:1430
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1439
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1446
+#: g10/keyserver.c:1500
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1452
+#: g10/keyserver.c:1506
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1464
+#: g10/keyserver.c:1518
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1469
+#: g10/keyserver.c:1523
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1477
+#: g10/keyserver.c:1531
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1484
+#: g10/keyserver.c:1538
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "avainpalvelinvirhe"
 
-#: g10/keyserver.c:1489
+#: g10/keyserver.c:1543
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "avainpalvelinvirhe"
 
-#: g10/keyserver.c:1498
+#: g10/keyserver.c:1552
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "avainpalvelimelta vastaanotto epäonnistui: %s\n"
 
-#: g10/keyserver.c:1523 g10/keyserver.c:1557
+#: g10/keyserver.c:1577 g10/keyserver.c:1611
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1814
+#: g10/keyserver.c:1868
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "VAROITUS: tilapäistiedostoa (%s) \"%s\" ei voi poistaa: %s\n"
 
-#: g10/keyserver.c:1836
+#: g10/keyserver.c:1890
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "pyydetään avainta %08lX kohteesta %s\n"
 
-#: g10/keyserver.c:1838
+#: g10/keyserver.c:1892
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "pyydetään avainta %08lX kohteesta %s\n"
 
-#: g10/keyserver.c:1903
+#: g10/keyserver.c:1957
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "VAROITUS: tilapäistiedostoa (%s) \"%s\" ei voi poistaa: %s\n"
 
-#: g10/keyserver.c:1909
+#: g10/keyserver.c:1963
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "VAROITUS: tilapäistiedostoa (%s) \"%s\" ei voi poistaa: %s\n"
 
-#: g10/mainproc.c:253
+#: g10/mainproc.c:240
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "outo koko salatulle istuntoavaimelle (%d)\n"
 
-#: g10/mainproc.c:304
+#: g10/mainproc.c:291
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s-salattu istuntoavain\n"
 
-#: g10/mainproc.c:314
+#: g10/mainproc.c:301
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "salattu tuntemattomalla algoritmilla %d\n"
 
-#: g10/mainproc.c:395
+#: g10/mainproc.c:382
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "julkinen avain on %08lX\n"
 
-#: g10/mainproc.c:450
+#: g10/mainproc.c:439
 msgid "public key encrypted data: good DEK\n"
 msgstr "julkisella avaimella salattu data: DEK kelpaa\n"
 
-#: g10/mainproc.c:483
+#: g10/mainproc.c:472
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "salattu %u-bittisella %s-avaimella, tunnus %08lX, luotu %s\n"
 
-#: g10/mainproc.c:487 g10/pkclist.c:219
+#: g10/mainproc.c:476 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                aka \""
 
-#: g10/mainproc.c:491
+#: g10/mainproc.c:480
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "salattu %s-avaimella, tunnus %08lX\n"
 
-#: g10/mainproc.c:505
+#: g10/mainproc.c:494
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "julkisen avaimen avaus epäonnistui: %s\n"
 
-#: g10/mainproc.c:519
+#: g10/mainproc.c:508
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "salattu %lu salasanalla\n"
 
-#: g10/mainproc.c:521
+#: g10/mainproc.c:510
 msgid "encrypted with 1 passphrase\n"
 msgstr "salattu yhdellä salasanalla\n"
 
-#: g10/mainproc.c:549 g10/mainproc.c:571
+#: g10/mainproc.c:541 g10/mainproc.c:563
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "oletettavasti %s-salattua dataa\n"
 
-#: g10/mainproc.c:557
+#: g10/mainproc.c:549
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "IDEA-salain ei käytettävissä, yritetään optimistisesti \n"
 "käyttää sen sijaan salainta %s\n"
 
-#: g10/mainproc.c:589
+#: g10/mainproc.c:581
 msgid "decryption okay\n"
 msgstr "avaus onnistui\n"
 
-#: g10/mainproc.c:593
+#: g10/mainproc.c:585
 msgid "WARNING: message was not integrity protected\n"
 msgstr "VAROITUS: viestin eheyttä ei oltu suojattu\n"
 
-#: g10/mainproc.c:606
+#: g10/mainproc.c:598
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VAROITUS: salattua viestiä on muokattu!\n"
 
-#: g10/mainproc.c:612
+#: g10/mainproc.c:604
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "avaus epäonnistui: %s\n"
 
-#: g10/mainproc.c:631
+#: g10/mainproc.c:623
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "HUOM: lähettäjä määrittää \"vain-sinun-silmillesi\"\n"
 
-#: g10/mainproc.c:633
+#: g10/mainproc.c:625
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "alkuperäisen tiedoston nimi=\"%.*s\"\n"
 
-#: g10/mainproc.c:822
+#: g10/mainproc.c:815
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "itsenäinen mitätöinti - käytä \"gpg --import\" ottaaksesi käyttöön\n"
 
-#: g10/mainproc.c:1168
+#: g10/mainproc.c:1161
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Allekirjoitus täsmää lähettäjään \""
 
-#: g10/mainproc.c:1418
+#: g10/mainproc.c:1419
 msgid "signature verification suppressed\n"
 msgstr "allekirjoituksen varmistus vaiennetaan\n"
 
-#: g10/mainproc.c:1460 g10/mainproc.c:1470
-msgid "can't handle these multiple signatures\n"
+#: g10/mainproc.c:1519
+#, fuzzy
+msgid "can't handle this ambiguous signature data\n"
 msgstr "näitä allekirjoituksia ei voi käsitellä\n"
 
-#: g10/mainproc.c:1480
+#: g10/mainproc.c:1530
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Allekirjoitus vanheni %s\n"
 
-#: g10/mainproc.c:1481
+#: g10/mainproc.c:1531
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                aka \""
 
-#: g10/mainproc.c:1485
+#: g10/mainproc.c:1535
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr ""
 "Allekirjoitus tehty %.*s käyttämällä %s-algoritmia avaintunnuksella %08lX\n"
 
-#: g10/mainproc.c:1505
+#: g10/mainproc.c:1555
 msgid "Key available at: "
 msgstr "Avain saatavilla kohteessa: "
 
-#: g10/mainproc.c:1639 g10/mainproc.c:1687
+#: g10/mainproc.c:1688 g10/mainproc.c:1736
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "VÄÄRÄ allekirjoitus lähettäjältä \""
 
-#: g10/mainproc.c:1641 g10/mainproc.c:1689
+#: g10/mainproc.c:1690 g10/mainproc.c:1738
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Vanhentunut allekirjoitus lähettäjältä \""
 
-#: g10/mainproc.c:1643 g10/mainproc.c:1691
+#: g10/mainproc.c:1692 g10/mainproc.c:1740
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Allekirjoitus täsmää lähettäjään \""
 
-#: g10/mainproc.c:1695
+#: g10/mainproc.c:1744
 msgid "[uncertain]"
 msgstr "[ei tiedossa]"
 
-#: g10/mainproc.c:1727
+#: g10/mainproc.c:1776
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                aka \""
 
-#: g10/mainproc.c:1824
+#: g10/mainproc.c:1873
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Allekirjoitus vanheni %s\n"
 
-#: g10/mainproc.c:1829
+#: g10/mainproc.c:1878
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Allekirjoitus vanhenee %s\n"
 
 # Ensimmäinen %s on binary, textmode tai unknown, ks. alla
-#: g10/mainproc.c:1832
+#: g10/mainproc.c:1881
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
 
-#: g10/mainproc.c:1833
+#: g10/mainproc.c:1882
 msgid "binary"
 msgstr "binääri"
 
-#: g10/mainproc.c:1834
+#: g10/mainproc.c:1883
 msgid "textmode"
 msgstr "teksti"
 
-#: g10/mainproc.c:1834 g10/trustdb.c:536
+#: g10/mainproc.c:1883 g10/trustdb.c:536
 msgid "unknown"
 msgstr "tuntematon "
 
-#: g10/mainproc.c:1854
+#: g10/mainproc.c:1903
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Allekirjoitusta ei voi tarkistaa: %s\n"
 
-#: g10/mainproc.c:1922 g10/mainproc.c:1938 g10/mainproc.c:2024
+#: g10/mainproc.c:1972 g10/mainproc.c:1988 g10/mainproc.c:2074
 msgid "not a detached signature\n"
 msgstr "allekirjoitus ei ole erillinen\n"
 
-#: g10/mainproc.c:1965
+#: g10/mainproc.c:2015
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "VAROITUS: useita allekirjoituksia havaittu.  Vain ensimmäisen voi "
 "tarkistaa.\n"
 
-#: g10/mainproc.c:1973
+#: g10/mainproc.c:2023
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "itsenäinen allekirjoitus luokkaa 0x%02x\n"
 
-#: g10/mainproc.c:2030
+#: g10/mainproc.c:2080
 msgid "old style (PGP 2.x) signature\n"
 msgstr "vanhan tyylin (PGP 2.x) allekirjoitus\n"
 
-#: g10/mainproc.c:2040
+#: g10/mainproc.c:2090
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "epäkelpo juuripaketti havaittu proc_tree():ssä\n"
 
@@ -5322,23 +5329,23 @@ msgstr ""
 msgid "error creating `%s': %s\n"
 msgstr "virhe luotaessa \"%s\": %s\n"
 
-#: g10/plaintext.c:447
+#: g10/plaintext.c:453
 msgid "Detached signature.\n"
 msgstr "Erillinen allekirjoitus.\n"
 
-#: g10/plaintext.c:453
+#: g10/plaintext.c:459
 msgid "Please enter name of data file: "
 msgstr "Anna datatiedoston nimi: "
 
-#: g10/plaintext.c:485
+#: g10/plaintext.c:491
 msgid "reading stdin ...\n"
 msgstr "luetaan vakiosyötettä ...\n"
 
-#: g10/plaintext.c:519
+#: g10/plaintext.c:525
 msgid "no signed data\n"
 msgstr "ei allekirjoitettua dataa\n"
 
-#: g10/plaintext.c:533
+#: g10/plaintext.c:539
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "allekirjoitetun datan \"%s\" avaaminen ei onnistu\n"
diff --git a/po/fr.po b/po/fr.po
index 74fbbc14a..5954a1576 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.2rc2\n"
 "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2006-02-14 15:28+0100\n"
+"POT-Creation-Date: 2006-03-07 11:29+0100\n"
 "PO-Revision-Date: 2005-06-28 00:24+0200\n"
 "Last-Translator: Ga�l Qu�ri <gael@lautre.net>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -45,9 +45,9 @@ msgstr "
 
 #: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:992 g10/gpg.c:3360 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:997 g10/gpg.c:3391 g10/import.c:193 g10/keygen.c:2274
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:476 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
+#: g10/plaintext.c:482 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
 #: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
@@ -83,7 +83,7 @@ msgstr "impossible de lire `%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "note: le fichier `random_seed' n'a pas �t� mis � jour\n"
 
-#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:991 g10/keygen.c:2753
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2753
 #: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
 #: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
 #, c-format
@@ -682,11 +682,11 @@ msgstr "Les commandes d'administration ne sont pas permises\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Commande invalide  (essayez �help�)\n"
 
-#: g10/cardglue.c:435
+#: g10/cardglue.c:434
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr "Ins�rez la carte et tapez entr�e ou entrez 'c' pour annuler: "
 
-#: g10/cardglue.c:572
+#: g10/cardglue.c:573
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
@@ -696,35 +696,35 @@ msgstr ""
 "s�rie:\n"
 "   %.*s\n"
 
-#: g10/cardglue.c:580
+#: g10/cardglue.c:582
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr "Tapez entr�e quand vous �tes pr�t ou entrez 'c' pour annuler: "
 
-#: g10/cardglue.c:915
+#: g10/cardglue.c:917
 msgid "Enter New Admin PIN: "
 msgstr "Entrez le nouveau code PIN admin: "
 
-#: g10/cardglue.c:916
+#: g10/cardglue.c:918
 msgid "Enter New PIN: "
 msgstr "Entrez le nouveau code PIN: "
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:919
 msgid "Enter Admin PIN: "
 msgstr "Entrez le code PIN admin: "
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:920
 msgid "Enter PIN: "
 msgstr "Entrez le code PIN: "
 
-#: g10/cardglue.c:935
+#: g10/cardglue.c:937
 msgid "Repeat this PIN: "
 msgstr "R�p�tez ce code PIN: "
 
-#: g10/cardglue.c:950
+#: g10/cardglue.c:952
 msgid "PIN not correctly repeated; try again"
 msgstr "le code PIN n'a pas �t� correctement r�p�t� ; recommencez"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3720 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3751 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -734,13 +734,13 @@ msgstr "impossible d'ouvrir `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output n'est pas compatible avec cette commande\n"
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1644
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1698
 #: g10/revoke.c:228
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "cl� � %s � introuvable: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1658
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1712
 #: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -857,12 +857,12 @@ msgstr "vous ne pouvez pas utiliser %s en mode %s.\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s chiffr� pour: \"%s\"\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:306
+#: g10/encr-data.c:67 g10/mainproc.c:293
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "donn�es chiffr�es avec %s\n"
 
-#: g10/encr-data.c:69 g10/mainproc.c:310
+#: g10/encr-data.c:69 g10/mainproc.c:297
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "chiffr� avec l'algorithme inconnu %d\n"
@@ -1009,7 +1009,7 @@ msgstr ""
 msgid "WARNING: nothing exported\n"
 msgstr "ATTENTION: rien n'a �t� export�\n"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:373
 msgid ""
 "@Commands:\n"
 " "
@@ -1017,127 +1017,127 @@ msgstr ""
 "@Commandes:\n"
 " "
 
-#: g10/gpg.c:374
+#: g10/gpg.c:375
 msgid "|[file]|make a signature"
 msgstr "|[fichier]|faire une signature"
 
-#: g10/gpg.c:375
+#: g10/gpg.c:376
 msgid "|[file]|make a clear text signature"
 msgstr "|[fichier]|faire une signature en texte clair"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:377
 msgid "make a detached signature"
 msgstr "faire une signature d�tach�e"
 
-#: g10/gpg.c:377
+#: g10/gpg.c:378
 msgid "encrypt data"
 msgstr "chiffrer les donn�es"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:380
 msgid "encryption only with symmetric cipher"
 msgstr "chiffrement sym�trique seulement"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:382
 msgid "decrypt data (default)"
 msgstr "d�chiffrer les donn�es (d�faut)"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:384
 msgid "verify a signature"
 msgstr "v�rifier une signature"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:386
 msgid "list keys"
 msgstr "lister les cl�s"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "list keys and signatures"
 msgstr "lister les cl�s et les signatures"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:389
 msgid "list and check key signatures"
 msgstr "lister et v�rifier les signatures des cl�s"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:390
 msgid "list keys and fingerprints"
 msgstr "lister les cl�s et les empreintes"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:391
 msgid "list secret keys"
 msgstr "lister les cl�s secr�tes"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:392
 msgid "generate a new key pair"
 msgstr "g�n�rer une nouvelle paire de cl�s"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:393
 msgid "remove keys from the public keyring"
 msgstr "enlever les cl�s du porte-cl�s public"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:395
 msgid "remove keys from the secret keyring"
 msgstr "enlever les cl�s du porte-cl�s secret"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:396
 msgid "sign a key"
 msgstr "signer une cl�"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:397
 msgid "sign a key locally"
 msgstr "signer une cl� localement"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:398
 msgid "sign or edit a key"
 msgstr "signer ou �diter une cl�"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:399
 msgid "generate a revocation certificate"
 msgstr "g�n�rer un certificat de r�vocation"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:401
 msgid "export keys"
 msgstr "exporter les cl�s"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:402
 msgid "export keys to a key server"
 msgstr "exporter les cl�s vers un serveur de cl�s"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:403
 msgid "import keys from a key server"
 msgstr "importer les cl�s d'un serveur de cl�s"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:405
 msgid "search for keys on a key server"
 msgstr "chercher les cl�s avec un serveur de cl�s"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:407
 msgid "update all keys from a keyserver"
 msgstr "mettre � jour les cl�s depuis un serveur"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:411
 msgid "import/merge keys"
 msgstr "importer/fusionner les cl�s"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:414
 msgid "print the card status"
 msgstr "afficher l'�tat de la carte"
 
-#: g10/gpg.c:414
+#: g10/gpg.c:415
 msgid "change data on a card"
 msgstr "changer les donn�es d'une carte"
 
-#: g10/gpg.c:415
+#: g10/gpg.c:416
 msgid "change a card's PIN"
 msgstr "changer le code PIN d'une carte"
 
-#: g10/gpg.c:423
+#: g10/gpg.c:424
 msgid "update the trust database"
 msgstr "mettre la base de confiance � jour"
 
-#: g10/gpg.c:430
+#: g10/gpg.c:431
 msgid "|algo [files]|print message digests"
 msgstr "|alg. [fich.]|indiquer les fonctions de hachage"
 
-#: g10/gpg.c:434 g10/gpgv.c:71
+#: g10/gpg.c:435 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1147,51 +1147,51 @@ msgstr ""
 "Options:\n"
 " "
 
-#: g10/gpg.c:436
+#: g10/gpg.c:437
 msgid "create ascii armored output"
 msgstr "cr�er une sortie ascii avec armure"
 
-#: g10/gpg.c:438
+#: g10/gpg.c:439
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOM|chiffrer pour NOM"
 
-#: g10/gpg.c:449
+#: g10/gpg.c:450
 msgid "use this user-id to sign or decrypt"
 msgstr "utiliser ce nom pour signer ou d�chiffrer"
 
-#: g10/gpg.c:450
+#: g10/gpg.c:451
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|niveau de compression N (0 d�sactive)"
 
-#: g10/gpg.c:455
+#: g10/gpg.c:456
 msgid "use canonical text mode"
 msgstr "utiliser le mode texte canonique"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:470
 msgid "use as output file"
 msgstr "utiliser comme fichier de sortie"
 
-#: g10/gpg.c:471 g10/gpgv.c:73
+#: g10/gpg.c:472 g10/gpgv.c:73
 msgid "verbose"
 msgstr "bavard"
 
-#: g10/gpg.c:482
+#: g10/gpg.c:483
 msgid "do not make any changes"
 msgstr "ne rien changer"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:484
 msgid "prompt before overwriting"
 msgstr "demander avant d'�craser un fichier"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:525
 msgid "use strict OpenPGP behavior"
 msgstr "utiliser strictement le comportement OpenPGP"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "generate PGP 2.x compatible messages"
 msgstr "g�n�rer des messages compatibles avec PGP 2.x"
 
-#: g10/gpg.c:553
+#: g10/gpg.c:554
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1199,7 +1199,7 @@ msgstr ""
 "@\n"
 "(Voir la page de manuel pour une liste compl�te des commandes et options)\n"
 
-#: g10/gpg.c:556
+#: g10/gpg.c:557
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1219,17 +1219,17 @@ msgstr ""
 " --list-keys [utilisateur]    montrer les cl�s\n"
 " --fingerprint [utilisateur]  montrer les empreintes\n"
 
-#: g10/gpg.c:746 g10/gpgv.c:98
+#: g10/gpg.c:751 g10/gpgv.c:98
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr ""
 "Signaler toutes anomalies � <gnupg-bugs@gnu.org> (en anglais)\n"
 "et tout probl�me de traduction � <traduc@traduc.org>.\n"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:768
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: g10/gpg.c:766
+#: g10/gpg.c:771
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1239,7 +1239,7 @@ msgstr ""
 "signer, v�rifier, chiffrer ou d�chiffrer\n"
 "l'op�ration par d�faut d�pend des donn�es entr�es\n"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:782
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1247,85 +1247,85 @@ msgstr ""
 "\n"
 "Algorithmes support�s:\n"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:785
 msgid "Pubkey: "
 msgstr "Cl� publique: "
 
-#: g10/gpg.c:786 g10/keyedit.c:2266
+#: g10/gpg.c:791 g10/keyedit.c:2266
 msgid "Cipher: "
 msgstr "Chiffrement: "
 
-#: g10/gpg.c:792
+#: g10/gpg.c:797
 msgid "Hash: "
 msgstr "Hachage: "
 
-#: g10/gpg.c:798 g10/keyedit.c:2312
+#: g10/gpg.c:803 g10/keyedit.c:2312
 msgid "Compression: "
 msgstr "Compression: "
 
-#: g10/gpg.c:881
+#: g10/gpg.c:886
 msgid "usage: gpg [options] "
 msgstr "utilisation: gpg [options] "
 
-#: g10/gpg.c:1029
+#: g10/gpg.c:1034
 msgid "conflicting commands\n"
 msgstr "commandes en conflit\n"
 
-#: g10/gpg.c:1047
+#: g10/gpg.c:1052
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "aucun signe = trouv� dans la d�finition du groupe `%s'\n"
 
-#: g10/gpg.c:1244
+#: g10/gpg.c:1249
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 "AVERTISSEMENT: le propri�taire du r�pertoire personnel `%s' est\n"
 "peu s�r\n"
 
-#: g10/gpg.c:1247
+#: g10/gpg.c:1252
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr ""
 "AVERTISSEMENT: le propri�taire du fichier de configuration `%s'\n"
 "est peu s�r\n"
 
-#: g10/gpg.c:1250
+#: g10/gpg.c:1255
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr ""
 "AVERTISSEMENT: le propri�taire de l'extension `%s' est peu\n"
 "s�r\n"
 
-#: g10/gpg.c:1256
+#: g10/gpg.c:1261
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr ""
 "AVERTISSEMENT: les permissions du r�pertoire personnel `%s'\n"
 "sont peu s�res\n"
 
-#: g10/gpg.c:1259
+#: g10/gpg.c:1264
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr ""
 "AVERTISSEMENT: les permissions du fichier de configuration\n"
 "`%s' sont peu s�res\n"
 
-#: g10/gpg.c:1262
+#: g10/gpg.c:1267
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr ""
 "AVERTISSEMENT: les permissions de l'extension `%s' sont\n"
 "peu s�res\n"
 
-#: g10/gpg.c:1268
+#: g10/gpg.c:1273
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "AVERTISSEMENT: le propri�taire du r�pertoire contenant est peu\n"
 "s�r pour le r�pertoire personnel `%s'\n"
 
-#: g10/gpg.c:1271
+#: g10/gpg.c:1276
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1333,21 +1333,21 @@ msgstr ""
 "AVERTISSEMENT: le propri�taire du r�pertoire contenant est peu\n"
 "s�r pour le fichier de configuration `%s'\n"
 
-#: g10/gpg.c:1274
+#: g10/gpg.c:1279
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "AVERTISSEMENT: le propri�taire du r�pertoire contenant est peu\n"
 "s�r pour l'extension `%s'\n"
 
-#: g10/gpg.c:1280
+#: g10/gpg.c:1285
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "AVERTISSEMENT: les permissions du r�pertoire contenant le\n"
 "r�pertoire personnel `%s' sont peu s�res\n"
 
-#: g10/gpg.c:1283
+#: g10/gpg.c:1288
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1355,478 +1355,487 @@ msgstr ""
 "AVERTISSEMENT: les permissions du r�pertoire contenant le\n"
 "fichier de configuration `%s' sont peu s�res\n"
 
-#: g10/gpg.c:1286
+#: g10/gpg.c:1291
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "AVERTISSEMENT: les permissions du r�pertoire contenant\n"
 "l'extension `%s' sont peu s�res\n"
 
-#: g10/gpg.c:1427
+#: g10/gpg.c:1432
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "�l�ment de configuration `%s' inconnu\n"
 
-#: g10/gpg.c:1521
+#: g10/gpg.c:1526
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1523
+#: g10/gpg.c:1528
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1525
+#: g10/gpg.c:1530
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Pas de signature correspondante dans le porte-cl�s secret\n"
 
-#: g10/gpg.c:1527
+#: g10/gpg.c:1532
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1536
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1538
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "l'URL du serveur de cl�s favori qui a �t� donn�e est invalide\n"
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1540
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1542
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1544
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1546
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr ""
 "passer de la liste des cl�s secr�tes � celle des cl�s priv�es\n"
 "et inversement"
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1548
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Pas de signature correspondante dans le porte-cl�s secret\n"
 
-#: g10/gpg.c:1874
+#: g10/gpg.c:1879
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTE: l'ancien fichier d'options par d�faut `%s' a �t� ignor�\n"
 
-#: g10/gpg.c:1916
+#: g10/gpg.c:1921
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTE: pas de fichier d'options par d�faut `%s'\n"
 
-#: g10/gpg.c:1920
+#: g10/gpg.c:1925
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichier d'options `%s': %s\n"
 
-#: g10/gpg.c:1927
+#: g10/gpg.c:1932
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lire les options de `%s'\n"
 
-#: g10/gpg.c:2142 g10/gpg.c:2716 g10/gpg.c:2735
+#: g10/gpg.c:2147 g10/gpg.c:2747 g10/gpg.c:2766
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTE: %s n'est pas pour une utilisation normale !\n"
 
-#: g10/gpg.c:2158
+#: g10/gpg.c:2163
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "l'extension de chiffrement `%s' n'a pas �t� charg�e car ses\n"
 "permissions sont peu s�res\n"
 
-#: g10/gpg.c:2312 g10/gpg.c:2324
+#: g10/gpg.c:2317 g10/gpg.c:2329
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' n'est pas une date d'expiration de signature valide\n"
 
-#: g10/gpg.c:2400
+#: g10/gpg.c:2405
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' n'est pas un jeu de caract�res valide\n"
 
-#: g10/gpg.c:2422 g10/keyedit.c:3997
+#: g10/gpg.c:2429 g10/keyedit.c:3997
 msgid "could not parse keyserver URL\n"
 msgstr "impossible d'interpr�ter l'URL du serveur de cl�s\n"
 
-#: g10/gpg.c:2428
+#: g10/gpg.c:2441
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: les options du serveur de cl�s sont invalides\n"
 
-#: g10/gpg.c:2431
+#: g10/gpg.c:2444
 msgid "invalid keyserver options\n"
 msgstr "les options du serveur de cl�s sont invalides\n"
 
-#: g10/gpg.c:2438
+#: g10/gpg.c:2451
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: options d'import invalides\n"
 
-#: g10/gpg.c:2441
+#: g10/gpg.c:2454
 msgid "invalid import options\n"
 msgstr "options d'import invalides\n"
 
-#: g10/gpg.c:2448
+#: g10/gpg.c:2461
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: options d'export invalides\n"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2464
 msgid "invalid export options\n"
 msgstr "options d'export invalides\n"
 
-#: g10/gpg.c:2458
+#: g10/gpg.c:2471
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: options de liste invalides\n"
 
-#: g10/gpg.c:2461
+#: g10/gpg.c:2474
 msgid "invalid list options\n"
 msgstr "options de liste invalides\n"
 
-#: g10/gpg.c:2469
+#: g10/gpg.c:2482
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2471
+#: g10/gpg.c:2484
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2473
+#: g10/gpg.c:2486
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' n'est pas une date d'expiration de signature valide\n"
 
-#: g10/gpg.c:2475
+#: g10/gpg.c:2488
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2479
+#: g10/gpg.c:2492
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2481
+#: g10/gpg.c:2494
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "l'URL du serveur de cl�s favori qui a �t� donn�e est invalide\n"
 
-#: g10/gpg.c:2483
+#: g10/gpg.c:2496
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' n'est pas une date d'expiration de signature valide\n"
 
-#: g10/gpg.c:2485
+#: g10/gpg.c:2498
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2505
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: options de v�rification invalides\n"
 
-#: g10/gpg.c:2495
+#: g10/gpg.c:2508
 msgid "invalid verify options\n"
 msgstr "options de v�rification invalides\n"
 
-#: g10/gpg.c:2502
+#: g10/gpg.c:2515
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "impossible de mettre le chemin d'ex�cution � %s\n"
 
-#: g10/gpg.c:2705
+#: g10/gpg.c:2665
+#, fuzzy, c-format
+msgid "%s:%d: invalid auto-key-locate list\n"
+msgstr "%s:%d: options de v�rification invalides\n"
+
+#: g10/gpg.c:2668
+msgid "invalid auto-key-locate list\n"
+msgstr ""
+
+#: g10/gpg.c:2736
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENTION: Le programme peut cr�er un fichier �core� !\n"
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2740
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ATTENTION: %s remplace %s\n"
 
-#: g10/gpg.c:2718
+#: g10/gpg.c:2749
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n'est pas permis avec %s !\n"
 
-#: g10/gpg.c:2721
+#: g10/gpg.c:2752
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n'a aucun sens avec %s !\n"
 
-#: g10/gpg.c:2728
+#: g10/gpg.c:2759
 #, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "NOTE: %s n'est pas disponible dans cette version\n"
 
-#: g10/gpg.c:2743
+#: g10/gpg.c:2774
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "pas d'ex�cution ave une m�moire non s�curis�e � cause de %s\n"
 
-#: g10/gpg.c:2757
+#: g10/gpg.c:2788
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "il n'est possible de faire une signature d�tach�e ou en texte clair\n"
 "qu'en mode --pgp2\n"
 
-#: g10/gpg.c:2763
+#: g10/gpg.c:2794
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "vous ne pouvez pas signer et chiffrer en m�me temps en mode --pgp2\n"
 
-#: g10/gpg.c:2769
+#: g10/gpg.c:2800
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "vous devez utiliser des fichiers (et pas un tube) lorsque --pgp2\n"
 "est activ�.\n"
 
-#: g10/gpg.c:2782
+#: g10/gpg.c:2813
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "chiffrer un message en mode --pgp2 n�cessite l'algorithme de chiffrage IDEA\n"
 
-#: g10/gpg.c:2849 g10/gpg.c:2873
+#: g10/gpg.c:2880 g10/gpg.c:2904
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorithme de chiffrement s�lectionn� est invalide\n"
 
-#: g10/gpg.c:2855 g10/gpg.c:2879
+#: g10/gpg.c:2886 g10/gpg.c:2910
 msgid "selected digest algorithm is invalid\n"
 msgstr "la fonction de hachage s�lectionn�e est invalide\n"
 
-#: g10/gpg.c:2861
+#: g10/gpg.c:2892
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algorithme de compression s�lectionn� est invalide\n"
 
-#: g10/gpg.c:2867
+#: g10/gpg.c:2898
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "la fonction de hachage de certification s�lectionn�e est invalide\n"
 
-#: g10/gpg.c:2882
+#: g10/gpg.c:2913
 msgid "completes-needed must be greater than 0\n"
 msgstr "�completes-needed� doit �tre sup�rieur � 0\n"
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2915
 msgid "marginals-needed must be greater than 1\n"
 msgstr "�marginals-needed� doit �tre sup�rieur � 1\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2917
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth doit �tre compris entre 1 et 255\n"
 
-#: g10/gpg.c:2888
+#: g10/gpg.c:2919
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-cert-level invalide; doit �tre 0, 1, 2 ou 3\n"
 
-#: g10/gpg.c:2890
+#: g10/gpg.c:2921
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "min-cert-level invalide; doit �tre 0, 1, 2 ou 3\n"
 
-#: g10/gpg.c:2893
+#: g10/gpg.c:2924
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTE: le mode S2K simple (0) est fortement d�conseill�\n"
 
-#: g10/gpg.c:2897
+#: g10/gpg.c:2928
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mode S2K invalide; ce doit �tre 0, 1 ou 3\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2935
 msgid "invalid default preferences\n"
 msgstr "pr�f�rences par d�faut invalides\n"
 
-#: g10/gpg.c:2913
+#: g10/gpg.c:2944
 msgid "invalid personal cipher preferences\n"
 msgstr "pr�f�rences de chiffrement personnelles invalides\n"
 
-#: g10/gpg.c:2917
+#: g10/gpg.c:2948
 msgid "invalid personal digest preferences\n"
 msgstr "pr�f�rences de hachage personnelles invalides\n"
 
-#: g10/gpg.c:2921
+#: g10/gpg.c:2952
 msgid "invalid personal compress preferences\n"
 msgstr "pr�f�rences de compression personnelles invalides\n"
 
-#: g10/gpg.c:2954
+#: g10/gpg.c:2985
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ne marche pas encore avec %s\n"
 
-#: g10/gpg.c:3001
+#: g10/gpg.c:3032
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 "vous ne pouvez pas utiliser l'algorithme de chiffrement `%s'\n"
 "en mode %s.\n"
 
-#: g10/gpg.c:3006
+#: g10/gpg.c:3037
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 "vous ne pouvez pas utiliser l'algorithme de hachage `%s'\n"
 "en mode %s.\n"
 
-#: g10/gpg.c:3011
+#: g10/gpg.c:3042
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "vous ne pouvez pas utiliser l'algorithme de compression `%s'\n"
 "en mode %s.\n"
 
-#: g10/gpg.c:3107
+#: g10/gpg.c:3138
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "impossible d'initialiser la base de confiance: %s\n"
 
-#: g10/gpg.c:3118
+#: g10/gpg.c:3149
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AVERTISSEMENT: des destinataires (-r) ont �t� donn�s alors que le\n"
 "chiffrement ne se fait pas par cl� publique\n"
 
-#: g10/gpg.c:3129
+#: g10/gpg.c:3160
 msgid "--store [filename]"
 msgstr "--store [nom du fichier]"
 
-#: g10/gpg.c:3136
+#: g10/gpg.c:3167
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom du fichier]"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3169
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "le chiffrement sym�trique de `%s' a �chou�: %s\n"
 
-#: g10/gpg.c:3148
+#: g10/gpg.c:3179
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom du fichier]"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3192
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [nom du fichier]"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3194
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "vous ne pouvez pas utiliser --symmetric --encrypt avec --s2k-mode 0\n"
 
-#: g10/gpg.c:3166
+#: g10/gpg.c:3197
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "vous ne pouvez pas utiliser --symmetric --encrypt en mode %s.\n"
 
-#: g10/gpg.c:3184
+#: g10/gpg.c:3215
 msgid "--sign [filename]"
 msgstr "--sign [nom du fichier]"
 
-#: g10/gpg.c:3197
+#: g10/gpg.c:3228
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom du fichier]"
 
-#: g10/gpg.c:3212
+#: g10/gpg.c:3243
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [nom du fichier]"
 
-#: g10/gpg.c:3214
+#: g10/gpg.c:3245
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 "Vous ne pouvez pas utiliser --symmetric --sign --encrypt avec\n"
 "--s2k-mode 0\n"
 
-#: g10/gpg.c:3217
+#: g10/gpg.c:3248
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 "vous ne pouvez pas utiliser --symmetric --sign --encrypt\n"
 "en mode %s.\n"
 
-#: g10/gpg.c:3237
+#: g10/gpg.c:3268
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nom du fichier]"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3277
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom du fichier]"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3302
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom du fichier]"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3310
 msgid "--sign-key user-id"
 msgstr "--sign-key utilisateur"
 
-#: g10/gpg.c:3283
+#: g10/gpg.c:3314
 msgid "--lsign-key user-id"
 msgstr "--lsign-key utilisateur"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3335
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key utilisateur [commandes]"
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3406
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [utilisateur] [porte-cl�s]"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3443
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "l'envoi vers le serveur de cl�s a �chou�: %s\n"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3445
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "la r�ception depuis le serveur de cl�s a �chou�: %s\n"
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3447
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "l'export de la cl� a �chou�: %s\n"
 
-#: g10/gpg.c:3427
+#: g10/gpg.c:3458
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "la recherche au sein du serveur de cl�s a �chou�: %s\n"
 
-#: g10/gpg.c:3437
+#: g10/gpg.c:3468
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "le rafra�chissement par le serveur de cl�s a �chou�: %s\n"
 
-#: g10/gpg.c:3488
+#: g10/gpg.c:3519
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "la suppression d'une armure a �chou�: %s\n"
 
-#: g10/gpg.c:3496
+#: g10/gpg.c:3527
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "la construction d'une armure a �chou�: %s \n"
 
-#: g10/gpg.c:3583
+#: g10/gpg.c:3614
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algorithme de hachage `%s' invalide\n"
 
-#: g10/gpg.c:3706
+#: g10/gpg.c:3737
 msgid "[filename]"
 msgstr "[nom du fichier]"
 
-#: g10/gpg.c:3710
+#: g10/gpg.c:3741
 msgid "Go ahead and type your message ...\n"
 msgstr "Vous pouvez taper votre message...\n"
 
-#: g10/gpg.c:4000
+#: g10/gpg.c:4031
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1834,27 +1843,27 @@ msgstr ""
 "le nom d'une notation ne doit comporter que des caract�res imprimables\n"
 "ou des espaces, et se terminer par un signe '='\n"
 
-#: g10/gpg.c:4008
+#: g10/gpg.c:4039
 msgid "a user notation name must contain the '@' character\n"
 msgstr "un nom de notation utilisateur doit contenir le caract�re '@'\n"
 
-#: g10/gpg.c:4013
+#: g10/gpg.c:4044
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "un nom de notation utilisateur ne doit pas plus d'un caract�re '@'\n"
 
-#: g10/gpg.c:4024
+#: g10/gpg.c:4055
 msgid "a notation value must not use any control characters\n"
 msgstr "une valeur de notation ne doit utiliser aucun caract�re de contr�le\n"
 
-#: g10/gpg.c:4058
+#: g10/gpg.c:4089
 msgid "the given certification policy URL is invalid\n"
 msgstr "l'URL de politique de certification donn�e est invalide\n"
 
-#: g10/gpg.c:4060
+#: g10/gpg.c:4091
 msgid "the given signature policy URL is invalid\n"
 msgstr "l'URL de politique de signature donn�e est invalide\n"
 
-#: g10/gpg.c:4093
+#: g10/gpg.c:4124
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "l'URL du serveur de cl�s favori qui a �t� donn�e est invalide\n"
 
@@ -1862,35 +1871,36 @@ msgstr "l'URL du serveur de cl
 msgid "too many entries in pk cache - disabled\n"
 msgstr "trop d'entr�es dans le cache pk - d�sactiv�\n"
 
-#: g10/getkey.c:188 g10/getkey.c:2845
+#: g10/getkey.c:188 g10/getkey.c:2876
 msgid "[User ID not found]"
 msgstr "[Nom utilisateur introuvable]"
 
-#: g10/getkey.c:931 g10/getkey.c:953 g10/getkey.c:976
+#: g10/getkey.c:933 g10/getkey.c:950 g10/getkey.c:970 g10/getkey.c:986
+#: g10/getkey.c:1001
 #, c-format
 msgid "Automatically retrieved `%s' via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1769
+#: g10/getkey.c:1800
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "La cl� invalide %s a �t� rendue valide par\n"
 "--allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2323
+#: g10/getkey.c:2354
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "pas de sous-cl� secr�te pour la cl� publique %s - ignor�e\n"
 
-#: g10/getkey.c:2554
+#: g10/getkey.c:2585
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr ""
 "utilisation de la sous-cl� %s � la place de la cl�\n"
 "principale %s\n"
 
-#: g10/getkey.c:2601
+#: g10/getkey.c:2632
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "cl� %s: cl� secr�te sans cl� publique - non prise en compte\n"
@@ -3441,12 +3451,12 @@ msgid "(sensitive)"
 msgstr "(sensible)"
 
 #: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
-#: g10/keylist.c:194 g10/keyserver.c:471
+#: g10/keylist.c:194 g10/keyserver.c:525
 #, c-format
 msgid "created: %s"
 msgstr "cr��: %s"
 
-#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:967
+#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:960
 #, c-format
 msgid "revoked: %s"
 msgstr "revoqu�: %s"
@@ -3458,7 +3468,7 @@ msgstr "expir
 
 #: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
 #: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:477 g10/mainproc.c:973
+#: g10/keylist.c:914 g10/keyserver.c:531 g10/mainproc.c:966
 #, c-format
 msgid "expires: %s"
 msgstr "expire: %s"
@@ -3494,13 +3504,13 @@ msgstr ""
 "Notez que la validit� affich�e pour la cl� n'est pas n�cessairement\n"
 "correcte tant que vous n'avez pas relanc� le programme.\n"
 
-#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:481
-#: g10/mainproc.c:1734 g10/trustdb.c:1184 g10/trustdb.c:1704
+#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:535
+#: g10/mainproc.c:1783 g10/trustdb.c:1184 g10/trustdb.c:1704
 msgid "revoked"
 msgstr "revoqu�e"
 
-#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:485
-#: g10/mainproc.c:1736 g10/trustdb.c:537 g10/trustdb.c:1706
+#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:539
+#: g10/mainproc.c:1785 g10/trustdb.c:537 g10/trustdb.c:1706
 msgid "expired"
 msgstr "expir�e"
 
@@ -4347,383 +4357,380 @@ msgstr "%s: porte-cl
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:77
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:81
+#: g10/keyserver.c:79
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:83
+#: g10/keyserver.c:81
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:87
+#: g10/keyserver.c:85
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:89
-msgid "automatically retrieve keys from PKA records"
-msgstr ""
-
-#: g10/keyserver.c:91
-msgid "automatically retrieve keys from DNS"
-msgstr ""
-
-#: g10/keyserver.c:95
+#: g10/keyserver.c:87
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "Entrez l'URL de votre serveur de cl�s favori: "
 
-#: g10/keyserver.c:139
+#: g10/keyserver.c:89
+msgid "honor the PKA record set on a key when retrieving keys"
+msgstr ""
+
+#: g10/keyserver.c:154
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "AVERTISSEMENT: les options de serveur de cl�s `%s' ne sont pas\n"
 "utilis�es dans cette plateforme\n"
 
-#: g10/keyserver.c:483
+#: g10/keyserver.c:537
 msgid "disabled"
 msgstr "d�sactiv�"
 
-#: g10/keyserver.c:684
+#: g10/keyserver.c:738
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Entrez le(s) nombre(s), S)uivant, ou Q)uitter > "
 
-#: g10/keyserver.c:767 g10/keyserver.c:1368
+#: g10/keyserver.c:821 g10/keyserver.c:1422
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "protocole serveur de cl�s invalide (nous %d!=gestionnaire %d)\n"
 
-#: g10/keyserver.c:865
+#: g10/keyserver.c:919
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "cl� � %s � introuvable dans le serveur de cl�s\n"
 
-#: g10/keyserver.c:867
+#: g10/keyserver.c:921
 msgid "key not found on keyserver\n"
 msgstr "cl� non trouv�e dans le serveur de cl�s\n"
 
-#: g10/keyserver.c:1092
+#: g10/keyserver.c:1146
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "requ�te de la cl� %s du serveur %s %s\n"
 
-#: g10/keyserver.c:1096
+#: g10/keyserver.c:1150
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "requ�te de la cl� %s de %s\n"
 
-#: g10/keyserver.c:1120
+#: g10/keyserver.c:1174
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "recherche de � %s � du serveur %s %s\n"
 
-#: g10/keyserver.c:1123
+#: g10/keyserver.c:1177
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "recherche de � %s � de %s\n"
 
-#: g10/keyserver.c:1271
+#: g10/keyserver.c:1325
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "envoi de la cl� %s au serveur %s %s\n"
 
-#: g10/keyserver.c:1275
+#: g10/keyserver.c:1329
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "envoi de la cl� %s � %s\n"
 
-#: g10/keyserver.c:1318
+#: g10/keyserver.c:1372
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "recherche de � %s � du serveur %s %s\n"
 
-#: g10/keyserver.c:1321
+#: g10/keyserver.c:1375
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "recherche de � %s � de %s\n"
 
-#: g10/keyserver.c:1328 g10/keyserver.c:1424
+#: g10/keyserver.c:1382 g10/keyserver.c:1478
 msgid "no keyserver action!\n"
 msgstr "pas d'action pour le serveur de cl�s !\n"
 
-#: g10/keyserver.c:1376
+#: g10/keyserver.c:1430
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 "AVERTISSEMENT: le gestionnaire de serveurs de cl�s provient d'une\n"
 "version diff�rente de GnuPG (%s)\n"
 
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1439
 msgid "keyserver did not send VERSION\n"
 msgstr "le serveurs de cl�s n'a pas envoy� son num�ro de VERSION\n"
 
-#: g10/keyserver.c:1446
+#: g10/keyserver.c:1500
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "pas de serveur de cl�s connu (utilisez l'option --keyserver)\n"
 
-#: g10/keyserver.c:1452
+#: g10/keyserver.c:1506
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 "les appels externes � un serveur de cl� ne sont pas support�s dans\n"
 "cette compilation\n"
 
-#: g10/keyserver.c:1464
+#: g10/keyserver.c:1518
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "pas de gestionnaire pour le type de serveurs de cl�s `%s'\n"
 
-#: g10/keyserver.c:1469
+#: g10/keyserver.c:1523
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 "l'action `%s' n'est pas support�e avec le type de serveurs\n"
 "de cl�s `%s'\n"
 
-#: g10/keyserver.c:1477
+#: g10/keyserver.c:1531
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "%s ne supporte pas le gestionnaire de version %d\n"
 
-#: g10/keyserver.c:1484
+#: g10/keyserver.c:1538
 msgid "keyserver timed out\n"
 msgstr "le d�lai d'attente du serveur de cl�s a expir�\n"
 
-#: g10/keyserver.c:1489
+#: g10/keyserver.c:1543
 msgid "keyserver internal error\n"
 msgstr "erreur interne du serveur de cl�s\n"
 
-#: g10/keyserver.c:1498
+#: g10/keyserver.c:1552
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "erreur de communication avec le serveur de cl�s: %s\n"
 
-#: g10/keyserver.c:1523 g10/keyserver.c:1557
+#: g10/keyserver.c:1577 g10/keyserver.c:1611
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "� %s � n'est pas une ID de cl�: ignor�\n"
 
-#: g10/keyserver.c:1814
+#: g10/keyserver.c:1868
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr ""
 "AVERTISSEMENT: impossible de rafra�chir la cl� %s\n"
 "via %s: %s\n"
 
-#: g10/keyserver.c:1836
+#: g10/keyserver.c:1890
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "rafra�chissement d'une cl� depuis %s\n"
 
-#: g10/keyserver.c:1838
+#: g10/keyserver.c:1892
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "rafra�chissement de %d cl�s depuis %s\n"
 
-#: g10/keyserver.c:1903
+#: g10/keyserver.c:1957
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr ""
 "AVERTISSEMENT: impossible de rafra�chir la cl� %s\n"
 "via %s: %s\n"
 
-#: g10/keyserver.c:1909
+#: g10/keyserver.c:1963
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr ""
 "AVERTISSEMENT: impossible de rafra�chir la cl� %s\n"
 "via %s: %s\n"
 
-#: g10/mainproc.c:253
+#: g10/mainproc.c:240
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "taille �tonnante pour une cl� de session chiffr�e (%d)\n"
 
-#: g10/mainproc.c:304
+#: g10/mainproc.c:291
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "cl� de session chiffr�e %s\n"
 
-#: g10/mainproc.c:314
+#: g10/mainproc.c:301
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "phrase de passe g�n�r�e avec l'algorithme de hachage %d inconnu\n"
 
-#: g10/mainproc.c:395
+#: g10/mainproc.c:382
 #, c-format
 msgid "public key is %s\n"
 msgstr "la cl� publique est %s\n"
 
-#: g10/mainproc.c:450
+#: g10/mainproc.c:439
 msgid "public key encrypted data: good DEK\n"
 msgstr "donn�es chiffr�es par cl� publique: bonne cl� de chiffrement (DEK)\n"
 
-#: g10/mainproc.c:483
+#: g10/mainproc.c:472
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "chiffr� avec une cl� de %u bits %s, ID %s, cr��e le %s\n"
 
-#: g10/mainproc.c:487 g10/pkclist.c:219
+#: g10/mainproc.c:476 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      � %s �\n"
 
-#: g10/mainproc.c:491
+#: g10/mainproc.c:480
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "chiffr� avec une cl� %s, ID %s\n"
 
-#: g10/mainproc.c:505
+#: g10/mainproc.c:494
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "le d�chiffrement par cl� publique a �chou�: %s\n"
 
-#: g10/mainproc.c:519
+#: g10/mainproc.c:508
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "chiffr� avec %lu phrases de passe\n"
 
-#: g10/mainproc.c:521
+#: g10/mainproc.c:510
 msgid "encrypted with 1 passphrase\n"
 msgstr "chiffr� avec 1 phrase de passe\n"
 
-#: g10/mainproc.c:549 g10/mainproc.c:571
+#: g10/mainproc.c:541 g10/mainproc.c:563
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "on suppose des donn�es chiffr�es avec %s\n"
 
-#: g10/mainproc.c:557
+#: g10/mainproc.c:549
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "L'algorithme IDEA n'est pas disponible, avec un peu de chance %s marchera\n"
 "peut-�tre\n"
 
-#: g10/mainproc.c:589
+#: g10/mainproc.c:581
 msgid "decryption okay\n"
 msgstr "le d�chiffrement a r�ussi\n"
 
-#: g10/mainproc.c:593
+#: g10/mainproc.c:585
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVERTISSEMENT: l'int�grit� du message n'�tait pas prot�g�e\n"
 
-#: g10/mainproc.c:606
+#: g10/mainproc.c:598
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVERTISSEMENT: le message chiffr� a �t� manipul� !\n"
 
-#: g10/mainproc.c:612
+#: g10/mainproc.c:604
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "le d�chiffrement a �chou�: %s\n"
 
-#: g10/mainproc.c:631
+#: g10/mainproc.c:623
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTE: l'exp�diteur a demand� �pour vos yeux seulement�\n"
 
-#: g10/mainproc.c:633
+#: g10/mainproc.c:625
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nom de fichier original: '%.*s'\n"
 
-#: g10/mainproc.c:822
+#: g10/mainproc.c:815
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "r�vocation autonome - utilisez �gpg --import� pour l'appliquer\n"
 
-#: g10/mainproc.c:1168
+#: g10/mainproc.c:1161
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Bonne signature de � %s �"
 
-#: g10/mainproc.c:1418
+#: g10/mainproc.c:1419
 msgid "signature verification suppressed\n"
 msgstr "v�rification de signature supprim�e\n"
 
-#: g10/mainproc.c:1460 g10/mainproc.c:1470
-msgid "can't handle these multiple signatures\n"
+#: g10/mainproc.c:1519
+#, fuzzy
+msgid "can't handle this ambiguous signature data\n"
 msgstr "le traitement de ces signatures multiples est impossible\n"
 
-#: g10/mainproc.c:1480
+#: g10/mainproc.c:1530
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Signature faite le %s\n"
 
-#: g10/mainproc.c:1481
+#: g10/mainproc.c:1531
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               en utilisant la cl� %s %s\n"
 
-#: g10/mainproc.c:1485
+#: g10/mainproc.c:1535
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Signature faite le %s avec la cl� %s ID %s\n"
 
-#: g10/mainproc.c:1505
+#: g10/mainproc.c:1555
 msgid "Key available at: "
 msgstr "Cl� disponible sur: "
 
-#: g10/mainproc.c:1639 g10/mainproc.c:1687
+#: g10/mainproc.c:1688 g10/mainproc.c:1736
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "MAUVAISE signature de � %s �"
 
-#: g10/mainproc.c:1641 g10/mainproc.c:1689
+#: g10/mainproc.c:1690 g10/mainproc.c:1738
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Signature expir�e de � %s �"
 
-#: g10/mainproc.c:1643 g10/mainproc.c:1691
+#: g10/mainproc.c:1692 g10/mainproc.c:1740
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Bonne signature de � %s �"
 
-#: g10/mainproc.c:1695
+#: g10/mainproc.c:1744
 msgid "[uncertain]"
 msgstr "[incertain]"
 
-#: g10/mainproc.c:1727
+#: g10/mainproc.c:1776
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                alias � %s �"
 
-#: g10/mainproc.c:1824
+#: g10/mainproc.c:1873
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "La signature a expir� le %s\n"
 
-#: g10/mainproc.c:1829
+#: g10/mainproc.c:1878
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "La signature expire le %s\n"
 
-#: g10/mainproc.c:1832
+#: g10/mainproc.c:1881
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "signature %s, algorithme de hachage %s\n"
 
-#: g10/mainproc.c:1833
+#: g10/mainproc.c:1882
 msgid "binary"
 msgstr "binaire"
 
-#: g10/mainproc.c:1834
+#: g10/mainproc.c:1883
 msgid "textmode"
 msgstr "modetexte"
 
-#: g10/mainproc.c:1834 g10/trustdb.c:536
+#: g10/mainproc.c:1883 g10/trustdb.c:536
 msgid "unknown"
 msgstr "inconnu"
 
-#: g10/mainproc.c:1854
+#: g10/mainproc.c:1903
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossible de v�rifier la signature: %s\n"
 
-#: g10/mainproc.c:1922 g10/mainproc.c:1938 g10/mainproc.c:2024
+#: g10/mainproc.c:1972 g10/mainproc.c:1988 g10/mainproc.c:2074
 msgid "not a detached signature\n"
 msgstr "la signature n'est pas d�tach�e\n"
 
-#: g10/mainproc.c:1965
+#: g10/mainproc.c:2015
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
@@ -4731,16 +4738,16 @@ msgstr ""
 "premi�re\n"
 "sera v�rifi�e.\n"
 
-#: g10/mainproc.c:1973
+#: g10/mainproc.c:2023
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "signature autonome de classe 0x%02x\n"
 
-#: g10/mainproc.c:2030
+#: g10/mainproc.c:2080
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signature d'un ancien style (PGP 2.x)\n"
 
-#: g10/mainproc.c:2040
+#: g10/mainproc.c:2090
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquet racine invalide d�tect� dans proc_tree()\n"
 
@@ -5313,23 +5320,23 @@ msgstr ""
 msgid "error creating `%s': %s\n"
 msgstr "erreur pendant la cr�ation de `%s': %s\n"
 
-#: g10/plaintext.c:447
+#: g10/plaintext.c:453
 msgid "Detached signature.\n"
 msgstr "Signature d�tach�e.\n"
 
-#: g10/plaintext.c:453
+#: g10/plaintext.c:459
 msgid "Please enter name of data file: "
 msgstr "Entrez le nom du fichier de donn�es: "
 
-#: g10/plaintext.c:485
+#: g10/plaintext.c:491
 msgid "reading stdin ...\n"
 msgstr "lecture de l'entr�e standard...\n"
 
-#: g10/plaintext.c:519
+#: g10/plaintext.c:525
 msgid "no signed data\n"
 msgstr "pas de donn�es sign�es\n"
 
-#: g10/plaintext.c:533
+#: g10/plaintext.c:539
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "impossible d'ouvir les donn�es sign�es `%s'\n"
diff --git a/po/gl.po b/po/gl.po
index e8f64a743..1fd23eea9 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.4\n"
 "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2006-02-14 15:28+0100\n"
+"POT-Creation-Date: 2006-03-07 11:29+0100\n"
 "PO-Revision-Date: 2003-12-04 11:39+0100\n"
 "Last-Translator: Jacobo Tarrio <jtarrio@trasno.net>\n"
 "Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
@@ -40,9 +40,9 @@ msgstr "gravando a chave secreta en `%s'\n"
 
 #: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:992 g10/gpg.c:3360 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:997 g10/gpg.c:3391 g10/import.c:193 g10/keygen.c:2274
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:476 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
+#: g10/plaintext.c:482 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
 #: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
@@ -76,7 +76,7 @@ msgstr "non se pode ler de `%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "nota: o ficheiro random_seed non se actualiza\n"
 
-#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:991 g10/keygen.c:2753
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2753
 #: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
 #: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
 #, c-format
@@ -695,51 +695,51 @@ msgstr "gravando a chave secreta en `%s'\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando incorrecto (tente \"help\")\n"
 
-#: g10/cardglue.c:435
+#: g10/cardglue.c:434
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:572
+#: g10/cardglue.c:573
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:580
+#: g10/cardglue.c:582
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:915
+#: g10/cardglue.c:917
 #, fuzzy
 msgid "Enter New Admin PIN: "
 msgstr "Introduza o ID de usuario: "
 
-#: g10/cardglue.c:916
+#: g10/cardglue.c:918
 #, fuzzy
 msgid "Enter New PIN: "
 msgstr "Introduza o ID de usuario: "
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:919
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:920
 #, fuzzy
 msgid "Enter PIN: "
 msgstr "Introduza o ID de usuario: "
 
-#: g10/cardglue.c:935
+#: g10/cardglue.c:937
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Repita o contrasinal: "
 
-#: g10/cardglue.c:950
+#: g10/cardglue.c:952
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "o contrasinal non se repetiu correctamente; t�nteo de novo"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3720 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3751 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -749,13 +749,13 @@ msgstr "non se puido abrir `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output non traballa con este comando\n"
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1644
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1698
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "non se atopou a chave `%s': %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1658
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1712
 #: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -871,12 +871,12 @@ msgstr "non se pode empregar %s no modo %s\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s cifrado para: \"%s\"\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:306
+#: g10/encr-data.c:67 g10/mainproc.c:293
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "datos cifrados con %s\n"
 
-#: g10/encr-data.c:69 g10/mainproc.c:310
+#: g10/encr-data.c:69 g10/mainproc.c:297
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrado cun algoritmo desco�ecido %d\n"
@@ -1020,7 +1020,7 @@ msgstr ""
 msgid "WARNING: nothing exported\n"
 msgstr "AVISO: non se exportou nada\n"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:373
 msgid ""
 "@Commands:\n"
 " "
@@ -1028,128 +1028,128 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/gpg.c:374
+#: g10/gpg.c:375
 msgid "|[file]|make a signature"
 msgstr "|[ficheiro]|facer unha sinatura"
 
-#: g10/gpg.c:375
+#: g10/gpg.c:376
 msgid "|[file]|make a clear text signature"
 msgstr "|[ficheiro]|facer unha sinatura en texto claro"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:377
 msgid "make a detached signature"
 msgstr "facer unha sinatura separada"
 
-#: g10/gpg.c:377
+#: g10/gpg.c:378
 msgid "encrypt data"
 msgstr "cifrar datos"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:380
 msgid "encryption only with symmetric cipher"
 msgstr "cifrar s� con cifrado sim�trico"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:382
 msgid "decrypt data (default)"
 msgstr "descifrar datos (por defecto)"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:384
 msgid "verify a signature"
 msgstr "verificar unha sinatura"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:386
 msgid "list keys"
 msgstr "ve-la lista de chaves"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "list keys and signatures"
 msgstr "ve-la lista de chaves e sinaturas"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:389
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "verifica-las sinaturas das chaves"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:390
 msgid "list keys and fingerprints"
 msgstr "ve-la lista de chaves e pegadas dactilares"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:391
 msgid "list secret keys"
 msgstr "ve-la lista de chaves secretas"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:392
 msgid "generate a new key pair"
 msgstr "xerar un novo par de chaves"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:393
 msgid "remove keys from the public keyring"
 msgstr "borrar chaves do chaveiro p�blico"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:395
 msgid "remove keys from the secret keyring"
 msgstr "borrar chaves do chaveiro secreto"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:396
 msgid "sign a key"
 msgstr "asinar unha chave"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:397
 msgid "sign a key locally"
 msgstr "asinar unha chave localmente"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:398
 msgid "sign or edit a key"
 msgstr "asinar ou editar unha chave"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:399
 msgid "generate a revocation certificate"
 msgstr "xerar un certificado de revocaci�n"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:401
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:402
 msgid "export keys to a key server"
 msgstr "exportar chaves a un servidor de chaves"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:403
 msgid "import keys from a key server"
 msgstr "importar chaves dun servidor de chaves"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:405
 msgid "search for keys on a key server"
 msgstr "buscar chaves nun servidor de chaves"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:407
 msgid "update all keys from a keyserver"
 msgstr "actualizar t�dalas chaves dun servidor de chaves"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:411
 msgid "import/merge keys"
 msgstr "importar/mesturar chaves"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:414
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:414
+#: g10/gpg.c:415
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:415
+#: g10/gpg.c:416
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:423
+#: g10/gpg.c:424
 msgid "update the trust database"
 msgstr "actualiza-la base de datos de confianza"
 
-#: g10/gpg.c:430
+#: g10/gpg.c:431
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheiros]|visualizar resumos de mensaxes"
 
-#: g10/gpg.c:434 g10/gpgv.c:71
+#: g10/gpg.c:435 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1159,51 +1159,51 @@ msgstr ""
 "Opci�ns:\n"
 " "
 
-#: g10/gpg.c:436
+#: g10/gpg.c:437
 msgid "create ascii armored output"
 msgstr "crear sa�da con armadura en ascii"
 
-#: g10/gpg.c:438
+#: g10/gpg.c:439
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifrar para NOME"
 
-#: g10/gpg.c:449
+#: g10/gpg.c:450
 msgid "use this user-id to sign or decrypt"
 msgstr "empregar este id de usuario para asinar ou descifrar"
 
-#: g10/gpg.c:450
+#: g10/gpg.c:451
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|axusta-lo nivel de compresi�n a N (0 desactiva)"
 
-#: g10/gpg.c:455
+#: g10/gpg.c:456
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:470
 msgid "use as output file"
 msgstr "usar coma ficheiro de sa�da"
 
-#: g10/gpg.c:471 g10/gpgv.c:73
+#: g10/gpg.c:472 g10/gpgv.c:73
 msgid "verbose"
 msgstr "lareto"
 
-#: g10/gpg.c:482
+#: g10/gpg.c:483
 msgid "do not make any changes"
 msgstr "non facer ning�n cambio"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:484
 msgid "prompt before overwriting"
 msgstr "avisar antes de sobrescribir"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:525
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:553
+#: g10/gpg.c:554
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1211,7 +1211,7 @@ msgstr ""
 "@\n"
 "(Vexa a p�xina man para un listado completo de comandos e opci�ns)\n"
 
-#: g10/gpg.c:556
+#: g10/gpg.c:557
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1231,17 +1231,17 @@ msgstr ""
 " --list-keys [nomes]        amosa-las chaves\n"
 " --fingerprint [nomes]      amosa-las pegadas dactilares\n"
 
-#: g10/gpg.c:746 g10/gpgv.c:98
+#: g10/gpg.c:751 g10/gpgv.c:98
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr ""
 "Por favor, informe dos erros no programa a <gnupg-bugs@gnu.org>,\n"
 "e dos erros na traducci�n a <proxecto@trasno.net>.\n"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:768
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
 
-#: g10/gpg.c:766
+#: g10/gpg.c:771
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1251,7 +1251,7 @@ msgstr ""
 "asinar, verificar, cifrar ou descifrar\n"
 "a operaci�n por defecto depende dos datos de entrada\n"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:782
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1259,555 +1259,564 @@ msgstr ""
 "\n"
 "Algoritmos soportados:\n"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:785
 msgid "Pubkey: "
 msgstr "P�blica: "
 
-#: g10/gpg.c:786 g10/keyedit.c:2266
+#: g10/gpg.c:791 g10/keyedit.c:2266
 msgid "Cipher: "
 msgstr "Cifra: "
 
-#: g10/gpg.c:792
+#: g10/gpg.c:797
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:798 g10/keyedit.c:2312
+#: g10/gpg.c:803 g10/keyedit.c:2312
 msgid "Compression: "
 msgstr "Compresi�n: "
 
-#: g10/gpg.c:881
+#: g10/gpg.c:886
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opci�ns] "
 
-#: g10/gpg.c:1029
+#: g10/gpg.c:1034
 msgid "conflicting commands\n"
 msgstr "comandos conflictivos\n"
 
-#: g10/gpg.c:1047
+#: g10/gpg.c:1052
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "non se atopou un signo = na definici�n do grupo \"%s\"\n"
 
-#: g10/gpg.c:1244
+#: g10/gpg.c:1249
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1247
+#: g10/gpg.c:1252
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1250
+#: g10/gpg.c:1255
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVISO: propiedade insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1256
+#: g10/gpg.c:1261
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1259
+#: g10/gpg.c:1264
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1262
+#: g10/gpg.c:1267
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVISO: permisos inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1268
+#: g10/gpg.c:1273
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "AVISO: propiedade do directorio contedor insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1271
+#: g10/gpg.c:1276
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "AVISO: propiedade do directorio contedor insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1274
+#: g10/gpg.c:1279
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "AVISO: propiedade do directorio contedor insegura en %s \"%s\"\n"
 
-#: g10/gpg.c:1280
+#: g10/gpg.c:1285
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "AVISO: permisos do directorio contedor inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1283
+#: g10/gpg.c:1288
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "AVISO: permisos do directorio contedor inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1286
+#: g10/gpg.c:1291
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "AVISO: permisos do directorio contedor inseguros en %s \"%s\"\n"
 
-#: g10/gpg.c:1427
+#: g10/gpg.c:1432
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr " creouse un novo ficheiro de configuraci�n `%s'\n"
 
-#: g10/gpg.c:1521
+#: g10/gpg.c:1526
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1523
+#: g10/gpg.c:1528
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1525
+#: g10/gpg.c:1530
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
-#: g10/gpg.c:1527
+#: g10/gpg.c:1532
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1536
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1538
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1540
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1542
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1544
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1546
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "amosar en que chaveiro est� unha chave listada"
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1548
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
-#: g10/gpg.c:1874
+#: g10/gpg.c:1879
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: ign�rase o antigo ficheiro de opci�ns por defecto `%s'\n"
 
-#: g10/gpg.c:1916
+#: g10/gpg.c:1921
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: non existe o ficheiro de opci�ns por defecto `%s'\n"
 
-#: g10/gpg.c:1920
+#: g10/gpg.c:1925
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de opci�ns `%s': %s\n"
 
-#: g10/gpg.c:1927
+#: g10/gpg.c:1932
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo as opci�ns de `%s'\n"
 
-#: g10/gpg.c:2142 g10/gpg.c:2716 g10/gpg.c:2735
+#: g10/gpg.c:2147 g10/gpg.c:2747 g10/gpg.c:2766
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: �%s non � para uso normal!\n"
 
-#: g10/gpg.c:2158
+#: g10/gpg.c:2163
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "non se cargou a extensi�n de cifrado \"%s\" debido a permisos inseguros\n"
 
-#: g10/gpg.c:2312 g10/gpg.c:2324
+#: g10/gpg.c:2317 g10/gpg.c:2329
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/gpg.c:2400
+#: g10/gpg.c:2405
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/gpg.c:2422 g10/keyedit.c:3997
+#: g10/gpg.c:2429 g10/keyedit.c:3997
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "non se puido analisa-lo URI do servidor de chaves\n"
 
-#: g10/gpg.c:2428
+#: g10/gpg.c:2441
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2431
+#: g10/gpg.c:2444
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2438
+#: g10/gpg.c:2451
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opci�ns de importaci�n non v�lidas\n"
 
-#: g10/gpg.c:2441
+#: g10/gpg.c:2454
 msgid "invalid import options\n"
 msgstr "opci�ns de importaci�n non v�lidas\n"
 
-#: g10/gpg.c:2448
+#: g10/gpg.c:2461
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2464
 msgid "invalid export options\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2458
+#: g10/gpg.c:2471
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opci�ns de importaci�n non v�lidas\n"
 
-#: g10/gpg.c:2461
+#: g10/gpg.c:2474
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opci�ns de importaci�n non v�lidas\n"
 
-#: g10/gpg.c:2469
+#: g10/gpg.c:2482
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2471
+#: g10/gpg.c:2484
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2473
+#: g10/gpg.c:2486
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/gpg.c:2475
+#: g10/gpg.c:2488
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2479
+#: g10/gpg.c:2492
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2481
+#: g10/gpg.c:2494
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
 
-#: g10/gpg.c:2483
+#: g10/gpg.c:2496
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/gpg.c:2485
+#: g10/gpg.c:2498
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2505
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2495
+#: g10/gpg.c:2508
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2502
+#: g10/gpg.c:2515
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "non se puido estabrecer exec-path a %s\n"
 
-#: g10/gpg.c:2705
+#: g10/gpg.c:2665
+#, fuzzy, c-format
+msgid "%s:%d: invalid auto-key-locate list\n"
+msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
+
+#: g10/gpg.c:2668
+msgid "invalid auto-key-locate list\n"
+msgstr ""
+
+#: g10/gpg.c:2736
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: �o programa pode crear un ficheiro 'core'!\n"
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2740
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s fai que se ignore %s\n"
 
-#: g10/gpg.c:2718
+#: g10/gpg.c:2749
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�%s non se admite con %s!\n"
 
-#: g10/gpg.c:2721
+#: g10/gpg.c:2752
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�%s non ten sentido empreg�ndoo con %s!\n"
 
-#: g10/gpg.c:2728
+#: g10/gpg.c:2759
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "gpg-agent non est� dispo�ible nesta sesi�n\n"
 
-#: g10/gpg.c:2743
+#: g10/gpg.c:2774
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/gpg.c:2757
+#: g10/gpg.c:2788
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "s� pode crear sinaturas separadas ou en claro no modo --pgp2\n"
 
-#: g10/gpg.c:2763
+#: g10/gpg.c:2794
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "non pode asinar e cifrar ao mesmo tempo no modo --pgp2\n"
 
-#: g10/gpg.c:2769
+#: g10/gpg.c:2800
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "debe empregar ficheiros (e non canalizaci�ns) ao traballar con --pgp2 "
 "activado.\n"
 
-#: g10/gpg.c:2782
+#: g10/gpg.c:2813
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "para cifrar unha mensaxe en modo --pgp2 prec�sase da cifra IDEA\n"
 
-#: g10/gpg.c:2849 g10/gpg.c:2873
+#: g10/gpg.c:2880 g10/gpg.c:2904
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifrado seleccionado non � v�lido\n"
 
-#: g10/gpg.c:2855 g10/gpg.c:2879
+#: g10/gpg.c:2886 g10/gpg.c:2910
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de resumo seleccionado non � v�lido\n"
 
-#: g10/gpg.c:2861
+#: g10/gpg.c:2892
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de cifrado seleccionado non � v�lido\n"
 
-#: g10/gpg.c:2867
+#: g10/gpg.c:2898
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de resumo de certificaci�n seleccionado non � v�lido\n"
 
-#: g10/gpg.c:2882
+#: g10/gpg.c:2913
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser superior a 0\n"
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2915
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser superior a 1\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2917
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth debe valer entre 1 e 255\n"
 
-#: g10/gpg.c:2888
+#: g10/gpg.c:2919
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "nivel de comprobaci�n por defecto non v�lido; debe ser 0, 1, 2 ou 3\n"
 
-#: g10/gpg.c:2890
+#: g10/gpg.c:2921
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "nivel de comprobaci�n por defecto non v�lido; debe ser 0, 1, 2 ou 3\n"
 
-#: g10/gpg.c:2893
+#: g10/gpg.c:2924
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: desacons�llase encarecidamente o modo S2K simple (0)\n"
 
-#: g10/gpg.c:2897
+#: g10/gpg.c:2928
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K non v�lido; debe ser 0, 1 ou 3\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2935
 msgid "invalid default preferences\n"
 msgstr "preferencias por defecto non v�lidas\n"
 
-#: g10/gpg.c:2913
+#: g10/gpg.c:2944
 msgid "invalid personal cipher preferences\n"
 msgstr "preferencias de cifrado personais non v�lidas\n"
 
-#: g10/gpg.c:2917
+#: g10/gpg.c:2948
 msgid "invalid personal digest preferences\n"
 msgstr "preferencias de resumo personais non v�lidas\n"
 
-#: g10/gpg.c:2921
+#: g10/gpg.c:2952
 msgid "invalid personal compress preferences\n"
 msgstr "preferencias de compresi�n personais non v�lidas\n"
 
-#: g10/gpg.c:2954
+#: g10/gpg.c:2985
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "�%s a�nda non traballa con %s!\n"
 
-#: g10/gpg.c:3001
+#: g10/gpg.c:3032
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "non se pode empregar o algoritmo de cifrado \"%s\" no modo %s\n"
 
-#: g10/gpg.c:3006
+#: g10/gpg.c:3037
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "non se pode empregar o algoritmo de resumo \"%s\" no modo %s\n"
 
-#: g10/gpg.c:3011
+#: g10/gpg.c:3042
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "non se pode empregar o algoritmo de compresi�n \"%s\" no modo %s\n"
 
-#: g10/gpg.c:3107
+#: g10/gpg.c:3138
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 
-#: g10/gpg.c:3118
+#: g10/gpg.c:3149
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AVISO: deronse destinatarios (-r) sen empregar cifrado de chave p�blica\n"
 
-#: g10/gpg.c:3129
+#: g10/gpg.c:3160
 msgid "--store [filename]"
 msgstr "--store [ficheiro]"
 
-#: g10/gpg.c:3136
+#: g10/gpg.c:3167
 msgid "--symmetric [filename]"
 msgstr "--symmetric [ficheiro]"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3169
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "o descifrado fallou: %s\n"
 
-#: g10/gpg.c:3148
+#: g10/gpg.c:3179
 msgid "--encrypt [filename]"
 msgstr "--encrypt [ficheiro]"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3192
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3194
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3166
+#: g10/gpg.c:3197
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "non se pode empregar %s no modo %s\n"
 
-#: g10/gpg.c:3184
+#: g10/gpg.c:3215
 msgid "--sign [filename]"
 msgstr "--sign [ficheiro]"
 
-#: g10/gpg.c:3197
+#: g10/gpg.c:3228
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/gpg.c:3212
+#: g10/gpg.c:3243
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/gpg.c:3214
+#: g10/gpg.c:3245
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3217
+#: g10/gpg.c:3248
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "non se pode empregar %s no modo %s\n"
 
-#: g10/gpg.c:3237
+#: g10/gpg.c:3268
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [ficheiro]"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3277
 msgid "--clearsign [filename]"
 msgstr "--clearsign [ficheiro]"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3302
 msgid "--decrypt [filename]"
 msgstr "--decrypt [ficheiro]"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3310
 msgid "--sign-key user-id"
 msgstr "--sign-key id-de-usuario"
 
-#: g10/gpg.c:3283
+#: g10/gpg.c:3314
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-de-usuario"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3335
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-de-usuario [comandos]"
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3406
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-de-usuario] [chaveiro]"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3443
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "o env�o ao servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3445
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "a recepci�n do servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3447
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "a exportaci�n da chave fallou: %s\n"
 
-#: g10/gpg.c:3427
+#: g10/gpg.c:3458
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "a busca no servidor de chaves fallou fallou: %s\n"
 
-#: g10/gpg.c:3437
+#: g10/gpg.c:3468
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "a actualizaci�n no servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:3488
+#: g10/gpg.c:3519
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "non se puido quita-la armadura: %s\n"
 
-#: g10/gpg.c:3496
+#: g10/gpg.c:3527
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "non se puido po�e-la armadura: %s\n"
 
-#: g10/gpg.c:3583
+#: g10/gpg.c:3614
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash non v�lido `%s'\n"
 
-#: g10/gpg.c:3706
+#: g10/gpg.c:3737
 msgid "[filename]"
 msgstr "[ficheiro]"
 
-#: g10/gpg.c:3710
+#: g10/gpg.c:3741
 msgid "Go ahead and type your message ...\n"
 msgstr "Escriba a s�a mensaxe ...\n"
 
-#: g10/gpg.c:4000
+#: g10/gpg.c:4031
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1815,28 +1824,28 @@ msgstr ""
 "un nome de notaci�n s� debe ter caracteres imprimibles ou espacios, e debe "
 "rematar en '='\n"
 
-#: g10/gpg.c:4008
+#: g10/gpg.c:4039
 msgid "a user notation name must contain the '@' character\n"
 msgstr "un nome de notaci�n de usuario debe conte-lo car�cter '@'\n"
 
-#: g10/gpg.c:4013
+#: g10/gpg.c:4044
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "un nome de notaci�n de usuario debe conte-lo car�cter '@'\n"
 
-#: g10/gpg.c:4024
+#: g10/gpg.c:4055
 msgid "a notation value must not use any control characters\n"
 msgstr "un valor de notaci�n non pode empregar ning�n car�cter de control\n"
 
-#: g10/gpg.c:4058
+#: g10/gpg.c:4089
 msgid "the given certification policy URL is invalid\n"
 msgstr "o URL de normativa de certificaci�n dado non � v�lido\n"
 
-#: g10/gpg.c:4060
+#: g10/gpg.c:4091
 msgid "the given signature policy URL is invalid\n"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
 
-#: g10/gpg.c:4093
+#: g10/gpg.c:4124
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
@@ -1845,34 +1854,35 @@ msgstr "o URL de normativa de sinaturas dado non 
 msgid "too many entries in pk cache - disabled\n"
 msgstr "demasiadas entradas na cach� de chaves p�blicas - desactivada\n"
 
-#: g10/getkey.c:188 g10/getkey.c:2845
+#: g10/getkey.c:188 g10/getkey.c:2876
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[Non se atopou o id de usuario]"
 
-#: g10/getkey.c:931 g10/getkey.c:953 g10/getkey.c:976
+#: g10/getkey.c:933 g10/getkey.c:950 g10/getkey.c:970 g10/getkey.c:986
+#: g10/getkey.c:1001
 #, c-format
 msgid "Automatically retrieved `%s' via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1769
+#: g10/getkey.c:1800
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Chave %08lX non v�lida convertida en v�lida por --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2323
+#: g10/getkey.c:2354
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 "non hai unha sub-chave secreta para a sub-chave p�blica %08lX - ign�rase\n"
 
-#: g10/getkey.c:2554
+#: g10/getkey.c:2585
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "empr�gase a chave secundaria %08lX no canto da primaria %08lX\n"
 
-#: g10/getkey.c:2601
+#: g10/getkey.c:2632
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "chave %08lX: chave secreta sen chave p�blica - omitida\n"
@@ -3450,12 +3460,12 @@ msgid "(sensitive)"
 msgstr " (sensible)"
 
 #: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
-#: g10/keylist.c:194 g10/keyserver.c:471
+#: g10/keylist.c:194 g10/keyserver.c:525
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "non foi posible crear %s: %s\n"
 
-#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:967
+#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:960
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revocada] "
@@ -3467,7 +3477,7 @@ msgstr " [caduca: %s]"
 
 #: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
 #: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:477 g10/mainproc.c:973
+#: g10/keylist.c:914 g10/keyserver.c:531 g10/mainproc.c:966
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [caduca: %s]"
@@ -3503,14 +3513,14 @@ msgstr ""
 "Te�a en conta que a validez da chave amosada non � necesariamente\n"
 "correcta a menos que reinicie o programa.\n"
 
-#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:481
-#: g10/mainproc.c:1734 g10/trustdb.c:1184 g10/trustdb.c:1704
+#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:535
+#: g10/mainproc.c:1783 g10/trustdb.c:1184 g10/trustdb.c:1704
 #, fuzzy
 msgid "revoked"
 msgstr "[revocada] "
 
-#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:485
-#: g10/mainproc.c:1736 g10/trustdb.c:537 g10/trustdb.c:1706
+#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:539
+#: g10/mainproc.c:1785 g10/trustdb.c:537 g10/trustdb.c:1706
 #, fuzzy
 msgid "expired"
 msgstr "expire"
@@ -4360,390 +4370,387 @@ msgstr "%s: chaveiro creado\n"
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:77
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:81
+#: g10/keyserver.c:79
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:83
+#: g10/keyserver.c:81
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:87
+#: g10/keyserver.c:85
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:89
-msgid "automatically retrieve keys from PKA records"
-msgstr ""
-
-#: g10/keyserver.c:91
-msgid "automatically retrieve keys from DNS"
-msgstr ""
-
-#: g10/keyserver.c:95
+#: g10/keyserver.c:87
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
 
-#: g10/keyserver.c:139
+#: g10/keyserver.c:89
+msgid "honor the PKA record set on a key when retrieving keys"
+msgstr ""
+
+#: g10/keyserver.c:154
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "AVISO: as opci�ns de `%s' a�nda non est�n activas nesta execuci�n\n"
 
-#: g10/keyserver.c:483
+#: g10/keyserver.c:537
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:684
+#: g10/keyserver.c:738
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:767 g10/keyserver.c:1368
+#: g10/keyserver.c:821 g10/keyserver.c:1422
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/keyserver.c:865
+#: g10/keyserver.c:919
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "non se atopou a chave `%s': %s\n"
 
-#: g10/keyserver.c:867
+#: g10/keyserver.c:921
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "non se atopou a chave `%s': %s\n"
 
-#: g10/keyserver.c:1092
+#: g10/keyserver.c:1146
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "solicitando a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1096
+#: g10/keyserver.c:1150
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "solicitando a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1120
+#: g10/keyserver.c:1174
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "buscando \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1123
+#: g10/keyserver.c:1177
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "buscando \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1271
+#: g10/keyserver.c:1325
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "buscando \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1275
+#: g10/keyserver.c:1329
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "asinado coa s�a chave %08lX no %s\n"
 
-#: g10/keyserver.c:1318
+#: g10/keyserver.c:1372
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "buscando \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1321
+#: g10/keyserver.c:1375
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "buscando \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1328 g10/keyserver.c:1424
+#: g10/keyserver.c:1382 g10/keyserver.c:1478
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/keyserver.c:1376
+#: g10/keyserver.c:1430
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1439
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1446
+#: g10/keyserver.c:1500
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 "non hai un servidor de chaves co�ecido (empregue a opci�n --keyserver)\n"
 
-#: g10/keyserver.c:1452
+#: g10/keyserver.c:1506
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1464
+#: g10/keyserver.c:1518
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1469
+#: g10/keyserver.c:1523
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1477
+#: g10/keyserver.c:1531
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1484
+#: g10/keyserver.c:1538
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "erro do servidor de chaves"
 
-#: g10/keyserver.c:1489
+#: g10/keyserver.c:1543
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "erro do servidor de chaves"
 
-#: g10/keyserver.c:1498
+#: g10/keyserver.c:1552
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "a recepci�n do servidor de chaves fallou: %s\n"
 
-#: g10/keyserver.c:1523 g10/keyserver.c:1557
+#: g10/keyserver.c:1577 g10/keyserver.c:1611
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s: non � un ID de chave v�lido\n"
 
-#: g10/keyserver.c:1814
+#: g10/keyserver.c:1868
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "AVISO: non se puido borra-lo ficheiro temporal (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1836
+#: g10/keyserver.c:1890
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "solicitando a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1838
+#: g10/keyserver.c:1892
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "solicitando a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1903
+#: g10/keyserver.c:1957
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "AVISO: non se puido borra-lo ficheiro temporal (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1909
+#: g10/keyserver.c:1963
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "AVISO: non se puido borra-lo ficheiro temporal (%s) `%s': %s\n"
 
-#: g10/mainproc.c:253
+#: g10/mainproc.c:240
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "tama�o moi estra�o para unha chave de sesi�n cifrada (%d)\n"
 
-#: g10/mainproc.c:304
+#: g10/mainproc.c:291
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "chave de sesi�n cifrada con %s\n"
 
-#: g10/mainproc.c:314
+#: g10/mainproc.c:301
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "cifrado cun algoritmo desco�ecido %d\n"
 
-#: g10/mainproc.c:395
+#: g10/mainproc.c:382
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "a chave p�blica � %08lX\n"
 
-#: g10/mainproc.c:450
+#: g10/mainproc.c:439
 msgid "public key encrypted data: good DEK\n"
 msgstr "datos cifrados coa chave p�blica: DEK correcto\n"
 
-#: g10/mainproc.c:483
+#: g10/mainproc.c:472
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "cifrado cunha chave de %u bits, %s, ID %08lX, creado o %s\n"
 
-#: g10/mainproc.c:487 g10/pkclist.c:219
+#: g10/mainproc.c:476 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "               alias \""
 
-#: g10/mainproc.c:491
+#: g10/mainproc.c:480
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "cifrado cunha chave %s, ID %08lX\n"
 
-#: g10/mainproc.c:505
+#: g10/mainproc.c:494
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "fallou o descifrado de chave p�blica: %s\n"
 
-#: g10/mainproc.c:519
+#: g10/mainproc.c:508
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "cifrado con %lu contrasinais\n"
 
-#: g10/mainproc.c:521
+#: g10/mainproc.c:510
 msgid "encrypted with 1 passphrase\n"
 msgstr "cifrado con 1 contrasinal\n"
 
-#: g10/mainproc.c:549 g10/mainproc.c:571
+#: g10/mainproc.c:541 g10/mainproc.c:563
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "supo�endo datos cifrados con %s\n"
 
-#: g10/mainproc.c:557
+#: g10/mainproc.c:549
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "A cifra IDEA non est� dispo�ible, t�ntase empregar %s no seu canto\n"
 
-#: g10/mainproc.c:589
+#: g10/mainproc.c:581
 msgid "decryption okay\n"
 msgstr "descifrado correcto\n"
 
-#: g10/mainproc.c:593
+#: g10/mainproc.c:585
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVISO: a mensaxe non ti�a protecci�n de integridade\n"
 
-#: g10/mainproc.c:606
+#: g10/mainproc.c:598
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVISO: �a mensaxe cifrada foi manipulada!\n"
 
-#: g10/mainproc.c:612
+#: g10/mainproc.c:604
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "o descifrado fallou: %s\n"
 
-#: g10/mainproc.c:631
+#: g10/mainproc.c:623
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: o remitente pediu \"confidencial\"\n"
 
-#: g10/mainproc.c:633
+#: g10/mainproc.c:625
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome do ficheiro orixinal='%.*s'\n"
 
-#: g10/mainproc.c:822
+#: g10/mainproc.c:815
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocaci�n independente - empregue \"gpg --import\" para aplicar\n"
 
-#: g10/mainproc.c:1168
+#: g10/mainproc.c:1161
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Sinatura correcta de \""
 
-#: g10/mainproc.c:1418
+#: g10/mainproc.c:1419
 msgid "signature verification suppressed\n"
 msgstr "verificaci�n de sinatura suprimida\n"
 
-#: g10/mainproc.c:1460 g10/mainproc.c:1470
-msgid "can't handle these multiple signatures\n"
+#: g10/mainproc.c:1519
+#, fuzzy
+msgid "can't handle this ambiguous signature data\n"
 msgstr "non se poden manexar estas sinaturas m�ltiples\n"
 
-#: g10/mainproc.c:1480
+#: g10/mainproc.c:1530
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "A sinatura caducou o %s\n"
 
-#: g10/mainproc.c:1481
+#: g10/mainproc.c:1531
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "               alias \""
 
-#: g10/mainproc.c:1485
+#: g10/mainproc.c:1535
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Sinatura feita o %.*s usando %s coa chave de ID %08lX\n"
 
-#: g10/mainproc.c:1505
+#: g10/mainproc.c:1555
 msgid "Key available at: "
 msgstr "Chave dispo�ible en: "
 
-#: g10/mainproc.c:1639 g10/mainproc.c:1687
+#: g10/mainproc.c:1688 g10/mainproc.c:1736
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Sinatura INCORRECTA de\""
 
-#: g10/mainproc.c:1641 g10/mainproc.c:1689
+#: g10/mainproc.c:1690 g10/mainproc.c:1738
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Sinatura caducada de \""
 
-#: g10/mainproc.c:1643 g10/mainproc.c:1691
+#: g10/mainproc.c:1692 g10/mainproc.c:1740
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Sinatura correcta de \""
 
-#: g10/mainproc.c:1695
+#: g10/mainproc.c:1744
 msgid "[uncertain]"
 msgstr "[incerto]"
 
-#: g10/mainproc.c:1727
+#: g10/mainproc.c:1776
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "               alias \""
 
-#: g10/mainproc.c:1824
+#: g10/mainproc.c:1873
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "A sinatura caducou o %s\n"
 
-#: g10/mainproc.c:1829
+#: g10/mainproc.c:1878
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "A sinatura caduca o %s\n"
 
-#: g10/mainproc.c:1832
+#: g10/mainproc.c:1881
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "Sinatura %s, algoritmo de resumo %s\n"
 
-#: g10/mainproc.c:1833
+#: g10/mainproc.c:1882
 msgid "binary"
 msgstr "binario"
 
-#: g10/mainproc.c:1834
+#: g10/mainproc.c:1883
 msgid "textmode"
 msgstr "modo texto"
 
-#: g10/mainproc.c:1834 g10/trustdb.c:536
+#: g10/mainproc.c:1883 g10/trustdb.c:536
 msgid "unknown"
 msgstr "desco�ecido"
 
-#: g10/mainproc.c:1854
+#: g10/mainproc.c:1903
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Non foi posible verifica-la sinatura: %s\n"
 
-#: g10/mainproc.c:1922 g10/mainproc.c:1938 g10/mainproc.c:2024
+#: g10/mainproc.c:1972 g10/mainproc.c:1988 g10/mainproc.c:2074
 msgid "not a detached signature\n"
 msgstr "non � unha sinatura separada\n"
 
-#: g10/mainproc.c:1965
+#: g10/mainproc.c:2015
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "AVISO: detect�ronse sinaturas m�ltiples. S� se ha comproba-la primeira.\n"
 
-#: g10/mainproc.c:1973
+#: g10/mainproc.c:2023
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "sinatura independiente de clase 0x%02x\n"
 
-#: g10/mainproc.c:2030
+#: g10/mainproc.c:2080
 msgid "old style (PGP 2.x) signature\n"
 msgstr "Sinatura � vello estilo (PGP 2.x)\n"
 
-#: g10/mainproc.c:2040
+#: g10/mainproc.c:2090
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "paquete ra�z incorrecto detectado en proc_tree()\n"
 
@@ -5314,23 +5321,23 @@ msgstr "os datos non foron gardados; use a opci
 msgid "error creating `%s': %s\n"
 msgstr "erro ao crear `%s': %s\n"
 
-#: g10/plaintext.c:447
+#: g10/plaintext.c:453
 msgid "Detached signature.\n"
 msgstr "Sinatura non adxunta.\n"
 
-#: g10/plaintext.c:453
+#: g10/plaintext.c:459
 msgid "Please enter name of data file: "
 msgstr "Por favor, introduza o nome do ficheiro de datos: "
 
-#: g10/plaintext.c:485
+#: g10/plaintext.c:491
 msgid "reading stdin ...\n"
 msgstr "lendo de stdin ...\n"
 
-#: g10/plaintext.c:519
+#: g10/plaintext.c:525
 msgid "no signed data\n"
 msgstr "non hai datos asinados\n"
 
-#: g10/plaintext.c:533
+#: g10/plaintext.c:539
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "non foi posible abri-los datos asinados `%s'\n"
diff --git a/po/hu.po b/po/hu.po
index 490a4f2ca..171da1894 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.5\n"
 "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2006-02-14 15:28+0100\n"
+"POT-Creation-Date: 2006-03-07 11:29+0100\n"
 "PO-Revision-Date: 2004-06-19 21:53+0200\n"
 "Last-Translator: Nagy Ferenc L�szl� <nfl@nfllab.com>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -40,9 +40,9 @@ msgstr "
 
 #: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:992 g10/gpg.c:3360 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:997 g10/gpg.c:3391 g10/import.c:193 g10/keygen.c:2274
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:476 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
+#: g10/plaintext.c:482 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
 #: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
@@ -77,7 +77,7 @@ msgstr "Nem tudom olvasni a(z) \"%s\" 
 msgid "note: random_seed file not updated\n"
 msgstr "Megjegyz�s: random_seed �llom�nyt nem friss�tettem.\n"
 
-#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:991 g10/keygen.c:2753
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2753
 #: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
 #: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
 #, c-format
@@ -693,48 +693,48 @@ msgstr "
 msgid "Invalid command  (try \"help\")\n"
 msgstr "�rv�nytelen parancs! (Pr�b�lja a s�g�t: \"help\".)\n"
 
-#: g10/cardglue.c:435
+#: g10/cardglue.c:434
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:572
+#: g10/cardglue.c:573
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:580
+#: g10/cardglue.c:582
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:915
+#: g10/cardglue.c:917
 msgid "Enter New Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:916
+#: g10/cardglue.c:918
 msgid "Enter New PIN: "
 msgstr ""
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:919
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:920
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/cardglue.c:935
+#: g10/cardglue.c:937
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Ism�telje meg a jelsz�t: "
 
-#: g10/cardglue.c:950
+#: g10/cardglue.c:952
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "Nem ism�telte meg helyesen a jelsz�t! Pr�b�lja �jra!"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3720 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3751 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -744,13 +744,13 @@ msgstr "Nem tudom megnyitni %s-t!\n"
 msgid "--output doesn't work for this command\n"
 msgstr "Az --output opci� nem m�k�dik ehhez a parancshoz.\n"
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1644
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1698
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1658
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1712
 #: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -860,12 +860,12 @@ msgstr "Lehet, hogy nem haszn
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s titkos�tva \"%s\" sz�m�ra\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:306
+#: g10/encr-data.c:67 g10/mainproc.c:293
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s titkos�tott adat.\n"
 
-#: g10/encr-data.c:69 g10/mainproc.c:310
+#: g10/encr-data.c:69 g10/mainproc.c:297
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "Ismeretlen algoritmussal (%d) titkos�tva.\n"
@@ -1009,7 +1009,7 @@ msgstr "FIGYELEM: %08lX titkos kulcsnak nincs egyszer
 msgid "WARNING: nothing exported\n"
 msgstr "FIGYELEM: Semmit sem export�ltam.\n"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:373
 msgid ""
 "@Commands:\n"
 " "
@@ -1017,128 +1017,128 @@ msgstr ""
 "@Parancsok:\n"
 " "
 
-#: g10/gpg.c:374
+#: g10/gpg.c:375
 msgid "|[file]|make a signature"
 msgstr "|[f�jl]|al��r�s k�sz�t�se"
 
-#: g10/gpg.c:375
+#: g10/gpg.c:376
 msgid "|[file]|make a clear text signature"
 msgstr "|[f�jl]|olvashat� sz�veg al��r�sa"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:377
 msgid "make a detached signature"
 msgstr "k�l�n�ll� al��r�s k�sz�t�se"
 
-#: g10/gpg.c:377
+#: g10/gpg.c:378
 msgid "encrypt data"
 msgstr "adat titkos�t�sa"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:380
 msgid "encryption only with symmetric cipher"
 msgstr "titkos�t�s csak szimmetrikus rejtjelez�vel"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:382
 msgid "decrypt data (default)"
 msgstr "adat visszafejt�se (alap�rtelmez�s)"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:384
 msgid "verify a signature"
 msgstr "al��r�s ellen�rz�se"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:386
 msgid "list keys"
 msgstr "kulcsok list�z�sa"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "list keys and signatures"
 msgstr "kulcsok �s al��r�sok list�z�sa"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:389
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "kulcsal��r�sok ellen�rz�se"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:390
 msgid "list keys and fingerprints"
 msgstr "kulcsok �s ujjlenyomatok list�z�sa"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:391
 msgid "list secret keys"
 msgstr "titkos kulcsok list�z�sa"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:392
 msgid "generate a new key pair"
 msgstr "�j kulcsp�r l�trehoz�sa"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:393
 msgid "remove keys from the public keyring"
 msgstr "kulcsok elt�vol�t�sa a nyilv�noskulcs-karik�r�l"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:395
 msgid "remove keys from the secret keyring"
 msgstr "kulcsok elt�vol�t�sa a titkoskulcs-karik�r�l"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:396
 msgid "sign a key"
 msgstr "kulcs al��r�sa"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:397
 msgid "sign a key locally"
 msgstr "kulcs al��r�sa helyileg"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:398
 msgid "sign or edit a key"
 msgstr "kulcs al��r�sa vagy szerkeszt�se"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:399
 msgid "generate a revocation certificate"
 msgstr "visszavon�si igazol�s k�sz�t�se"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:401
 msgid "export keys"
 msgstr "kulcsok export�l�sa"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:402
 msgid "export keys to a key server"
 msgstr "kulcsok export�l�sa kulcsszerverre"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:403
 msgid "import keys from a key server"
 msgstr "kulcsok import�l�sa kulcsszerverr�l"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:405
 msgid "search for keys on a key server"
 msgstr "kulcsok keres�se kulcsszerveren"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:407
 msgid "update all keys from a keyserver"
 msgstr "minden kulcs friss�t�se kulcsszerverr�l"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:411
 msgid "import/merge keys"
 msgstr "kulcsok import�l�sa/�sszef�z�se"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:414
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:414
+#: g10/gpg.c:415
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:415
+#: g10/gpg.c:416
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:423
+#: g10/gpg.c:424
 msgid "update the trust database"
 msgstr "bizalmi adatb�zis friss�t�se"
 
-#: g10/gpg.c:430
+#: g10/gpg.c:431
 msgid "|algo [files]|print message digests"
 msgstr "|algo [f�jlok]|�zenet kivonat�nak ki�r�sa"
 
-#: g10/gpg.c:434 g10/gpgv.c:71
+#: g10/gpg.c:435 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1148,51 +1148,51 @@ msgstr ""
 "Opci�k:\n"
 " "
 
-#: g10/gpg.c:436
+#: g10/gpg.c:437
 msgid "create ascii armored output"
 msgstr "ascii p�nc�lozott kimenet l�trehoz�sa"
 
-#: g10/gpg.c:438
+#: g10/gpg.c:439
 msgid "|NAME|encrypt for NAME"
 msgstr "|N�V|titkos�t�s N�V r�sz�re"
 
-#: g10/gpg.c:449
+#: g10/gpg.c:450
 msgid "use this user-id to sign or decrypt"
 msgstr "felh. azonos�t� al��r�shoz �s visszafejt�shez"
 
-#: g10/gpg.c:450
+#: g10/gpg.c:451
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|t�m�r�t�si szint be�ll�t�sa N-re (0: tilt�s)"
 
-#: g10/gpg.c:455
+#: g10/gpg.c:456
 msgid "use canonical text mode"
 msgstr "kanonikus sz�veges m�d haszn�lata"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:470
 msgid "use as output file"
 msgstr "kimeneti �llom�ny megad�sa"
 
-#: g10/gpg.c:471 g10/gpgv.c:73
+#: g10/gpg.c:472 g10/gpgv.c:73
 msgid "verbose"
 msgstr "b�besz�d� m�d"
 
-#: g10/gpg.c:482
+#: g10/gpg.c:483
 msgid "do not make any changes"
 msgstr "ne csin�ljon semmi v�ltoztat�st"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:484
 msgid "prompt before overwriting"
 msgstr "fel�l�r�s el�tt r�k�rdez�s"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:525
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:553
+#: g10/gpg.c:554
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1200,7 +1200,7 @@ msgstr ""
 "@\n"
 "(A parancsok �s opci�k teljes list�j�t a man oldalon tekintheti meg.)\n"
 
-#: g10/gpg.c:556
+#: g10/gpg.c:557
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1220,15 +1220,15 @@ msgstr ""
 " --list-keys [nevek]        kulcsok ki�rat�sa\n"
 " --fingerprint [nevek]      ujjlenyomatok ki�rat�sa\n"
 
-#: g10/gpg.c:746 g10/gpgv.c:98
+#: g10/gpg.c:751 g10/gpgv.c:98
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "A hib�kat (angolul) a <gnupg-bugs@gnu.org> c�mre �rja meg!\n"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:768
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
 
-#: g10/gpg.c:766
+#: g10/gpg.c:771
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1238,7 +1238,7 @@ msgstr ""
 "Al��r�s, ellen�rz�s, titkos�t�s vagy visszafejt�s.\n"
 "Az alap�rtelmezett m�velet a bemeneti adatt�l f�gg.\n"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:782
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1246,552 +1246,561 @@ msgstr ""
 "\n"
 "T�mogatott algoritmusok:\n"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:785
 msgid "Pubkey: "
 msgstr "Nyilv�nos kulcs� (pubkey): "
 
-#: g10/gpg.c:786 g10/keyedit.c:2266
+#: g10/gpg.c:791 g10/keyedit.c:2266
 msgid "Cipher: "
 msgstr "Rejtjelez� (cipher): "
 
-#: g10/gpg.c:792
+#: g10/gpg.c:797
 msgid "Hash: "
 msgstr "Kivonatol� (hash): "
 
-#: g10/gpg.c:798 g10/keyedit.c:2312
+#: g10/gpg.c:803 g10/keyedit.c:2312
 msgid "Compression: "
 msgstr "T�m�r�t� (compression): "
 
-#: g10/gpg.c:881
+#: g10/gpg.c:886
 msgid "usage: gpg [options] "
 msgstr "Haszn�lat: gpg [opci�k] "
 
-#: g10/gpg.c:1029
+#: g10/gpg.c:1034
 msgid "conflicting commands\n"
 msgstr "Egym�snak ellentmond� parancsok!\n"
 
-#: g10/gpg.c:1047
+#: g10/gpg.c:1052
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "Nem tal�ltam = jelet a \"%s\" csoportdefin�ci�ban!\n"
 
-#: g10/gpg.c:1244
+#: g10/gpg.c:1249
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1247
+#: g10/gpg.c:1252
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1250
+#: g10/gpg.c:1255
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "FIGYELEM: Nem biztons�gos tulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1256
+#: g10/gpg.c:1261
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1259
+#: g10/gpg.c:1264
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1262
+#: g10/gpg.c:1267
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos enged�lyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1268
+#: g10/gpg.c:1273
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos k�nyvt�rtulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1271
+#: g10/gpg.c:1276
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos k�nyvt�rtulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1274
+#: g10/gpg.c:1279
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos k�nyvt�rtulajdonos: %s \"%s\"\n"
 
-#: g10/gpg.c:1280
+#: g10/gpg.c:1285
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos k�nyvt�renged�lyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1283
+#: g10/gpg.c:1288
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos k�nyvt�renged�lyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1286
+#: g10/gpg.c:1291
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "FIGYELEM: nem biztons�gos k�nyvt�renged�lyek: %s \"%s\"\n"
 
-#: g10/gpg.c:1427
+#: g10/gpg.c:1432
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "\"%s\": ismeretlen konfigur�ci�s elem.\n"
 
-#: g10/gpg.c:1521
+#: g10/gpg.c:1526
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1523
+#: g10/gpg.c:1528
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1525
+#: g10/gpg.c:1530
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nincs megfelel� al��r�s a titkoskulcs-karik�n.\n"
 
-#: g10/gpg.c:1527
+#: g10/gpg.c:1532
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1536
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1538
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1540
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1542
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1544
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1546
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mutatja a kilist�zott kulcs kulcskarik�j�t is"
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1548
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nincs megfelel� al��r�s a titkoskulcs-karik�n.\n"
 
-#: g10/gpg.c:1874
+#: g10/gpg.c:1879
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "MEGJEGYZ�S: Figyelmen k�v�l hagytam a r�gi opci�kat (%s).\n"
 
-#: g10/gpg.c:1916
+#: g10/gpg.c:1921
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "MEGJEGYZ�S: Nincs alap�rtelmezett opci�s f�jl (%s).\n"
 
-#: g10/gpg.c:1920
+#: g10/gpg.c:1925
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "\"%s\" opci�s f�jl: %s\n"
 
-#: g10/gpg.c:1927
+#: g10/gpg.c:1932
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Az opci�kat a \"%s\" �llom�nyb�l olvasom.\n"
 
-#: g10/gpg.c:2142 g10/gpg.c:2716 g10/gpg.c:2735
+#: g10/gpg.c:2147 g10/gpg.c:2747 g10/gpg.c:2766
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "MEGJEGYZ�S: %s nem norm�l haszn�latra van!\n"
 
-#: g10/gpg.c:2158
+#: g10/gpg.c:2163
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "A \"%s\" rejtjelez� b�v�t�st rossz enged�lyek miatt t�lt�m be.\n"
 
-#: g10/gpg.c:2312 g10/gpg.c:2324
+#: g10/gpg.c:2317 g10/gpg.c:2329
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2400
+#: g10/gpg.c:2405
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2422 g10/keyedit.c:3997
+#: g10/gpg.c:2429 g10/keyedit.c:3997
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "�rtelmezhetetlen a kulcsszerver URI-ja!\n"
 
-#: g10/gpg.c:2428
+#: g10/gpg.c:2441
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2431
+#: g10/gpg.c:2444
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2438
+#: g10/gpg.c:2451
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: �rv�nytelen import opci�k!\n"
 
-#: g10/gpg.c:2441
+#: g10/gpg.c:2454
 msgid "invalid import options\n"
 msgstr "�rv�nytelen import opci�k!\n"
 
-#: g10/gpg.c:2448
+#: g10/gpg.c:2461
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2464
 msgid "invalid export options\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2458
+#: g10/gpg.c:2471
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: �rv�nytelen import opci�k!\n"
 
-#: g10/gpg.c:2461
+#: g10/gpg.c:2474
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "�rv�nytelen import opci�k!\n"
 
-#: g10/gpg.c:2469
+#: g10/gpg.c:2482
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2471
+#: g10/gpg.c:2484
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2473
+#: g10/gpg.c:2486
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2475
+#: g10/gpg.c:2488
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2479
+#: g10/gpg.c:2492
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2481
+#: g10/gpg.c:2494
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
 
-#: g10/gpg.c:2483
+#: g10/gpg.c:2496
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2485
+#: g10/gpg.c:2498
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2505
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2495
+#: g10/gpg.c:2508
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2502
+#: g10/gpg.c:2515
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "Nem tudom a v�grehajt�si el�r�si utat %s �rt�kre �ll�tani!\n"
 
-#: g10/gpg.c:2705
+#: g10/gpg.c:2665
+#, fuzzy, c-format
+msgid "%s:%d: invalid auto-key-locate list\n"
+msgstr "%s:%d: �rv�nytelen export opci�k!\n"
+
+#: g10/gpg.c:2668
+msgid "invalid auto-key-locate list\n"
+msgstr ""
+
+#: g10/gpg.c:2736
 msgid "WARNING: program may create a core file!\n"
 msgstr "FIGYELEM: A program core �llom�nyt hozhat l�tre!\n"
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2740
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "FIGYELEM: %s hat�stalan�tja %s-t!\n"
 
-#: g10/gpg.c:2718
+#: g10/gpg.c:2749
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s �s %s nem haszn�lhat� egy�tt!\n"
 
-#: g10/gpg.c:2721
+#: g10/gpg.c:2752
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s �rtelmetlen %s mellett!\n"
 
-#: g10/gpg.c:2728
+#: g10/gpg.c:2759
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "GPG �gyn�k nem el�rhet� ebben a munkafolyamatban.\n"
 
-#: g10/gpg.c:2743
+#: g10/gpg.c:2774
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/gpg.c:2757
+#: g10/gpg.c:2788
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "Csak k�l�n�ll� �s olvashat�sz�veg-al��r�st k�sz�thet --pgp2 m�dban!\n"
 
-#: g10/gpg.c:2763
+#: g10/gpg.c:2794
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "Nem �rhat al� �s titkos�that egyszerre --pgp2 m�dban!\n"
 
-#: g10/gpg.c:2769
+#: g10/gpg.c:2800
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "Csak �llom�nyokat (pipe-ot nem) haszn�lhat --pgp2 m�dban!\n"
 
-#: g10/gpg.c:2782
+#: g10/gpg.c:2813
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "�zenet titkos�t�sa --pgp2 m�dban IDEA rejtjelez�t ig�nyel!\n"
 
-#: g10/gpg.c:2849 g10/gpg.c:2873
+#: g10/gpg.c:2880 g10/gpg.c:2904
 msgid "selected cipher algorithm is invalid\n"
 msgstr "A kiv�lasztott rejtjelez� algoritmus �rv�nytelen!\n"
 
-#: g10/gpg.c:2855 g10/gpg.c:2879
+#: g10/gpg.c:2886 g10/gpg.c:2910
 msgid "selected digest algorithm is invalid\n"
 msgstr "A kiv�lasztott kivonatol� algoritmus �rv�nytelen!\n"
 
-#: g10/gpg.c:2861
+#: g10/gpg.c:2892
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "A kiv�lasztott rejtjelez� algoritmus �rv�nytelen!\n"
 
-#: g10/gpg.c:2867
+#: g10/gpg.c:2898
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "Az igazol�shoz kiv�lasztott kivonatol� algoritmus �rv�nytelen!\n"
 
-#: g10/gpg.c:2882
+#: g10/gpg.c:2913
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed nagyobb kell legyen 0-n�l!\n"
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2915
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed nagyobb kell legyen 1-n�l!\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2917
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth 1 �s 255 k�z� kell essen!\n"
 
-#: g10/gpg.c:2888
+#: g10/gpg.c:2919
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "�rv�nytelen default-cert-level; 0, 1, 2 vagy 3 lehet.\n"
 
-#: g10/gpg.c:2890
+#: g10/gpg.c:2921
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "�rv�nytelen min-cert-level; 0, 1, 2 vagy 3 lehet.\n"
 
-#: g10/gpg.c:2893
+#: g10/gpg.c:2924
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "MEGJEGYZ�S: Egyszer� S2K m�d (0) er�sen ellenjavallt!\n"
 
-#: g10/gpg.c:2897
+#: g10/gpg.c:2928
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "�rv�nytelen S2K m�d; 0, 1 vagy 3 lehet.\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2935
 msgid "invalid default preferences\n"
 msgstr "�rv�nytelen alap�rtelmezett preferenci�k!\n"
 
-#: g10/gpg.c:2913
+#: g10/gpg.c:2944
 msgid "invalid personal cipher preferences\n"
 msgstr "�rv�nytelen szem�lyes rejtjelez�-preferenci�k!\n"
 
-#: g10/gpg.c:2917
+#: g10/gpg.c:2948
 msgid "invalid personal digest preferences\n"
 msgstr "�rv�nytelen szem�lyes kivonatol�preferenci�k!\n"
 
-#: g10/gpg.c:2921
+#: g10/gpg.c:2952
 msgid "invalid personal compress preferences\n"
 msgstr "�rv�nytelen szem�lyes t�m�r�t�preferenci�k!\n"
 
-#: g10/gpg.c:2954
+#: g10/gpg.c:2985
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s �s %s egyel�re nem haszn�lhat� egy�tt!\n"
 
-#: g10/gpg.c:3001
+#: g10/gpg.c:3032
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 "Lehet, hogy nem haszn�lhatja \"%s\" rejtjelez� algoritmust %s m�dban!\n"
 
-#: g10/gpg.c:3006
+#: g10/gpg.c:3037
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 "Lehet, hogy nem haszn�lhatja \"%s\" kivonatol� algoritmust %s m�dban!\n"
 
-#: g10/gpg.c:3011
+#: g10/gpg.c:3042
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "Lehet, hogy nem haszn�lhatja \"%s\" t�m�r�t� algoritmust %s m�dban!\n"
 
-#: g10/gpg.c:3107
+#: g10/gpg.c:3138
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
 
-#: g10/gpg.c:3118
+#: g10/gpg.c:3149
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "FIGYELEM: C�mzett megadva (-r), de nincs nyilv�nos kulcs� titkos�t�s!\n"
 
-#: g10/gpg.c:3129
+#: g10/gpg.c:3160
 msgid "--store [filename]"
 msgstr "--store [f�jln�v]"
 
-#: g10/gpg.c:3136
+#: g10/gpg.c:3167
 msgid "--symmetric [filename]"
 msgstr "--symmetric [f�jln�v]"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3169
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "Visszafejt�s sikertelen: %s.\n"
 
-#: g10/gpg.c:3148
+#: g10/gpg.c:3179
 msgid "--encrypt [filename]"
 msgstr "--encrypt [f�jln�v]"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3192
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [f�jln�v]"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3194
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3166
+#: g10/gpg.c:3197
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "Lehet, hogy nem haszn�lhatja %s-t %s m�dban!\n"
 
-#: g10/gpg.c:3184
+#: g10/gpg.c:3215
 msgid "--sign [filename]"
 msgstr "--sign [f�jln�v]"
 
-#: g10/gpg.c:3197
+#: g10/gpg.c:3228
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [f�jln�v]"
 
-#: g10/gpg.c:3212
+#: g10/gpg.c:3243
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [f�jln�v]"
 
-#: g10/gpg.c:3214
+#: g10/gpg.c:3245
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3217
+#: g10/gpg.c:3248
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "Lehet, hogy nem haszn�lhatja %s-t %s m�dban!\n"
 
-#: g10/gpg.c:3237
+#: g10/gpg.c:3268
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [f�jln�v]"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3277
 msgid "--clearsign [filename]"
 msgstr "--clearsign [f�jln�v]"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3302
 msgid "--decrypt [filename]"
 msgstr "--decrypt [f�jln�v]"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3310
 msgid "--sign-key user-id"
 msgstr "--sign-key felh-azonos�t�"
 
-#: g10/gpg.c:3283
+#: g10/gpg.c:3314
 msgid "--lsign-key user-id"
 msgstr "--lsign-key felh-azonos�t�"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3335
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key felh-azonos�t� [parancsok]"
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3406
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [felh-azonos�t�] [kulcskarika]"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3443
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "K�ld�s a kulcsszerverre sikertelen: %s\n"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3445
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "V�tel a kulcsszerverr�l sikertelen: %s\n"
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3447
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Kulcsexport�l�s sikertelen: %s\n"
 
-#: g10/gpg.c:3427
+#: g10/gpg.c:3458
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Keres�s a kulcsszerveren sikertelen: %s\n"
 
-#: g10/gpg.c:3437
+#: g10/gpg.c:3468
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Friss�t�s a kulcsszerverr�l sikertelen: %s\n"
 
-#: g10/gpg.c:3488
+#: g10/gpg.c:3519
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "P�nc�l elt�vol�t�sa nem siker�lt: %s\n"
 
-#: g10/gpg.c:3496
+#: g10/gpg.c:3527
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "P�nc�loz�s nem siker�lt: %s\n"
 
-#: g10/gpg.c:3583
+#: g10/gpg.c:3614
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "�rv�nytelen kivonatol� algoritmus: %s\n"
 
-#: g10/gpg.c:3706
+#: g10/gpg.c:3737
 msgid "[filename]"
 msgstr "[f�jln�v]"
 
-#: g10/gpg.c:3710
+#: g10/gpg.c:3741
 msgid "Go ahead and type your message ...\n"
 msgstr "Kezdheti g�pelni az �zenetet...\n"
 
-#: g10/gpg.c:4000
+#: g10/gpg.c:4031
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1799,28 +1808,28 @@ msgstr ""
 "Egy jel�l�s neve csak nyomtathat� karaktereket �s sz�k�zt tartalmazhat, �s = "
 "jellel kell befejez�dj�n.\n"
 
-#: g10/gpg.c:4008
+#: g10/gpg.c:4039
 msgid "a user notation name must contain the '@' character\n"
 msgstr "Egy felhaszn�l�jel�l�snek tartalmaznia kell a \"@\" karaktert!\n"
 
-#: g10/gpg.c:4013
+#: g10/gpg.c:4044
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "Egy felhaszn�l�jel�l�snek tartalmaznia kell a \"@\" karaktert!\n"
 
-#: g10/gpg.c:4024
+#: g10/gpg.c:4055
 msgid "a notation value must not use any control characters\n"
 msgstr "Egy jel�l�s �rt�k�ben nem szerepelhet vez�rl�karakter!\n"
 
-#: g10/gpg.c:4058
+#: g10/gpg.c:4089
 msgid "the given certification policy URL is invalid\n"
 msgstr "A megadott igazol�si elj�r�sm�d URL-je �rv�nytelen!\n"
 
-#: g10/gpg.c:4060
+#: g10/gpg.c:4091
 msgid "the given signature policy URL is invalid\n"
 msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
 
-#: g10/gpg.c:4093
+#: g10/gpg.c:4124
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
@@ -1829,35 +1838,36 @@ msgstr "A megadott al
 msgid "too many entries in pk cache - disabled\n"
 msgstr "T�l sok bejegyz�s van a nyilv�noskulcs-gyors�t�t�rban - letiltom.\n"
 
-#: g10/getkey.c:188 g10/getkey.c:2845
+#: g10/getkey.c:188 g10/getkey.c:2876
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[ismeretlen kulcs]"
 
-#: g10/getkey.c:931 g10/getkey.c:953 g10/getkey.c:976
+#: g10/getkey.c:933 g10/getkey.c:950 g10/getkey.c:970 g10/getkey.c:986
+#: g10/getkey.c:1001
 #, c-format
 msgid "Automatically retrieved `%s' via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1769
+#: g10/getkey.c:1800
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "%08lX �rv�nytelen kulcsot �rv�nyes�tett�k az\n"
 "--allow-non-selfsigned-uid opci�val.\n"
 
-#: g10/getkey.c:2323
+#: g10/getkey.c:2354
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 "Nincs titkos alkulcs a %08lX nyilv�nos alkulcshoz - figyelmen k�v�l hagyom.\n"
 
-#: g10/getkey.c:2554
+#: g10/getkey.c:2585
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "A %08lX m�sodlagos kulcsot haszn�ljuk a %08lX els�dleges helyett.\n"
 
-#: g10/getkey.c:2601
+#: g10/getkey.c:2632
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "%08lX kulcs: titkos kulcs nyilv�nos kulcs n�lk�l - kihagytam.\n"
@@ -3429,12 +3439,12 @@ msgid "(sensitive)"
 msgstr " (�rz�keny)"
 
 #: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
-#: g10/keylist.c:194 g10/keyserver.c:471
+#: g10/keylist.c:194 g10/keyserver.c:525
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s nem hozhat� l�tre: %s\n"
 
-#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:967
+#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:960
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[visszavont] "
@@ -3446,7 +3456,7 @@ msgstr " [lej
 
 #: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
 #: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:477 g10/mainproc.c:973
+#: g10/keylist.c:914 g10/keyserver.c:531 g10/mainproc.c:966
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [lej�r: %s]"
@@ -3482,14 +3492,14 @@ msgstr ""
 "K�rem, vegye figyelembe, hogy az itt l�that� kulcs �rv�nyess�ge nem\n"
 "felt�tlen�l helyes, am�g �jra nem ind�tja a programot!\n"
 
-#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:481
-#: g10/mainproc.c:1734 g10/trustdb.c:1184 g10/trustdb.c:1704
+#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:535
+#: g10/mainproc.c:1783 g10/trustdb.c:1184 g10/trustdb.c:1704
 #, fuzzy
 msgid "revoked"
 msgstr "[visszavont] "
 
-#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:485
-#: g10/mainproc.c:1736 g10/trustdb.c:537 g10/trustdb.c:1706
+#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:539
+#: g10/mainproc.c:1785 g10/trustdb.c:537 g10/trustdb.c:1706
 #, fuzzy
 msgid "expired"
 msgstr "expire"
@@ -4333,395 +4343,392 @@ msgstr "%s: Kulcskarik
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:77
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:81
+#: g10/keyserver.c:79
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:83
+#: g10/keyserver.c:81
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:87
+#: g10/keyserver.c:85
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:89
-msgid "automatically retrieve keys from PKA records"
-msgstr ""
-
-#: g10/keyserver.c:91
-msgid "automatically retrieve keys from DNS"
-msgstr ""
-
-#: g10/keyserver.c:95
+#: g10/keyserver.c:87
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
 
-#: g10/keyserver.c:139
+#: g10/keyserver.c:89
+msgid "honor the PKA record set on a key when retrieving keys"
+msgstr ""
+
+#: g10/keyserver.c:154
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "FIGYELEM: \"%s\" opci�i csak a k�vetkez� fut�skor lesznek �rv�nyesek!\n"
 
-#: g10/keyserver.c:483
+#: g10/keyserver.c:537
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:684
+#: g10/keyserver.c:738
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:767 g10/keyserver.c:1368
+#: g10/keyserver.c:821 g10/keyserver.c:1422
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/keyserver.c:865
+#: g10/keyserver.c:919
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
 
-#: g10/keyserver.c:867
+#: g10/keyserver.c:921
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
 
-#: g10/keyserver.c:1092
+#: g10/keyserver.c:1146
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "Lek�rem a %08lX kulcsot a %s kulcsszerverr�l.\n"
 
-#: g10/keyserver.c:1096
+#: g10/keyserver.c:1150
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "Lek�rem a %08lX kulcsot a %s kulcsszerverr�l.\n"
 
-#: g10/keyserver.c:1120
+#: g10/keyserver.c:1174
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n"
 
-#: g10/keyserver.c:1123
+#: g10/keyserver.c:1177
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n"
 
-#: g10/keyserver.c:1271
+#: g10/keyserver.c:1325
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n"
 
-#: g10/keyserver.c:1275
+#: g10/keyserver.c:1329
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "Al��rva az �n %08lX kulcs�val %s id�pontban.\n"
 
-#: g10/keyserver.c:1318
+#: g10/keyserver.c:1372
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n"
 
-#: g10/keyserver.c:1321
+#: g10/keyserver.c:1375
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n"
 
-#: g10/keyserver.c:1328 g10/keyserver.c:1424
+#: g10/keyserver.c:1382 g10/keyserver.c:1478
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/keyserver.c:1376
+#: g10/keyserver.c:1430
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1439
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1446
+#: g10/keyserver.c:1500
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1452
+#: g10/keyserver.c:1506
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1464
+#: g10/keyserver.c:1518
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1469
+#: g10/keyserver.c:1523
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1477
+#: g10/keyserver.c:1531
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1484
+#: g10/keyserver.c:1538
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "kulcsszerverhiba"
 
-#: g10/keyserver.c:1489
+#: g10/keyserver.c:1543
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "kulcsszerverhiba"
 
-#: g10/keyserver.c:1498
+#: g10/keyserver.c:1552
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "V�tel a kulcsszerverr�l sikertelen: %s\n"
 
-#: g10/keyserver.c:1523 g10/keyserver.c:1557
+#: g10/keyserver.c:1577 g10/keyserver.c:1611
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1814
+#: g10/keyserver.c:1868
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr ""
 "FIGYELEM: Nem tudom t�r�lni az (\"%s\") �tmeneti �llom�nyt: \"%s\": %s.\n"
 
-#: g10/keyserver.c:1836
+#: g10/keyserver.c:1890
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "Lek�rem a %08lX kulcsot a %s kulcsszerverr�l.\n"
 
-#: g10/keyserver.c:1838
+#: g10/keyserver.c:1892
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "Lek�rem a %08lX kulcsot a %s kulcsszerverr�l.\n"
 
-#: g10/keyserver.c:1903
+#: g10/keyserver.c:1957
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr ""
 "FIGYELEM: Nem tudom t�r�lni az (\"%s\") �tmeneti �llom�nyt: \"%s\": %s.\n"
 
-#: g10/keyserver.c:1909
+#: g10/keyserver.c:1963
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr ""
 "FIGYELEM: Nem tudom t�r�lni az (\"%s\") �tmeneti �llom�nyt: \"%s\": %s.\n"
 
-#: g10/mainproc.c:253
+#: g10/mainproc.c:240
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "Furcsa m�ret� (%d) titkos�tott munkafolyamatkulcs.\n"
 
-#: g10/mainproc.c:304
+#: g10/mainproc.c:291
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s titkos�tott munkafolyamatkulcs\n"
 
-#: g10/mainproc.c:314
+#: g10/mainproc.c:301
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "Ismeretlen algoritmussal (%d) titkos�tva.\n"
 
-#: g10/mainproc.c:395
+#: g10/mainproc.c:382
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "Nyilv�nos kulcs: %08lX\n"
 
-#: g10/mainproc.c:450
+#: g10/mainproc.c:439
 msgid "public key encrypted data: good DEK\n"
 msgstr "Nyilv�nos kulccsal titkos�tott adat: j� DEK.\n"
 
-#: g10/mainproc.c:483
+#: g10/mainproc.c:472
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "Titkos�tva %u bites %s kulccsal, azonos�t�: %08lX, l�trehozva: %s\n"
 
-#: g10/mainproc.c:487 g10/pkclist.c:219
+#: g10/mainproc.c:476 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "               azaz \""
 
-#: g10/mainproc.c:491
+#: g10/mainproc.c:480
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "Titkos�tva %s kulccsal, azonos�t�: %08lX\n"
 
-#: g10/mainproc.c:505
+#: g10/mainproc.c:494
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "Nyilv�nos kulcs� visszafejt�s sikertelen: %s\n"
 
-#: g10/mainproc.c:519
+#: g10/mainproc.c:508
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "%lu jelsz�val rejtjelezve\n"
 
-#: g10/mainproc.c:521
+#: g10/mainproc.c:510
 msgid "encrypted with 1 passphrase\n"
 msgstr "1 jelsz�val rejtjelezve\n"
 
-#: g10/mainproc.c:549 g10/mainproc.c:571
+#: g10/mainproc.c:541 g10/mainproc.c:563
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "%s titkos�tott adatot felt�telezek.\n"
 
-#: g10/mainproc.c:557
+#: g10/mainproc.c:549
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "IDEA rejtjelez� nem �ll rendelkez�sre, optimista m�don megpr�b�lok\n"
 "%s-t haszn�lni helyette.\n"
 
-#: g10/mainproc.c:589
+#: g10/mainproc.c:581
 msgid "decryption okay\n"
 msgstr "Visszafejt�s rendben.\n"
 
-#: g10/mainproc.c:593
+#: g10/mainproc.c:585
 msgid "WARNING: message was not integrity protected\n"
 msgstr "FIGYELEM: Az �zenetet nem l�tt�k el integrit�sv�delemmel.\n"
 
-#: g10/mainproc.c:606
+#: g10/mainproc.c:598
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "FIGYELEM: A titkos�tott �zenetet manipul�lt�k!\n"
 
-#: g10/mainproc.c:612
+#: g10/mainproc.c:604
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "Visszafejt�s sikertelen: %s.\n"
 
-#: g10/mainproc.c:631
+#: g10/mainproc.c:623
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "MEGJEGYZ�S: A felad� k�r�se: \"csak az �n szemeinek\".\n"
 
-#: g10/mainproc.c:633
+#: g10/mainproc.c:625
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "Eredeti f�jln�v: '%.*s'.\n"
 
-#: g10/mainproc.c:822
+#: g10/mainproc.c:815
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "K�l�n�ll� visszavon�s. Haszn�lja a \"gpg --import\"-ot az alkalmaz�s�hoz!\n"
 
-#: g10/mainproc.c:1168
+#: g10/mainproc.c:1161
 #, fuzzy
 msgid "no signature found\n"
 msgstr "J� al��r�s a k�vetkez�t�l: \""
 
-#: g10/mainproc.c:1418
+#: g10/mainproc.c:1419
 msgid "signature verification suppressed\n"
 msgstr "Al��r�s-ellen�rz�s elnyomva.\n"
 
-#: g10/mainproc.c:1460 g10/mainproc.c:1470
-msgid "can't handle these multiple signatures\n"
+#: g10/mainproc.c:1519
+#, fuzzy
+msgid "can't handle this ambiguous signature data\n"
 msgstr "Nem tudom kezelni ezeket a t�bbsz�r�s al��r�sokat!\n"
 
-#: g10/mainproc.c:1480
+#: g10/mainproc.c:1530
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Az al��r�s lej�rt: %s.\n"
 
-#: g10/mainproc.c:1481
+#: g10/mainproc.c:1531
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "               azaz \""
 
-#: g10/mainproc.c:1485
+#: g10/mainproc.c:1535
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Al��rva: %.*s; kulcs: %s, %08lX.\n"
 
-#: g10/mainproc.c:1505
+#: g10/mainproc.c:1555
 msgid "Key available at: "
 msgstr "Kulcs tal�lhat�: "
 
-#: g10/mainproc.c:1639 g10/mainproc.c:1687
+#: g10/mainproc.c:1688 g10/mainproc.c:1736
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "ROSSZ al��r�s a k�vetkez�t�l: \""
 
-#: g10/mainproc.c:1641 g10/mainproc.c:1689
+#: g10/mainproc.c:1690 g10/mainproc.c:1738
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Lej�rt al��r�s a k�vetkez�t�l: \""
 
-#: g10/mainproc.c:1643 g10/mainproc.c:1691
+#: g10/mainproc.c:1692 g10/mainproc.c:1740
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "J� al��r�s a k�vetkez�t�l: \""
 
-#: g10/mainproc.c:1695
+#: g10/mainproc.c:1744
 msgid "[uncertain]"
 msgstr "[bizonytalan]"
 
-#: g10/mainproc.c:1727
+#: g10/mainproc.c:1776
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "               azaz \""
 
-#: g10/mainproc.c:1824
+#: g10/mainproc.c:1873
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Az al��r�s lej�rt: %s.\n"
 
-#: g10/mainproc.c:1829
+#: g10/mainproc.c:1878
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Az al��r�s lej�r: %s.\n"
 
-#: g10/mainproc.c:1832
+#: g10/mainproc.c:1881
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s al��r�s, %s kivonatol� algoritmus.\n"
 
-#: g10/mainproc.c:1833
+#: g10/mainproc.c:1882
 msgid "binary"
 msgstr "Bin�ris"
 
-#: g10/mainproc.c:1834
+#: g10/mainproc.c:1883
 msgid "textmode"
 msgstr "Sz�vegm�d�"
 
-#: g10/mainproc.c:1834 g10/trustdb.c:536
+#: g10/mainproc.c:1883 g10/trustdb.c:536
 msgid "unknown"
 msgstr "Ismeretlen m�d�"
 
-#: g10/mainproc.c:1854
+#: g10/mainproc.c:1903
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nem tudom ellen�rizni az al��r�st: %s.\n"
 
-#: g10/mainproc.c:1922 g10/mainproc.c:1938 g10/mainproc.c:2024
+#: g10/mainproc.c:1972 g10/mainproc.c:1988 g10/mainproc.c:2074
 msgid "not a detached signature\n"
 msgstr "Nem k�l�n�ll� al��r�s.\n"
 
-#: g10/mainproc.c:1965
+#: g10/mainproc.c:2015
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "FIGYELEM: T�bbsz�r�s al��r�st �rz�keltem. Csak az els�t ellen�rz�m.\n"
 
-#: g10/mainproc.c:1973
+#: g10/mainproc.c:2023
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "0x%02x oszt�ly� k�l�n�ll� al��r�s.\n"
 
-#: g10/mainproc.c:2030
+#: g10/mainproc.c:2080
 msgid "old style (PGP 2.x) signature\n"
 msgstr "R�gi st�lus� (PGP 2.x) al��r�s.\n"
 
-#: g10/mainproc.c:2040
+#: g10/mainproc.c:2090
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "�rv�nytelen gy�k�rcsomagot tal�ltam a proc_tree() f�ggv�nyben!\n"
 
@@ -5293,23 +5300,23 @@ msgstr ""
 msgid "error creating `%s': %s\n"
 msgstr "Hiba \"%s\" l�trehoz�sakor: %s\n"
 
-#: g10/plaintext.c:447
+#: g10/plaintext.c:453
 msgid "Detached signature.\n"
 msgstr "K�l�n�ll� al��r�s.\n"
 
-#: g10/plaintext.c:453
+#: g10/plaintext.c:459
 msgid "Please enter name of data file: "
 msgstr "K�rem, adja meg az adat�llom�ny nev�t: "
 
-#: g10/plaintext.c:485
+#: g10/plaintext.c:491
 msgid "reading stdin ...\n"
 msgstr "Olvasom a szabv�nyos bemenetet...\n"
 
-#: g10/plaintext.c:519
+#: g10/plaintext.c:525
 msgid "no signed data\n"
 msgstr "Nincs al��rt adat.\n"
 
-#: g10/plaintext.c:533
+#: g10/plaintext.c:539
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "Nem tudom megnyitni a(z) \"%s\" al��rt adatot!\n"
diff --git a/po/id.po b/po/id.po
index 8aad54a1b..2f7e1b208 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-id\n"
 "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2006-02-14 15:28+0100\n"
+"POT-Creation-Date: 2006-03-07 11:29+0100\n"
 "PO-Revision-Date: 2004-06-17 16:32+0700\n"
 "Last-Translator: Tedi Heriyanto <tedi_h@gmx.net>\n"
 "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
@@ -42,9 +42,9 @@ msgstr "menulis kunci rahasia ke `%s'\n"
 
 #: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:992 g10/gpg.c:3360 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:997 g10/gpg.c:3391 g10/import.c:193 g10/keygen.c:2274
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:476 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
+#: g10/plaintext.c:482 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
 #: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
@@ -78,7 +78,7 @@ msgstr "tidak dapat membaca `%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "catatan: file random_seed tidak diupdate\n"
 
-#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:991 g10/keygen.c:2753
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2753
 #: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
 #: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
 #, c-format
@@ -695,48 +695,48 @@ msgstr "menulis kunci rahasia ke `%s'\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Perintah tidak valid (coba \"help\")\n"
 
-#: g10/cardglue.c:435
+#: g10/cardglue.c:434
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:572
+#: g10/cardglue.c:573
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:580
+#: g10/cardglue.c:582
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:915
+#: g10/cardglue.c:917
 msgid "Enter New Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:916
+#: g10/cardglue.c:918
 msgid "Enter New PIN: "
 msgstr ""
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:919
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:920
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/cardglue.c:935
+#: g10/cardglue.c:937
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Ulangi passphrase: "
 
-#: g10/cardglue.c:950
+#: g10/cardglue.c:952
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "passphrase tidak diulang dengan benar; coba lagi"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3720 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3751 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -746,13 +746,13 @@ msgstr "tidak dapat membuka `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output tidak berfungsi untuk perintah ini\n"
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1644
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1698
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1658
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1712
 #: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -864,12 +864,12 @@ msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s dienkripsi untuk: %s\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:306
+#: g10/encr-data.c:67 g10/mainproc.c:293
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s data terenkripsi\n"
 
-#: g10/encr-data.c:69 g10/mainproc.c:310
+#: g10/encr-data.c:69 g10/mainproc.c:297
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "dienkripsi dengan algoritma tidak dikenal %d\n"
@@ -1013,7 +1013,7 @@ msgstr ""
 msgid "WARNING: nothing exported\n"
 msgstr "PERINGATAN: tidak ada yang diekspor\n"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:373
 msgid ""
 "@Commands:\n"
 " "
@@ -1021,128 +1021,128 @@ msgstr ""
 "@Perintah:\n"
 " "
 
-#: g10/gpg.c:374
+#: g10/gpg.c:375
 msgid "|[file]|make a signature"
 msgstr "|[file]|buat signature"
 
-#: g10/gpg.c:375
+#: g10/gpg.c:376
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|buat signature teks"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:377
 msgid "make a detached signature"
 msgstr "buat detached signature"
 
-#: g10/gpg.c:377
+#: g10/gpg.c:378
 msgid "encrypt data"
 msgstr "enkripsi data"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:380
 msgid "encryption only with symmetric cipher"
 msgstr "enkripsi hanya dengan symmetric cipher"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:382
 msgid "decrypt data (default)"
 msgstr "dekripsi data (default)"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:384
 msgid "verify a signature"
 msgstr "verifikasi signature"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:386
 msgid "list keys"
 msgstr "tampilkan kunci"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "list keys and signatures"
 msgstr "tampilkan kunci dan signature"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:389
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "periksa signature kunci"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:390
 msgid "list keys and fingerprints"
 msgstr "tampilkan kunci dan fingerprint"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:391
 msgid "list secret keys"
 msgstr "tampilkan kunci rahasia"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:392
 msgid "generate a new key pair"
 msgstr "buat sepasang kunci baru"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:393
 msgid "remove keys from the public keyring"
 msgstr "hapus kunci dari keyring publik"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:395
 msgid "remove keys from the secret keyring"
 msgstr "hapus kunci dari keyring pribadi"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:396
 msgid "sign a key"
 msgstr "tandai kunci"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:397
 msgid "sign a key locally"
 msgstr "tandai kunci secara lokal"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:398
 msgid "sign or edit a key"
 msgstr "tandai atau edit kunci"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:399
 msgid "generate a revocation certificate"
 msgstr "buat sertifikat revokasi"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:401
 msgid "export keys"
 msgstr "ekspor kunci"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:402
 msgid "export keys to a key server"
 msgstr "ekspor kunci ke key server"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:403
 msgid "import keys from a key server"
 msgstr "impor kunci dari key server"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:405
 msgid "search for keys on a key server"
 msgstr "cari kunci di key server"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:407
 msgid "update all keys from a keyserver"
 msgstr "update semua kunci dari keyserver"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:411
 msgid "import/merge keys"
 msgstr "impor/gabung kunci"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:414
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:414
+#: g10/gpg.c:415
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:415
+#: g10/gpg.c:416
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:423
+#: g10/gpg.c:424
 msgid "update the trust database"
 msgstr "perbarui database trust"
 
-#: g10/gpg.c:430
+#: g10/gpg.c:431
 msgid "|algo [files]|print message digests"
 msgstr "|algo [file]|cetak digest pesan"
 
-#: g10/gpg.c:434 g10/gpgv.c:71
+#: g10/gpg.c:435 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1152,51 +1152,51 @@ msgstr ""
 "Pilihan:\n"
 "  "
 
-#: g10/gpg.c:436
+#: g10/gpg.c:437
 msgid "create ascii armored output"
 msgstr "ciptakan output ascii"
 
-#: g10/gpg.c:438
+#: g10/gpg.c:439
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAMA|enkripsi untuk NAMA"
 
-#: g10/gpg.c:449
+#: g10/gpg.c:450
 msgid "use this user-id to sign or decrypt"
 msgstr "gunakan id-user ini untuk menandai/dekripsi"
 
-#: g10/gpg.c:450
+#: g10/gpg.c:451
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|set tingkat kompresi N (0 tidak ada)"
 
-#: g10/gpg.c:455
+#: g10/gpg.c:456
 msgid "use canonical text mode"
 msgstr "gunakan mode teks kanonikal"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:470
 msgid "use as output file"
 msgstr "gunakan sebagai file output"
 
-#: g10/gpg.c:471 g10/gpgv.c:73
+#: g10/gpg.c:472 g10/gpgv.c:73
 msgid "verbose"
 msgstr "detil"
 
-#: g10/gpg.c:482
+#: g10/gpg.c:483
 msgid "do not make any changes"
 msgstr "jangan buat perubahan"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:484
 msgid "prompt before overwriting"
 msgstr "tanya sebelum menimpa"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:525
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:553
+#: g10/gpg.c:554
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1204,7 +1204,7 @@ msgstr ""
 "@\n"
 "(Lihat man page untuk daftar lengkap semua perintah dan option)\n"
 
-#: g10/gpg.c:556
+#: g10/gpg.c:557
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1224,15 +1224,15 @@ msgstr ""
 " --list-keys [nama]      tampilkan kunci\n"
 " --fingerprint [nama]    tampilkan fingerprint\n"
 
-#: g10/gpg.c:746 g10/gpgv.c:98
+#: g10/gpg.c:751 g10/gpgv.c:98
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Laporkan bug ke <gnupg-bugs@gnu.org>.\n"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:768
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: g10/gpg.c:766
+#: g10/gpg.c:771
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1242,7 +1242,7 @@ msgstr ""
 "tandai, cek, enkripsi atau dekripsi\n"
 "operasi baku tergantung pada data input\n"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:782
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1250,560 +1250,569 @@ msgstr ""
 "\n"
 "Algoritma yang didukung:\n"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:785
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/gpg.c:786 g10/keyedit.c:2266
+#: g10/gpg.c:791 g10/keyedit.c:2266
 msgid "Cipher: "
 msgstr "Cipher: "
 
-#: g10/gpg.c:792
+#: g10/gpg.c:797
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:798 g10/keyedit.c:2312
+#: g10/gpg.c:803 g10/keyedit.c:2312
 msgid "Compression: "
 msgstr "Kompresi: "
 
-#: g10/gpg.c:881
+#: g10/gpg.c:886
 msgid "usage: gpg [options] "
 msgstr "pemakaian: gpg [pilihan] "
 
-#: g10/gpg.c:1029
+#: g10/gpg.c:1034
 msgid "conflicting commands\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/gpg.c:1047
+#: g10/gpg.c:1052
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "tanda = tidak ditemukan dalam definisi grup \"%s\"\n"
 
-#: g10/gpg.c:1244
+#: g10/gpg.c:1249
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1247
+#: g10/gpg.c:1252
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1250
+#: g10/gpg.c:1255
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "Peringatan: kepemilikan tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1256
+#: g10/gpg.c:1261
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1259
+#: g10/gpg.c:1264
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1262
+#: g10/gpg.c:1267
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "Peringatan: permisi tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1268
+#: g10/gpg.c:1273
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "Peringatan: kepemilikan direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1271
+#: g10/gpg.c:1276
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "Peringatan: kepemilikan direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1274
+#: g10/gpg.c:1279
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "Peringatan: kepemilikan direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1280
+#: g10/gpg.c:1285
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "Peringatan: permisi direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1283
+#: g10/gpg.c:1288
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "Peringatan: permisi direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1286
+#: g10/gpg.c:1291
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "Peringatan: permisi direktori tidak aman pada %s \"%s\"\n"
 
-#: g10/gpg.c:1427
+#: g10/gpg.c:1432
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "Item Konfigurasi tidak dikenal \"%s\"\n"
 
-#: g10/gpg.c:1521
+#: g10/gpg.c:1526
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1523
+#: g10/gpg.c:1528
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1525
+#: g10/gpg.c:1530
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/gpg.c:1527
+#: g10/gpg.c:1532
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1536
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1538
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1540
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1542
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1544
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1546
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "tampilkan keyring tempat kunci yang dipilih berada"
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1548
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/gpg.c:1874
+#: g10/gpg.c:1879
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "CATATAN: file pilihan baku lama `%s' diabaikan\n"
 
-#: g10/gpg.c:1916
+#: g10/gpg.c:1921
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "CATATAN: tidak ada file pilihan baku `%s'\n"
 
-#: g10/gpg.c:1920
+#: g10/gpg.c:1925
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file pilihan `%s': %s\n"
 
-#: g10/gpg.c:1927
+#: g10/gpg.c:1932
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "membaca pilihan dari `%s'\n"
 
-#: g10/gpg.c:2142 g10/gpg.c:2716 g10/gpg.c:2735
+#: g10/gpg.c:2147 g10/gpg.c:2747 g10/gpg.c:2766
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "CATATAN: %s tidak untuk pemakaian normal!\n"
 
-#: g10/gpg.c:2158
+#: g10/gpg.c:2163
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "ekstensi cipher \"%s\" tidak dimuat karena permisi tidak aman\n"
 
-#: g10/gpg.c:2312 g10/gpg.c:2324
+#: g10/gpg.c:2317 g10/gpg.c:2329
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2400
+#: g10/gpg.c:2405
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2422 g10/keyedit.c:3997
+#: g10/gpg.c:2429 g10/keyedit.c:3997
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "tidak dapat memparsing URI keyserver\n"
 
-#: g10/gpg.c:2428
+#: g10/gpg.c:2441
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2431
+#: g10/gpg.c:2444
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2438
+#: g10/gpg.c:2451
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opsi impor tidak valid\n"
 
-#: g10/gpg.c:2441
+#: g10/gpg.c:2454
 msgid "invalid import options\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/gpg.c:2448
+#: g10/gpg.c:2461
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2464
 msgid "invalid export options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2458
+#: g10/gpg.c:2471
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opsi impor tidak valid\n"
 
-#: g10/gpg.c:2461
+#: g10/gpg.c:2474
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/gpg.c:2469
+#: g10/gpg.c:2482
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2471
+#: g10/gpg.c:2484
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2473
+#: g10/gpg.c:2486
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2475
+#: g10/gpg.c:2488
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2479
+#: g10/gpg.c:2492
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2481
+#: g10/gpg.c:2494
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:2483
+#: g10/gpg.c:2496
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2485
+#: g10/gpg.c:2498
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2505
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2495
+#: g10/gpg.c:2508
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2502
+#: g10/gpg.c:2515
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "tidak dapat menset path exec ke %s\n"
 
-#: g10/gpg.c:2705
+#: g10/gpg.c:2665
+#, fuzzy, c-format
+msgid "%s:%d: invalid auto-key-locate list\n"
+msgstr "%s:%d: opsi ekspor tidak valid\n"
+
+#: g10/gpg.c:2668
+msgid "invalid auto-key-locate list\n"
+msgstr ""
+
+#: g10/gpg.c:2736
 msgid "WARNING: program may create a core file!\n"
 msgstr "PERINGATAN: program mungkin membuat file core!\n"
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2740
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "PERINGATAN: %s menimpa %s\n"
 
-#: g10/gpg.c:2718
+#: g10/gpg.c:2749
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s tidak dibolehkan dengan %s!\n"
 
-#: g10/gpg.c:2721
+#: g10/gpg.c:2752
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s tidak masuk akal dengan %s!\n"
 
-#: g10/gpg.c:2728
+#: g10/gpg.c:2759
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
 
-#: g10/gpg.c:2743
+#: g10/gpg.c:2774
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/gpg.c:2757
+#: g10/gpg.c:2788
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "anda hanya dapat membuat signature detached atau clear saat dalam mode --"
 "pgp2\n"
 
-#: g10/gpg.c:2763
+#: g10/gpg.c:2794
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 "anda tidak dapat menandai dan mengenkripsi pada saat bersamaan dalam mode --"
 "pgp2\n"
 
-#: g10/gpg.c:2769
+#: g10/gpg.c:2800
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "anda harus menggunakan file (dan bukan pipe) saat bekerja dengan opsi --"
 "pgpg2\n"
 
-#: g10/gpg.c:2782
+#: g10/gpg.c:2813
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "mengenkripsi pesan dalam mode --pgp2 membutuhkan cipher IDEA\n"
 
-#: g10/gpg.c:2849 g10/gpg.c:2873
+#: g10/gpg.c:2880 g10/gpg.c:2904
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/gpg.c:2855 g10/gpg.c:2879
+#: g10/gpg.c:2886 g10/gpg.c:2910
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritma digest yang dipilih tidak valid\n"
 
-#: g10/gpg.c:2861
+#: g10/gpg.c:2892
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/gpg.c:2867
+#: g10/gpg.c:2898
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "algoritma sertifikasi digest yang dipilih tidak valid\n"
 
-#: g10/gpg.c:2882
+#: g10/gpg.c:2913
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed harus lebih dari 0\n"
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2915
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed harus lebih dari 1\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2917
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth harus di antara 1 hingga 255\n"
 
-#: g10/gpg.c:2888
+#: g10/gpg.c:2919
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "level cert default tidak valid; harus 0, 1, 2, atau 3\n"
 
-#: g10/gpg.c:2890
+#: g10/gpg.c:2921
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "level cert min tidak valid; harus 0, 1, 2, atau 3\n"
 
-#: g10/gpg.c:2893
+#: g10/gpg.c:2924
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "CATATAN: mode S2K sederhana (0) tidak dianjurkan\n"
 
-#: g10/gpg.c:2897
+#: g10/gpg.c:2928
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mode S2K yang tidak valid; harus 0, 1 atau 3\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2935
 msgid "invalid default preferences\n"
 msgstr "preferensi baku tidak valid\n"
 
-#: g10/gpg.c:2913
+#: g10/gpg.c:2944
 msgid "invalid personal cipher preferences\n"
 msgstr "preferensi cipher personal tidak valid\n"
 
-#: g10/gpg.c:2917
+#: g10/gpg.c:2948
 msgid "invalid personal digest preferences\n"
 msgstr "preferensi digest personal tidak valid\n"
 
-#: g10/gpg.c:2921
+#: g10/gpg.c:2952
 msgid "invalid personal compress preferences\n"
 msgstr "preferensi kompresi personal tidak valid\n"
 
-#: g10/gpg.c:2954
+#: g10/gpg.c:2985
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s belum dapat dipakai dengan %s\n"
 
-#: g10/gpg.c:3001
+#: g10/gpg.c:3032
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 "anda tidak boleh menggunakan algoritma cipher \"%s\" saat dalam mode %s.\n"
 
-#: g10/gpg.c:3006
+#: g10/gpg.c:3037
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 "anda tidak boleh menggunakan algoritma digest \"%s\" saat dalam mode %s.\n"
 
-#: g10/gpg.c:3011
+#: g10/gpg.c:3042
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "anda tidak boleh menggunakan algoritma kompresi \"%s\" saat dalam mode %s.\n"
 
-#: g10/gpg.c:3107
+#: g10/gpg.c:3138
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: g10/gpg.c:3118
+#: g10/gpg.c:3149
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "Peringatan: penerima yang disebutkan (-r) tanpa menggunakan enkripsi public "
 "key \n"
 
-#: g10/gpg.c:3129
+#: g10/gpg.c:3160
 msgid "--store [filename]"
 msgstr "--store [namafile]"
 
-#: g10/gpg.c:3136
+#: g10/gpg.c:3167
 msgid "--symmetric [filename]"
 msgstr "--symmetric [namafile]"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3169
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "dekripsi gagal: %s\n"
 
-#: g10/gpg.c:3148
+#: g10/gpg.c:3179
 msgid "--encrypt [filename]"
 msgstr "--encrypt [namafile]"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3192
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3194
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3166
+#: g10/gpg.c:3197
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n"
 
-#: g10/gpg.c:3184
+#: g10/gpg.c:3215
 msgid "--sign [filename]"
 msgstr "--sign [namafile]"
 
-#: g10/gpg.c:3197
+#: g10/gpg.c:3228
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/gpg.c:3212
+#: g10/gpg.c:3243
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/gpg.c:3214
+#: g10/gpg.c:3245
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3217
+#: g10/gpg.c:3248
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n"
 
-#: g10/gpg.c:3237
+#: g10/gpg.c:3268
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [namafile]"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3277
 msgid "--clearsign [filename]"
 msgstr "--clearsign [namafile]"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3302
 msgid "--decrypt [filename]"
 msgstr "--decrypt [namafile]"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3310
 msgid "--sign-key user-id"
 msgstr "--sign-key id-user"
 
-#: g10/gpg.c:3283
+#: g10/gpg.c:3314
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-user"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3335
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-user [perintah]"
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3406
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-user] [keyring]"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3443
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Pengiriman keyserver gagal: %s\n"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3445
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Penerimaan keyserver gagal: %s\n"
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3447
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Ekspor kunci gagal: %s\n"
 
-#: g10/gpg.c:3427
+#: g10/gpg.c:3458
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Pencarian keyserver gagal: %s\n"
 
-#: g10/gpg.c:3437
+#: g10/gpg.c:3468
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Refresh keyserver gagal: %s\n"
 
-#: g10/gpg.c:3488
+#: g10/gpg.c:3519
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "gagal dearmoring: %s\n"
 
-#: g10/gpg.c:3496
+#: g10/gpg.c:3527
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: g10/gpg.c:3583
+#: g10/gpg.c:3614
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritma hash tidak valid `%s'\n"
 
-#: g10/gpg.c:3706
+#: g10/gpg.c:3737
 msgid "[filename]"
 msgstr "[namafile]"
 
-#: g10/gpg.c:3710
+#: g10/gpg.c:3741
 msgid "Go ahead and type your message ...\n"
 msgstr "Teruskan dan ketikkan pesan anda ....\n"
 
-#: g10/gpg.c:4000
+#: g10/gpg.c:4031
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1811,28 +1820,28 @@ msgstr ""
 "nama notasi harus hanya terdiri dari karakter yang dapat dicetak atau spasi, "
 "dan diakhiri dengan sebuah '='\n"
 
-#: g10/gpg.c:4008
+#: g10/gpg.c:4039
 msgid "a user notation name must contain the '@' character\n"
 msgstr "nama notasi pengguna tidak boleh mengandung karakter '@'\n"
 
-#: g10/gpg.c:4013
+#: g10/gpg.c:4044
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "nama notasi pengguna tidak boleh mengandung karakter '@'\n"
 
-#: g10/gpg.c:4024
+#: g10/gpg.c:4055
 msgid "a notation value must not use any control characters\n"
 msgstr "nilai notasi tidak boleh menggunakan karakter kendali\n"
 
-#: g10/gpg.c:4058
+#: g10/gpg.c:4089
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL sertifikasi kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:4060
+#: g10/gpg.c:4091
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:4093
+#: g10/gpg.c:4124
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
@@ -1841,32 +1850,33 @@ msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "terlalu banyak masukan dalam pk cache - ditiadakan\n"
 
-#: g10/getkey.c:188 g10/getkey.c:2845
+#: g10/getkey.c:188 g10/getkey.c:2876
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[User id tidak ditemukan]"
 
-#: g10/getkey.c:931 g10/getkey.c:953 g10/getkey.c:976
+#: g10/getkey.c:933 g10/getkey.c:950 g10/getkey.c:970 g10/getkey.c:986
+#: g10/getkey.c:1001
 #, c-format
 msgid "Automatically retrieved `%s' via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1769
+#: g10/getkey.c:1800
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "kunci tidak valid %08lX dibuat valid oleh --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2323
+#: g10/getkey.c:2354
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "tidak ada subkey rahasia untuk subkey publik %08lX. diabaikan\n"
 
-#: g10/getkey.c:2554
+#: g10/getkey.c:2585
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "menggunakan kunci sekunder %08lX bukannya kunci primer %08lX\n"
 
-#: g10/getkey.c:2601
+#: g10/getkey.c:2632
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "kunci %08lX: kunci rahasia tanpa kunci publik - dilewati\n"
@@ -3445,12 +3455,12 @@ msgid "(sensitive)"
 msgstr " (sensitive)"
 
 #: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
-#: g10/keylist.c:194 g10/keyserver.c:471
+#: g10/keylist.c:194 g10/keyserver.c:525
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:967
+#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:960
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revoked] "
@@ -3462,7 +3472,7 @@ msgstr " [berakhir: %s]"
 
 #: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
 #: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:477 g10/mainproc.c:973
+#: g10/keylist.c:914 g10/keyserver.c:531 g10/mainproc.c:966
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [berakhir: %s]"
@@ -3498,14 +3508,14 @@ msgstr ""
 "Perhatikan bahwa validitas kunci yang ditampilkan belum tentu benar\n"
 "kecuali anda memulai kembali program.\n"
 
-#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:481
-#: g10/mainproc.c:1734 g10/trustdb.c:1184 g10/trustdb.c:1704
+#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:535
+#: g10/mainproc.c:1783 g10/trustdb.c:1184 g10/trustdb.c:1704
 #, fuzzy
 msgid "revoked"
 msgstr "[revoked] "
 
-#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:485
-#: g10/mainproc.c:1736 g10/trustdb.c:537 g10/trustdb.c:1706
+#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:539
+#: g10/mainproc.c:1785 g10/trustdb.c:537 g10/trustdb.c:1706
 #, fuzzy
 msgid "expired"
 msgstr "expire"
@@ -4349,389 +4359,386 @@ msgstr "%s: keyring tercipta\n"
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:77
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:81
+#: g10/keyserver.c:79
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:83
+#: g10/keyserver.c:81
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:87
+#: g10/keyserver.c:85
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:89
-msgid "automatically retrieve keys from PKA records"
-msgstr ""
-
-#: g10/keyserver.c:91
-msgid "automatically retrieve keys from DNS"
-msgstr ""
-
-#: g10/keyserver.c:95
+#: g10/keyserver.c:87
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/keyserver.c:139
+#: g10/keyserver.c:89
+msgid "honor the PKA record set on a key when retrieving keys"
+msgstr ""
+
+#: g10/keyserver.c:154
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "PERINGATAN: opsi dalam `%s' belum aktif selama pelaksanaan ini\n"
 
-#: g10/keyserver.c:483
+#: g10/keyserver.c:537
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:684
+#: g10/keyserver.c:738
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:767 g10/keyserver.c:1368
+#: g10/keyserver.c:821 g10/keyserver.c:1422
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/keyserver.c:865
+#: g10/keyserver.c:919
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: g10/keyserver.c:867
+#: g10/keyserver.c:921
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: g10/keyserver.c:1092
+#: g10/keyserver.c:1146
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "meminta kunci %08lX dari %s\n"
 
-#: g10/keyserver.c:1096
+#: g10/keyserver.c:1150
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "meminta kunci %08lX dari %s\n"
 
-#: g10/keyserver.c:1120
+#: g10/keyserver.c:1174
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "mencari \"%s\" dari server HKP %s\n"
 
-#: g10/keyserver.c:1123
+#: g10/keyserver.c:1177
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "mencari \"%s\" dari server HKP %s\n"
 
-#: g10/keyserver.c:1271
+#: g10/keyserver.c:1325
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "mencari \"%s\" dari server HKP %s\n"
 
-#: g10/keyserver.c:1275
+#: g10/keyserver.c:1329
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "ditandai dengan kunci anda %08lX pada %s\n"
 
-#: g10/keyserver.c:1318
+#: g10/keyserver.c:1372
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "mencari \"%s\" dari server HKP %s\n"
 
-#: g10/keyserver.c:1321
+#: g10/keyserver.c:1375
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "mencari \"%s\" dari server HKP %s\n"
 
-#: g10/keyserver.c:1328 g10/keyserver.c:1424
+#: g10/keyserver.c:1382 g10/keyserver.c:1478
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/keyserver.c:1376
+#: g10/keyserver.c:1430
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1439
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1446
+#: g10/keyserver.c:1500
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1452
+#: g10/keyserver.c:1506
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1464
+#: g10/keyserver.c:1518
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1469
+#: g10/keyserver.c:1523
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1477
+#: g10/keyserver.c:1531
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1484
+#: g10/keyserver.c:1538
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "kesalahan keyserver"
 
-#: g10/keyserver.c:1489
+#: g10/keyserver.c:1543
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "kesalahan keyserver"
 
-#: g10/keyserver.c:1498
+#: g10/keyserver.c:1552
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "Penerimaan keyserver gagal: %s\n"
 
-#: g10/keyserver.c:1523 g10/keyserver.c:1557
+#: g10/keyserver.c:1577 g10/keyserver.c:1611
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1814
+#: g10/keyserver.c:1868
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "PERINGATAN: tidak dapat menghapus file temp (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1836
+#: g10/keyserver.c:1890
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "meminta kunci %08lX dari %s\n"
 
-#: g10/keyserver.c:1838
+#: g10/keyserver.c:1892
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "meminta kunci %08lX dari %s\n"
 
-#: g10/keyserver.c:1903
+#: g10/keyserver.c:1957
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "PERINGATAN: tidak dapat menghapus file temp (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1909
+#: g10/keyserver.c:1963
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "PERINGATAN: tidak dapat menghapus file temp (%s) `%s': %s\n"
 
-#: g10/mainproc.c:253
+#: g10/mainproc.c:240
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "ukuran aneh untuk kunci sesi terenkripsi (%d)\n"
 
-#: g10/mainproc.c:304
+#: g10/mainproc.c:291
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s kunci sesi enkripsi\n"
 
-#: g10/mainproc.c:314
+#: g10/mainproc.c:301
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "dienkripsi dengan algoritma tidak dikenal %d\n"
 
-#: g10/mainproc.c:395
+#: g10/mainproc.c:382
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "kunci publik adalah %08lX\n"
 
-#: g10/mainproc.c:450
+#: g10/mainproc.c:439
 msgid "public key encrypted data: good DEK\n"
 msgstr "data terenkripsi dengan kunci publik: DEK baik\n"
 
-#: g10/mainproc.c:483
+#: g10/mainproc.c:472
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "dienkripsi dengan %u-bit kunci %s, ID %08lX, tercipta %s\n"
 
-#: g10/mainproc.c:487 g10/pkclist.c:219
+#: g10/mainproc.c:476 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "              alias \""
 
-#: g10/mainproc.c:491
+#: g10/mainproc.c:480
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "dienkripsi dengan kunci %s, ID %08lX\n"
 
-#: g10/mainproc.c:505
+#: g10/mainproc.c:494
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "gagal dekripsi kunci publik: %s\n"
 
-#: g10/mainproc.c:519
+#: g10/mainproc.c:508
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "dienkripsi dengan passphrase %lu\n"
 
-#: g10/mainproc.c:521
+#: g10/mainproc.c:510
 msgid "encrypted with 1 passphrase\n"
 msgstr "dienkripsi dengan 1 passphrase\n"
 
-#: g10/mainproc.c:549 g10/mainproc.c:571
+#: g10/mainproc.c:541 g10/mainproc.c:563
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "asumsikan %s data terenkripsi\n"
 
-#: g10/mainproc.c:557
+#: g10/mainproc.c:549
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "Cipher IDEA tidak tersedia, secara optimis berusaha menggunakan %s\n"
 
-#: g10/mainproc.c:589
+#: g10/mainproc.c:581
 msgid "decryption okay\n"
 msgstr "dekripsi lancar\n"
 
-#: g10/mainproc.c:593
+#: g10/mainproc.c:585
 msgid "WARNING: message was not integrity protected\n"
 msgstr "PERINGATAN: integritas pesan tidak terlindungi\n"
 
-#: g10/mainproc.c:606
+#: g10/mainproc.c:598
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "PERINGATAN: pesan terenkripsi telah dimanipulasi!\n"
 
-#: g10/mainproc.c:612
+#: g10/mainproc.c:604
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "dekripsi gagal: %s\n"
 
-#: g10/mainproc.c:631
+#: g10/mainproc.c:623
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "CATATAN: pengirim meminta \"for-your-eyes-only\"\n"
 
-#: g10/mainproc.c:633
+#: g10/mainproc.c:625
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "original file name='%.*s'\n"
 
-#: g10/mainproc.c:822
+#: g10/mainproc.c:815
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "pembatalan mandiri - gunakan \"gpg --import\" untuk mengaplikasikan\n"
 
-#: g10/mainproc.c:1168
+#: g10/mainproc.c:1161
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Signature baik dari \""
 
-#: g10/mainproc.c:1418
+#: g10/mainproc.c:1419
 msgid "signature verification suppressed\n"
 msgstr "verifikasi signature tidak diabaikan\n"
 
-#: g10/mainproc.c:1460 g10/mainproc.c:1470
-msgid "can't handle these multiple signatures\n"
+#: g10/mainproc.c:1519
+#, fuzzy
+msgid "can't handle this ambiguous signature data\n"
 msgstr "tidak dapat menangani banyak signature ini\n"
 
-#: g10/mainproc.c:1480
+#: g10/mainproc.c:1530
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Signature kadaluwarsa %s\n"
 
-#: g10/mainproc.c:1481
+#: g10/mainproc.c:1531
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "              alias \""
 
-#: g10/mainproc.c:1485
+#: g10/mainproc.c:1535
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Signature membuat %.*s menggunakan kunci %s ID %08lX\n"
 
-#: g10/mainproc.c:1505
+#: g10/mainproc.c:1555
 msgid "Key available at: "
 msgstr "Kunci tersedia di:"
 
-#: g10/mainproc.c:1639 g10/mainproc.c:1687
+#: g10/mainproc.c:1688 g10/mainproc.c:1736
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "signature BURUK dari \""
 
-#: g10/mainproc.c:1641 g10/mainproc.c:1689
+#: g10/mainproc.c:1690 g10/mainproc.c:1738
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Signature kadaluarsa dari \""
 
-#: g10/mainproc.c:1643 g10/mainproc.c:1691
+#: g10/mainproc.c:1692 g10/mainproc.c:1740
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Signature baik dari \""
 
-#: g10/mainproc.c:1695
+#: g10/mainproc.c:1744
 msgid "[uncertain]"
 msgstr "[uncertain]"
 
-#: g10/mainproc.c:1727
+#: g10/mainproc.c:1776
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "              alias \""
 
-#: g10/mainproc.c:1824
+#: g10/mainproc.c:1873
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Signature kadaluwarsa %s\n"
 
-#: g10/mainproc.c:1829
+#: g10/mainproc.c:1878
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Signature kadaluarsa pada %s \n"
 
-#: g10/mainproc.c:1832
+#: g10/mainproc.c:1881
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s signature, algoritma digest %s\n"
 
-#: g10/mainproc.c:1833
+#: g10/mainproc.c:1882
 msgid "binary"
 msgstr "biner"
 
-#: g10/mainproc.c:1834
+#: g10/mainproc.c:1883
 msgid "textmode"
 msgstr "modeteks"
 
-#: g10/mainproc.c:1834 g10/trustdb.c:536
+#: g10/mainproc.c:1883 g10/trustdb.c:536
 msgid "unknown"
 msgstr "tidak dikenal"
 
-#: g10/mainproc.c:1854
+#: g10/mainproc.c:1903
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Tidak dapat memeriksa signature: %s\n"
 
-#: g10/mainproc.c:1922 g10/mainproc.c:1938 g10/mainproc.c:2024
+#: g10/mainproc.c:1972 g10/mainproc.c:1988 g10/mainproc.c:2074
 msgid "not a detached signature\n"
 msgstr "bukan detached signature\n"
 
-#: g10/mainproc.c:1965
+#: g10/mainproc.c:2015
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "PERINGATAN: multi signature terdeteksi. Hanya yang pertama akan diperiksa.\n"
 
-#: g10/mainproc.c:1973
+#: g10/mainproc.c:2023
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "kelas signature mandiri 0x%02x\n"
 
-#: g10/mainproc.c:2030
+#: g10/mainproc.c:2080
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signature model lama (PGP 2.X)\n"
 
-#: g10/mainproc.c:2040
+#: g10/mainproc.c:2090
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "terdeteksi root paket tidak valid dalam proc_tree()\n"
 
@@ -5296,23 +5303,23 @@ msgstr "data tidak disimpan; gunakan pilihan \"--output\" untuk menyimpannya\n"
 msgid "error creating `%s': %s\n"
 msgstr "kesalahan penciptaan : `%s': %s\n"
 
-#: g10/plaintext.c:447
+#: g10/plaintext.c:453
 msgid "Detached signature.\n"
 msgstr "Menghapus signature.\n"
 
-#: g10/plaintext.c:453
+#: g10/plaintext.c:459
 msgid "Please enter name of data file: "
 msgstr "Silakan masukkan nama file data: "
 
-#: g10/plaintext.c:485
+#: g10/plaintext.c:491
 msgid "reading stdin ...\n"
 msgstr "membaca stdin ...\n"
 
-#: g10/plaintext.c:519
+#: g10/plaintext.c:525
 msgid "no signed data\n"
 msgstr "tidak ada data tertandai\n"
 
-#: g10/plaintext.c:533
+#: g10/plaintext.c:539
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "tidak dapat membuka data tertandai `%s'\n"
diff --git a/po/it.po b/po/it.po
index 7b741147c..ff1f55f43 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.1.92\n"
 "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2006-02-14 15:28+0100\n"
+"POT-Creation-Date: 2006-03-07 11:29+0100\n"
 "PO-Revision-Date: 2004-06-16 17:01+0200\n"
 "Last-Translator: Marco d'Itri <md@linux.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -40,9 +40,9 @@ msgstr "scrittura della chiave segreta in `%s'\n"
 
 #: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:992 g10/gpg.c:3360 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:997 g10/gpg.c:3391 g10/import.c:193 g10/keygen.c:2274
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:476 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
+#: g10/plaintext.c:482 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
 #: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
@@ -77,7 +77,7 @@ msgstr "impossibile leggere `%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "nota: il file random_seed non � stato aggiornato\n"
 
-#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:991 g10/keygen.c:2753
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2753
 #: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
 #: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
 #, c-format
@@ -697,48 +697,48 @@ msgstr "scrittura della chiave segreta in `%s'\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando non valido  (prova \"help\")\n"
 
-#: g10/cardglue.c:435
+#: g10/cardglue.c:434
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:572
+#: g10/cardglue.c:573
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:580
+#: g10/cardglue.c:582
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:915
+#: g10/cardglue.c:917
 msgid "Enter New Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:916
+#: g10/cardglue.c:918
 msgid "Enter New PIN: "
 msgstr ""
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:919
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:920
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/cardglue.c:935
+#: g10/cardglue.c:937
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Ripeti la passphrase: "
 
-#: g10/cardglue.c:950
+#: g10/cardglue.c:952
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "passphrase non ripetuta correttamente; prova ancora"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3720 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3751 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -748,13 +748,13 @@ msgstr "impossibile aprire `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output non funziona con questo comando\n"
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1644
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1698
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "chiave `%s' non trovata: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1658
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1712
 #: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -874,12 +874,12 @@ msgstr "non 
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s cifrato per: \"%s\"\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:306
+#: g10/encr-data.c:67 g10/mainproc.c:293
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "dati cifrati con %s\n"
 
-#: g10/encr-data.c:69 g10/mainproc.c:310
+#: g10/encr-data.c:69 g10/mainproc.c:297
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrato con l'algoritmo sconosciuto %d\n"
@@ -1024,7 +1024,7 @@ msgstr "ATTENZIONE: la chiave segreta %08lX non ha un checksum SK semplice\n"
 msgid "WARNING: nothing exported\n"
 msgstr "ATTENZIONE: non � stato esportato nulla\n"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:373
 msgid ""
 "@Commands:\n"
 " "
@@ -1032,128 +1032,128 @@ msgstr ""
 "@Comandi:\n"
 " "
 
-#: g10/gpg.c:374
+#: g10/gpg.c:375
 msgid "|[file]|make a signature"
 msgstr "|[file]|fai una firma"
 
-#: g10/gpg.c:375
+#: g10/gpg.c:376
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|fai una firma mantenendo il testo in chiaro"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:377
 msgid "make a detached signature"
 msgstr "fai una firma separata"
 
-#: g10/gpg.c:377
+#: g10/gpg.c:378
 msgid "encrypt data"
 msgstr "cifra dati"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:380
 msgid "encryption only with symmetric cipher"
 msgstr "cifra solo con un cifrario simmetrico"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:382
 msgid "decrypt data (default)"
 msgstr "decifra dati (predefinito)"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:384
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:386
 msgid "list keys"
 msgstr "elenca le chiavi"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "list keys and signatures"
 msgstr "elenca le chiavi e le firme"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:389
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "controlla le firme delle chiavi"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:390
 msgid "list keys and fingerprints"
 msgstr "elenca le chiavi e le impronte digitali"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:391
 msgid "list secret keys"
 msgstr "elenca le chiavi segrete"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:392
 msgid "generate a new key pair"
 msgstr "genera una nuova coppia di chiavi"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:393
 msgid "remove keys from the public keyring"
 msgstr "rimuove le chiavi dal portachiavi pubblico"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:395
 msgid "remove keys from the secret keyring"
 msgstr "rimuove le chiavi dal portachiavi privato"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:396
 msgid "sign a key"
 msgstr "firma una chiave"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:397
 msgid "sign a key locally"
 msgstr "firma una chiave localmente"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:398
 msgid "sign or edit a key"
 msgstr "firma o modifica una chiave"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:399
 msgid "generate a revocation certificate"
 msgstr "genera un certificato di revoca"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:401
 msgid "export keys"
 msgstr "esporta delle chiavi"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:402
 msgid "export keys to a key server"
 msgstr "esporta le chiavi a un key server"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:403
 msgid "import keys from a key server"
 msgstr "importa le chiavi da un key server"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:405
 msgid "search for keys on a key server"
 msgstr "cerca delle chiavi su un key server"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:407
 msgid "update all keys from a keyserver"
 msgstr "aggiorna tutte le chiavi da un key server"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:411
 msgid "import/merge keys"
 msgstr "importa/aggiungi delle chiavi"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:414
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:414
+#: g10/gpg.c:415
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:415
+#: g10/gpg.c:416
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:423
+#: g10/gpg.c:424
 msgid "update the trust database"
 msgstr "aggiorna il database della fiducia"
 
-#: g10/gpg.c:430
+#: g10/gpg.c:431
 msgid "|algo [files]|print message digests"
 msgstr "|algo [files]|stampa tutti i message digests"
 
-#: g10/gpg.c:434 g10/gpgv.c:71
+#: g10/gpg.c:435 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1163,51 +1163,51 @@ msgstr ""
 "Opzioni:\n"
 " "
 
-#: g10/gpg.c:436
+#: g10/gpg.c:437
 msgid "create ascii armored output"
 msgstr "crea un output ascii con armatura"
 
-#: g10/gpg.c:438
+#: g10/gpg.c:439
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifra per NOME"
 
-#: g10/gpg.c:449
+#: g10/gpg.c:450
 msgid "use this user-id to sign or decrypt"
 msgstr "usa questo user-id per firmare o decifrare"
 
-#: g10/gpg.c:450
+#: g10/gpg.c:451
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|imposta il livello di compressione (0 disab.)"
 
-#: g10/gpg.c:455
+#: g10/gpg.c:456
 msgid "use canonical text mode"
 msgstr "usa il modo testo canonico"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:470
 msgid "use as output file"
 msgstr "usa come file di output"
 
-#: g10/gpg.c:471 g10/gpgv.c:73
+#: g10/gpg.c:472 g10/gpgv.c:73
 msgid "verbose"
 msgstr "prolisso"
 
-#: g10/gpg.c:482
+#: g10/gpg.c:483
 msgid "do not make any changes"
 msgstr "non fa cambiamenti"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:484
 msgid "prompt before overwriting"
 msgstr "chiede prima di sovrascrivere"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:525
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:553
+#: g10/gpg.c:554
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1215,7 +1215,7 @@ msgstr ""
 "@\n"
 "(Vedi la man page per una lista completa di tutti i comandi e opzioni)\n"
 
-#: g10/gpg.c:556
+#: g10/gpg.c:557
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1235,15 +1235,15 @@ msgstr ""
 " --list-keys [nomi]         mostra le chiavi\n"
 " --fingerprint [nomi]       mostra le impronte digitali\n"
 
-#: g10/gpg.c:746 g10/gpgv.c:98
+#: g10/gpg.c:751 g10/gpgv.c:98
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Per favore segnala i bug a <gnupg-bugs@gnu.org>.\n"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:768
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: g10/gpg.c:766
+#: g10/gpg.c:771
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1253,7 +1253,7 @@ msgstr ""
 "firma, controlla, cifra o decifra\n"
 "l'operazione predefinita dipende dai dati di input\n"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:782
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1261,557 +1261,566 @@ msgstr ""
 "\n"
 "Algoritmi gestiti:\n"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:785
 msgid "Pubkey: "
 msgstr "A chiave pubblica: "
 
-#: g10/gpg.c:786 g10/keyedit.c:2266
+#: g10/gpg.c:791 g10/keyedit.c:2266
 msgid "Cipher: "
 msgstr "Cifrari: "
 
-#: g10/gpg.c:792
+#: g10/gpg.c:797
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:798 g10/keyedit.c:2312
+#: g10/gpg.c:803 g10/keyedit.c:2312
 msgid "Compression: "
 msgstr "Compressione: "
 
-#: g10/gpg.c:881
+#: g10/gpg.c:886
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opzioni] "
 
-#: g10/gpg.c:1029
+#: g10/gpg.c:1034
 msgid "conflicting commands\n"
 msgstr "comandi in conflitto\n"
 
-#: g10/gpg.c:1047
+#: g10/gpg.c:1052
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "non � stato trovato il segno = nella definizione del gruppo \"%s\"\n"
 
-#: g10/gpg.c:1244
+#: g10/gpg.c:1249
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/gpg.c:1247
+#: g10/gpg.c:1252
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/gpg.c:1250
+#: g10/gpg.c:1255
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/gpg.c:1256
+#: g10/gpg.c:1261
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/gpg.c:1259
+#: g10/gpg.c:1264
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/gpg.c:1262
+#: g10/gpg.c:1267
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/gpg.c:1268
+#: g10/gpg.c:1273
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/gpg.c:1271
+#: g10/gpg.c:1276
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/gpg.c:1274
+#: g10/gpg.c:1279
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "ATTENZIONE: il proprietario \"%s\" di %s � insicuro\n"
 
-#: g10/gpg.c:1280
+#: g10/gpg.c:1285
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/gpg.c:1283
+#: g10/gpg.c:1288
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/gpg.c:1286
+#: g10/gpg.c:1291
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 
-#: g10/gpg.c:1427
+#: g10/gpg.c:1432
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "elemento della configurazione sconosciuto \"%s\"\n"
 
-#: g10/gpg.c:1521
+#: g10/gpg.c:1526
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1523
+#: g10/gpg.c:1528
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1525
+#: g10/gpg.c:1530
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
 
-#: g10/gpg.c:1527
+#: g10/gpg.c:1532
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1536
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1538
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "l'URL della politica di firma indicato non � valido\n"
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1540
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1542
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1544
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1546
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mostra in quali portachiavi sono contenute le chiavi elencate"
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1548
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
 
-#: g10/gpg.c:1874
+#: g10/gpg.c:1879
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr ""
 "NOTA: il vecchio file `%s' con le opzioni predefinite � stato ignorato\n"
 
-#: g10/gpg.c:1916
+#: g10/gpg.c:1921
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: manca il file `%s' con le opzioni predefinite\n"
 
-#: g10/gpg.c:1920
+#: g10/gpg.c:1925
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file con le opzioni `%s': %s\n"
 
-#: g10/gpg.c:1927
+#: g10/gpg.c:1932
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lettura delle opzioni da `%s'\n"
 
-#: g10/gpg.c:2142 g10/gpg.c:2716 g10/gpg.c:2735
+#: g10/gpg.c:2147 g10/gpg.c:2747 g10/gpg.c:2766
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s normalmente non deve essere usato!\n"
 
-#: g10/gpg.c:2158
+#: g10/gpg.c:2163
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "l'estensione crittografica \"%s\" non � stata caricata a causa dei\n"
 "permessi insicuri.\n"
 
-#: g10/gpg.c:2312 g10/gpg.c:2324
+#: g10/gpg.c:2317 g10/gpg.c:2329
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2400
+#: g10/gpg.c:2405
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2422 g10/keyedit.c:3997
+#: g10/gpg.c:2429 g10/keyedit.c:3997
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "impossibile fare il parsing dell'URI del keyserver\n"
 
-#: g10/gpg.c:2428
+#: g10/gpg.c:2441
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2431
+#: g10/gpg.c:2444
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2438
+#: g10/gpg.c:2451
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opzioni di importazione non valide\n"
 
-#: g10/gpg.c:2441
+#: g10/gpg.c:2454
 msgid "invalid import options\n"
 msgstr "opzioni di importazione non valide\n"
 
-#: g10/gpg.c:2448
+#: g10/gpg.c:2461
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2464
 msgid "invalid export options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2458
+#: g10/gpg.c:2471
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opzioni di importazione non valide\n"
 
-#: g10/gpg.c:2461
+#: g10/gpg.c:2474
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opzioni di importazione non valide\n"
 
-#: g10/gpg.c:2469
+#: g10/gpg.c:2482
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2471
+#: g10/gpg.c:2484
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2473
+#: g10/gpg.c:2486
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2475
+#: g10/gpg.c:2488
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2479
+#: g10/gpg.c:2492
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2481
+#: g10/gpg.c:2494
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "l'URL della politica di firma indicato non � valido\n"
 
-#: g10/gpg.c:2483
+#: g10/gpg.c:2496
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2485
+#: g10/gpg.c:2498
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2505
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2495
+#: g10/gpg.c:2508
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2502
+#: g10/gpg.c:2515
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "impossibile impostare exec-path a %s\n"
 
-#: g10/gpg.c:2705
+#: g10/gpg.c:2665
+#, fuzzy, c-format
+msgid "%s:%d: invalid auto-key-locate list\n"
+msgstr "%s:%d: opzioni di esportazione non valide\n"
+
+#: g10/gpg.c:2668
+msgid "invalid auto-key-locate list\n"
+msgstr ""
+
+#: g10/gpg.c:2736
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENZIONE: il programma potrebbe creare un file core!\n"
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2740
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ATTENZIONE: %s ha la precedenza su %s\n"
 
-#: g10/gpg.c:2718
+#: g10/gpg.c:2749
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Non � permesso usare %s con %s!\n"
 
-#: g10/gpg.c:2721
+#: g10/gpg.c:2752
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "Non ha senso usare %s con %s!\n"
 
-#: g10/gpg.c:2728
+#: g10/gpg.c:2759
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "gpg-agent non � disponibile in questa sessione\n"
 
-#: g10/gpg.c:2743
+#: g10/gpg.c:2774
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/gpg.c:2757
+#: g10/gpg.c:2788
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "nella modalit� --pgp2 puoi fare solo firme in chiaro o separate\n"
 
-#: g10/gpg.c:2763
+#: g10/gpg.c:2794
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "nella modalit� --pgp2 non puoi firmare e cifrare contemporaneamente\n"
 
-#: g10/gpg.c:2769
+#: g10/gpg.c:2800
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "devi usare dei file (e non una pipe) quando lavori con --pgp2 attivo.\n"
 
-#: g10/gpg.c:2782
+#: g10/gpg.c:2813
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "nella modalit� --pgp2 � richiesto il cifrario IDEA per cifrare un messaggio\n"
 
-#: g10/gpg.c:2849 g10/gpg.c:2873
+#: g10/gpg.c:2880 g10/gpg.c:2904
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non � valido\n"
 
-#: g10/gpg.c:2855 g10/gpg.c:2879
+#: g10/gpg.c:2886 g10/gpg.c:2910
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non � valido\n"
 
-#: g10/gpg.c:2861
+#: g10/gpg.c:2892
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non � valido\n"
 
-#: g10/gpg.c:2867
+#: g10/gpg.c:2898
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non � valido\n"
 
-#: g10/gpg.c:2882
+#: g10/gpg.c:2913
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve essere maggiore di 0\n"
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2915
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve essere maggiore di 1\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2917
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth deve essere tra 1 e 255\n"
 
-#: g10/gpg.c:2888
+#: g10/gpg.c:2919
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-cert-level non valido; deve essere 0, 1, 2 o 3\n"
 
-#: g10/gpg.c:2890
+#: g10/gpg.c:2921
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "min-cert-level non valido; deve essere 1, 2 o 3\n"
 
-#: g10/gpg.c:2893
+#: g10/gpg.c:2924
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: l'uso del modo S2K semplice (0) � fortemente scoraggiato\n"
 
-#: g10/gpg.c:2897
+#: g10/gpg.c:2928
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K non valido; deve essere 0, 1 o 3\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2935
 msgid "invalid default preferences\n"
 msgstr "preferenze predefinite non valide\n"
 
-#: g10/gpg.c:2913
+#: g10/gpg.c:2944
 msgid "invalid personal cipher preferences\n"
 msgstr "preferenze personali del cifrario non valide\n"
 
-#: g10/gpg.c:2917
+#: g10/gpg.c:2948
 msgid "invalid personal digest preferences\n"
 msgstr "preferenze personali del digest non valide\n"
 
-#: g10/gpg.c:2921
+#: g10/gpg.c:2952
 msgid "invalid personal compress preferences\n"
 msgstr "preferenze personali di compressione non valide\n"
 
-#: g10/gpg.c:2954
+#: g10/gpg.c:2985
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s non funziona ancora con %s\n"
 
-#: g10/gpg.c:3001
+#: g10/gpg.c:3032
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "non � possibile usare l'algoritmo di cifratura \"%s\" in modalit� %s\n"
 
-#: g10/gpg.c:3006
+#: g10/gpg.c:3037
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "non � possibile usare l'algoritmo di digest \"%s\" in modalit� %s\n"
 
-#: g10/gpg.c:3011
+#: g10/gpg.c:3042
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "non � possibile usare l'algoritmo di compressione \"%s\" in modalit� %s\n"
 
-#: g10/gpg.c:3107
+#: g10/gpg.c:3138
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: g10/gpg.c:3118
+#: g10/gpg.c:3149
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "ATTENZIONE: sono stati indicati dei destinatari (-r) senza usare la\n"
 "crittografia a chiave pubblica\n"
 
-#: g10/gpg.c:3129
+#: g10/gpg.c:3160
 msgid "--store [filename]"
 msgstr "--store [nomefile]"
 
-#: g10/gpg.c:3136
+#: g10/gpg.c:3167
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nomefile]"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3169
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "decifratura fallita: %s\n"
 
-#: g10/gpg.c:3148
+#: g10/gpg.c:3179
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nomefile]"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3192
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3194
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3166
+#: g10/gpg.c:3197
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "non � possibile usare %s in modalit� %s\n"
 
-#: g10/gpg.c:3184
+#: g10/gpg.c:3215
 msgid "--sign [filename]"
 msgstr "--sign [nomefile]"
 
-#: g10/gpg.c:3197
+#: g10/gpg.c:3228
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/gpg.c:3212
+#: g10/gpg.c:3243
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/gpg.c:3214
+#: g10/gpg.c:3245
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3217
+#: g10/gpg.c:3248
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "non � possibile usare %s in modalit� %s\n"
 
-#: g10/gpg.c:3237
+#: g10/gpg.c:3268
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nomefile]"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3277
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nomefile]"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3302
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nomefile]"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3310
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3283
+#: g10/gpg.c:3314
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3335
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [comandi]"
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3406
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [portachiavi]"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3443
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "invio al keyserver fallito: %s\n"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3445
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "ricezione dal keyserver fallita: %s\n"
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3447
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "esportazione della chiave fallita: %s\n"
 
-#: g10/gpg.c:3427
+#: g10/gpg.c:3458
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "ricerca nel keyserver fallita: %s\n"
 
-#: g10/gpg.c:3437
+#: g10/gpg.c:3468
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "aggiornamento del keyserver fallito: %s\n"
 
-#: g10/gpg.c:3488
+#: g10/gpg.c:3519
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "rimozione dell'armatura fallita: %s\n"
 
-#: g10/gpg.c:3496
+#: g10/gpg.c:3527
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creazione dell'armatura fallita: %s\n"
 
-#: g10/gpg.c:3583
+#: g10/gpg.c:3614
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo di hash non valido `%s'\n"
 
-#: g10/gpg.c:3706
+#: g10/gpg.c:3737
 msgid "[filename]"
 msgstr "[nomefile]"
 
-#: g10/gpg.c:3710
+#: g10/gpg.c:3741
 msgid "Go ahead and type your message ...\n"
 msgstr "Vai avanti e scrivi il messaggio...\n"
 
-#: g10/gpg.c:4000
+#: g10/gpg.c:4031
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1819,28 +1828,28 @@ msgstr ""
 "il nome di una nota deve essere formato solo da caratteri stampabili o\n"
 "spazi e terminare con un '='\n"
 
-#: g10/gpg.c:4008
+#: g10/gpg.c:4039
 msgid "a user notation name must contain the '@' character\n"
 msgstr "il valore di una nota dell'utente deve contenere il carattere '@'\n"
 
-#: g10/gpg.c:4013
+#: g10/gpg.c:4044
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "il valore di una nota dell'utente deve contenere il carattere '@'\n"
 
-#: g10/gpg.c:4024
+#: g10/gpg.c:4055
 msgid "a notation value must not use any control characters\n"
 msgstr "il valore di una nota non deve usare caratteri di controllo\n"
 
-#: g10/gpg.c:4058
+#: g10/gpg.c:4089
 msgid "the given certification policy URL is invalid\n"
 msgstr "l'URL della politica di certificazione indicato non � valido\n"
 
-#: g10/gpg.c:4060
+#: g10/gpg.c:4091
 msgid "the given signature policy URL is invalid\n"
 msgstr "l'URL della politica di firma indicato non � valido\n"
 
-#: g10/gpg.c:4093
+#: g10/gpg.c:4124
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "l'URL della politica di firma indicato non � valido\n"
@@ -1849,33 +1858,34 @@ msgstr "l'URL della politica di firma indicato non 
 msgid "too many entries in pk cache - disabled\n"
 msgstr "troppe voci nella pk cache - disabilitata\n"
 
-#: g10/getkey.c:188 g10/getkey.c:2845
+#: g10/getkey.c:188 g10/getkey.c:2876
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[User ID non trovato]"
 
-#: g10/getkey.c:931 g10/getkey.c:953 g10/getkey.c:976
+#: g10/getkey.c:933 g10/getkey.c:950 g10/getkey.c:970 g10/getkey.c:986
+#: g10/getkey.c:1001
 #, c-format
 msgid "Automatically retrieved `%s' via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1769
+#: g10/getkey.c:1800
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Chiave %08lX non valida resa valida da --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2323
+#: g10/getkey.c:2354
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 "manca una subchiave segreta per la subchiave pubblica %08lX - ignorata\n"
 
-#: g10/getkey.c:2554
+#: g10/getkey.c:2585
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "uso la chiave secondaria %08lX invece della chiave primaria %08lX\n"
 
-#: g10/getkey.c:2601
+#: g10/getkey.c:2632
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "chiave %08lX: chiave segreta senza chiave pubblica - saltata\n"
@@ -3456,12 +3466,12 @@ msgid "(sensitive)"
 msgstr " (sensibile)"
 
 #: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
-#: g10/keylist.c:194 g10/keyserver.c:471
+#: g10/keylist.c:194 g10/keyserver.c:525
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "impossibile creare %s: %s\n"
 
-#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:967
+#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:960
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revocata]"
@@ -3473,7 +3483,7 @@ msgstr "[scadenza: %s]"
 
 #: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
 #: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:477 g10/mainproc.c:973
+#: g10/keylist.c:914 g10/keyserver.c:531 g10/mainproc.c:966
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "[scadenza: %s]"
@@ -3510,14 +3520,14 @@ msgstr ""
 "corretta\n"
 "finch� non eseguirai di nuovo il programma.\n"
 
-#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:481
-#: g10/mainproc.c:1734 g10/trustdb.c:1184 g10/trustdb.c:1704
+#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:535
+#: g10/mainproc.c:1783 g10/trustdb.c:1184 g10/trustdb.c:1704
 #, fuzzy
 msgid "revoked"
 msgstr "[revocata]"
 
-#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:485
-#: g10/mainproc.c:1736 g10/trustdb.c:537 g10/trustdb.c:1706
+#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:539
+#: g10/mainproc.c:1785 g10/trustdb.c:537 g10/trustdb.c:1706
 #, fuzzy
 msgid "expired"
 msgstr "expire"
@@ -4369,92 +4379,88 @@ msgstr "%s: portachiavi creato\n"
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:77
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:81
+#: g10/keyserver.c:79
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:83
+#: g10/keyserver.c:81
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:87
+#: g10/keyserver.c:85
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:89
-msgid "automatically retrieve keys from PKA records"
-msgstr ""
-
-#: g10/keyserver.c:91
-msgid "automatically retrieve keys from DNS"
-msgstr ""
-
-#: g10/keyserver.c:95
+#: g10/keyserver.c:87
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "l'URL della politica di firma indicato non � valido\n"
 
-#: g10/keyserver.c:139
+#: g10/keyserver.c:89
+msgid "honor the PKA record set on a key when retrieving keys"
+msgstr ""
+
+#: g10/keyserver.c:154
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "ATTENZIONE: le opzioni in `%s' non sono ancora attive durante questa\n"
 "esecuzione del programma\n"
 
-#: g10/keyserver.c:483
+#: g10/keyserver.c:537
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:684
+#: g10/keyserver.c:738
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:767 g10/keyserver.c:1368
+#: g10/keyserver.c:821 g10/keyserver.c:1422
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/keyserver.c:865
+#: g10/keyserver.c:919
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "chiave `%s' non trovata: %s\n"
 
-#: g10/keyserver.c:867
+#: g10/keyserver.c:921
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "chiave `%s' non trovata: %s\n"
 
-#: g10/keyserver.c:1092
+#: g10/keyserver.c:1146
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "richiedo la chiave %08lX a %s\n"
 
-#: g10/keyserver.c:1096
+#: g10/keyserver.c:1150
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "richiedo la chiave %08lX a %s\n"
 
-#: g10/keyserver.c:1120
+#: g10/keyserver.c:1174
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "cerco \"%s\" sul server HKP %s\n"
 
-#: g10/keyserver.c:1123
+#: g10/keyserver.c:1177
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "cerco \"%s\" sul server HKP %s\n"
 
-#: g10/keyserver.c:1271
+#: g10/keyserver.c:1325
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "cerco \"%s\" sul server HKP %s\n"
 
-#: g10/keyserver.c:1275
+#: g10/keyserver.c:1329
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
@@ -4462,298 +4468,299 @@ msgstr ""
 "firmata con la tua chiave %08lX il %s\n"
 "\n"
 
-#: g10/keyserver.c:1318
+#: g10/keyserver.c:1372
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "cerco \"%s\" sul server HKP %s\n"
 
-#: g10/keyserver.c:1321
+#: g10/keyserver.c:1375
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "cerco \"%s\" sul server HKP %s\n"
 
-#: g10/keyserver.c:1328 g10/keyserver.c:1424
+#: g10/keyserver.c:1382 g10/keyserver.c:1478
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/keyserver.c:1376
+#: g10/keyserver.c:1430
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1439
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1446
+#: g10/keyserver.c:1500
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1452
+#: g10/keyserver.c:1506
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1464
+#: g10/keyserver.c:1518
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1469
+#: g10/keyserver.c:1523
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1477
+#: g10/keyserver.c:1531
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1484
+#: g10/keyserver.c:1538
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "errore del keyserver"
 
-#: g10/keyserver.c:1489
+#: g10/keyserver.c:1543
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "errore del keyserver"
 
-#: g10/keyserver.c:1498
+#: g10/keyserver.c:1552
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "ricezione dal keyserver fallita: %s\n"
 
-#: g10/keyserver.c:1523 g10/keyserver.c:1557
+#: g10/keyserver.c:1577 g10/keyserver.c:1611
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1814
+#: g10/keyserver.c:1868
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "ATTENZIONE: impossibile cancellare il file temporaneo (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1836
+#: g10/keyserver.c:1890
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "richiedo la chiave %08lX a %s\n"
 
-#: g10/keyserver.c:1838
+#: g10/keyserver.c:1892
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "richiedo la chiave %08lX a %s\n"
 
-#: g10/keyserver.c:1903
+#: g10/keyserver.c:1957
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "ATTENZIONE: impossibile cancellare il file temporaneo (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1909
+#: g10/keyserver.c:1963
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "ATTENZIONE: impossibile cancellare il file temporaneo (%s) `%s': %s\n"
 
-#: g10/mainproc.c:253
+#: g10/mainproc.c:240
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "la chiave di sessione cifrata ha dimensioni strane (%d)\n"
 
-#: g10/mainproc.c:304
+#: g10/mainproc.c:291
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "chiave di sessione cifrata con %s\n"
 
-#: g10/mainproc.c:314
+#: g10/mainproc.c:301
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "cifrato con l'algoritmo sconosciuto %d\n"
 
-#: g10/mainproc.c:395
+#: g10/mainproc.c:382
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "la chiave pubblica � %08lX\n"
 
-#: g10/mainproc.c:450
+#: g10/mainproc.c:439
 msgid "public key encrypted data: good DEK\n"
 msgstr "dati cifrati con la chiave pubblica: DEK corretto\n"
 
-#: g10/mainproc.c:483
+#: g10/mainproc.c:472
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "cifrato con la chiave %2$s di %1$u bit, ID %3$08lX, creata il %4$s\n"
 
-#: g10/mainproc.c:487 g10/pkclist.c:219
+#: g10/mainproc.c:476 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                alias \""
 
-#: g10/mainproc.c:491
+#: g10/mainproc.c:480
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "Cifrato con la chiave %s con ID %08lX\n"
 
-#: g10/mainproc.c:505
+#: g10/mainproc.c:494
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "decifratura della chiave pubblica fallita: %s\n"
 
-#: g10/mainproc.c:519
+#: g10/mainproc.c:508
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "cifratto con %lu passphrase\n"
 
-#: g10/mainproc.c:521
+#: g10/mainproc.c:510
 msgid "encrypted with 1 passphrase\n"
 msgstr "cifratto con 1 passphrase\n"
 
-#: g10/mainproc.c:549 g10/mainproc.c:571
+#: g10/mainproc.c:541 g10/mainproc.c:563
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "suppongo che i dati siano cifrati con %s\n"
 
-#: g10/mainproc.c:557
+#: g10/mainproc.c:549
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "Cifrario IDEA non disponibile, ottimisticamente cerco di usare %s\n"
 
-#: g10/mainproc.c:589
+#: g10/mainproc.c:581
 msgid "decryption okay\n"
 msgstr "decifratura corretta\n"
 
-#: g10/mainproc.c:593
+#: g10/mainproc.c:585
 msgid "WARNING: message was not integrity protected\n"
 msgstr "ATTENZIONE: l'integrit� del messaggio non era protetta\n"
 
-#: g10/mainproc.c:606
+#: g10/mainproc.c:598
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ATTENZIONE: il messaggio cifrato � stato manipolato!\n"
 
-#: g10/mainproc.c:612
+#: g10/mainproc.c:604
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decifratura fallita: %s\n"
 
-#: g10/mainproc.c:631
+#: g10/mainproc.c:623
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: il mittente ha richiesto \"solo-per-i-tuoi-occhi\"\n"
 
-#: g10/mainproc.c:633
+#: g10/mainproc.c:625
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome del file originale='%.*s'\n"
 
-#: g10/mainproc.c:822
+#: g10/mainproc.c:815
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revoca solitaria - usa \"gpg --import\" per applicarla\n"
 
-#: g10/mainproc.c:1168
+#: g10/mainproc.c:1161
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Firma valida da \""
 
-#: g10/mainproc.c:1418
+#: g10/mainproc.c:1419
 msgid "signature verification suppressed\n"
 msgstr "verifica della firma soppressa\n"
 
-#: g10/mainproc.c:1460 g10/mainproc.c:1470
-msgid "can't handle these multiple signatures\n"
+#: g10/mainproc.c:1519
+#, fuzzy
+msgid "can't handle this ambiguous signature data\n"
 msgstr "impossibile gestire queste firme multiple\n"
 
-#: g10/mainproc.c:1480
+#: g10/mainproc.c:1530
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Firma scaduta il %s\n"
 
-#: g10/mainproc.c:1481
+#: g10/mainproc.c:1531
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                alias \""
 
-#: g10/mainproc.c:1485
+#: g10/mainproc.c:1535
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Firma fatta %.*s usando %s con ID %08lX\n"
 
-#: g10/mainproc.c:1505
+#: g10/mainproc.c:1555
 msgid "Key available at: "
 msgstr "Chiave disponibile presso: "
 
-#: g10/mainproc.c:1639 g10/mainproc.c:1687
+#: g10/mainproc.c:1688 g10/mainproc.c:1736
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Firma NON corretta da \""
 
-#: g10/mainproc.c:1641 g10/mainproc.c:1689
+#: g10/mainproc.c:1690 g10/mainproc.c:1738
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Firma scaduta da \""
 
-#: g10/mainproc.c:1643 g10/mainproc.c:1691
+#: g10/mainproc.c:1692 g10/mainproc.c:1740
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Firma valida da \""
 
-#: g10/mainproc.c:1695
+#: g10/mainproc.c:1744
 msgid "[uncertain]"
 msgstr "[incerta]"
 
-#: g10/mainproc.c:1727
+#: g10/mainproc.c:1776
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                alias \""
 
-#: g10/mainproc.c:1824
+#: g10/mainproc.c:1873
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Firma scaduta il %s\n"
 
-#: g10/mainproc.c:1829
+#: g10/mainproc.c:1878
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Questa firma scadr� il %s\n"
 
-#: g10/mainproc.c:1832
+#: g10/mainproc.c:1881
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "Firma %s, algoritmo di digest %s\n"
 
-#: g10/mainproc.c:1833
+#: g10/mainproc.c:1882
 msgid "binary"
 msgstr "binario"
 
-#: g10/mainproc.c:1834
+#: g10/mainproc.c:1883
 msgid "textmode"
 msgstr "modo testo"
 
-#: g10/mainproc.c:1834 g10/trustdb.c:536
+#: g10/mainproc.c:1883 g10/trustdb.c:536
 msgid "unknown"
 msgstr "sconosciuto"
 
-#: g10/mainproc.c:1854
+#: g10/mainproc.c:1903
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Impossibile controllare la firma: %s\n"
 
-#: g10/mainproc.c:1922 g10/mainproc.c:1938 g10/mainproc.c:2024
+#: g10/mainproc.c:1972 g10/mainproc.c:1988 g10/mainproc.c:2074
 msgid "not a detached signature\n"
 msgstr "non � una firma separata\n"
 
-#: g10/mainproc.c:1965
+#: g10/mainproc.c:2015
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "ATTENZIONE: trovate firme multiple. Sar� controllata solo la prima.\n"
 
-#: g10/mainproc.c:1973
+#: g10/mainproc.c:2023
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "firma solitaria di classe 0x%02x\n"
 
-#: g10/mainproc.c:2030
+#: g10/mainproc.c:2080
 msgid "old style (PGP 2.x) signature\n"
 msgstr "firma vecchio stile (PGP 2.x)\n"
 
-#: g10/mainproc.c:2040
+#: g10/mainproc.c:2090
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "individuato un pacchetto radice non valido in proc_tree()\n"
 
@@ -5327,23 +5334,23 @@ msgstr ""
 msgid "error creating `%s': %s\n"
 msgstr "errore creando `%s': %s\n"
 
-#: g10/plaintext.c:447
+#: g10/plaintext.c:453
 msgid "Detached signature.\n"
 msgstr "Firma separata.\n"
 
-#: g10/plaintext.c:453
+#: g10/plaintext.c:459
 msgid "Please enter name of data file: "
 msgstr "Inserisci il nome del file di dati: "
 
-#: g10/plaintext.c:485
+#: g10/plaintext.c:491
 msgid "reading stdin ...\n"
 msgstr "viene letto stdin...\n"
 
-#: g10/plaintext.c:519
+#: g10/plaintext.c:525
 msgid "no signed data\n"
 msgstr "non ci sono dati firmati\n"
 
-#: g10/plaintext.c:533
+#: g10/plaintext.c:539
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "impossibile aprire i dati firmati `%s'\n"
diff --git a/po/ja.po b/po/ja.po
index c97efcc49..c8f953877 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.3.92\n"
 "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2006-02-14 15:28+0100\n"
+"POT-Creation-Date: 2006-03-07 11:29+0100\n"
 "PO-Revision-Date: 2004-11-23 11:14+0900\n"
 "Last-Translator: IIDA Yosiaki <iida@gnu.org>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
@@ -43,9 +43,9 @@ msgstr "
 
 #: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:992 g10/gpg.c:3360 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:997 g10/gpg.c:3391 g10/import.c:193 g10/keygen.c:2274
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:476 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
+#: g10/plaintext.c:482 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
 #: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
@@ -79,7 +79,7 @@ msgstr "
 msgid "note: random_seed file not updated\n"
 msgstr "����: random_seed �ե�����ι����򤷤ޤ���\n"
 
-#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:991 g10/keygen.c:2753
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2753
 #: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
 #: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
 #, c-format
@@ -664,11 +664,11 @@ msgstr "
 msgid "Invalid command  (try \"help\")\n"
 msgstr "̵���ʥ��ޥ�� (��help�ɤ򻲾�)\n"
 
-#: g10/cardglue.c:435
+#: g10/cardglue.c:434
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr "�����ɤ�������return���ǤĤ���'c'�Ǽ�ä�: "
 
-#: g10/cardglue.c:572
+#: g10/cardglue.c:573
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
@@ -677,37 +677,37 @@ msgstr ""
 "���Υ����ɤ�ȴ�����������֤Τ��������Ƥ�������:\n"
 "   %.*s\n"
 
-#: g10/cardglue.c:580
+#: g10/cardglue.c:582
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr "�Ѱդ���return���ǤĤ���'c'�Ǽ�ä�: "
 
-#: g10/cardglue.c:915
+#: g10/cardglue.c:917
 #, fuzzy
 msgid "Enter New Admin PIN: "
 msgstr "Admin PIN������: "
 
-#: g10/cardglue.c:916
+#: g10/cardglue.c:918
 #, fuzzy
 msgid "Enter New PIN: "
 msgstr "PIN������: "
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:919
 msgid "Enter Admin PIN: "
 msgstr "Admin PIN������: "
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:920
 msgid "Enter PIN: "
 msgstr "PIN������: "
 
-#: g10/cardglue.c:935
+#: g10/cardglue.c:937
 msgid "Repeat this PIN: "
 msgstr "PIN�������: "
 
-#: g10/cardglue.c:950
+#: g10/cardglue.c:952
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN������ȷ����֤��Ƥ��ޤ��󡣺����Ϥ��Ƥ�������"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3720 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3751 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -717,13 +717,13 @@ msgstr "
 msgid "--output doesn't work for this command\n"
 msgstr "���Υ��ޥ�ɤ�--output�ϵ�ǽ���ޤ���\n"
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1644
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1698
 #: g10/revoke.c:228
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "����%s�ɤ����Ĥ���ޤ���: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1658
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1712
 #: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -829,12 +829,12 @@ msgstr "%s
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s�Ź沽 ������:��%s��\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:306
+#: g10/encr-data.c:67 g10/mainproc.c:293
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s�Ź沽�Ѥߥǡ���\n"
 
-#: g10/encr-data.c:69 g10/mainproc.c:310
+#: g10/encr-data.c:69 g10/mainproc.c:297
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "̤�ΤΥ��르�ꥺ��%d�ˤ��Ź沽\n"
@@ -972,7 +972,7 @@ msgstr "
 msgid "WARNING: nothing exported\n"
 msgstr "�ٹ�: ����񤭽Ф��Ƥ��ޤ���\n"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:373
 msgid ""
 "@Commands:\n"
 " "
@@ -980,127 +980,127 @@ msgstr ""
 "@���ޥ��:\n"
 " "
 
-#: g10/gpg.c:374
+#: g10/gpg.c:375
 msgid "|[file]|make a signature"
 msgstr "|[�ե�����]|��̾�����"
 
-#: g10/gpg.c:375
+#: g10/gpg.c:376
 msgid "|[file]|make a clear text signature"
 msgstr "|[�ե�����]|���ꥢ��̾�����"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:377
 msgid "make a detached signature"
 msgstr "ʬΥ��̾�����"
 
-#: g10/gpg.c:377
+#: g10/gpg.c:378
 msgid "encrypt data"
 msgstr "�ǡ�����Ź沽"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:380
 msgid "encryption only with symmetric cipher"
 msgstr "�Ź沽�ˤ��оΰŹ�ˡ�Τߤ����"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:382
 msgid "decrypt data (default)"
 msgstr "�ǡ��������� (����)"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:384
 msgid "verify a signature"
 msgstr "��̾�򸡾�"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:386
 msgid "list keys"
 msgstr "�����"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "list keys and signatures"
 msgstr "���Ƚ�̾�ΰ���"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:389
 msgid "list and check key signatures"
 msgstr "����̾�θ����Ȱ���"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:390
 msgid "list keys and fingerprints"
 msgstr "���Ȼ���ΰ���"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:391
 msgid "list secret keys"
 msgstr "��̩���ΰ���"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:392
 msgid "generate a new key pair"
 msgstr "��������������"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:393
 msgid "remove keys from the public keyring"
 msgstr "�������ؤ��鸰������"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:395
 msgid "remove keys from the secret keyring"
 msgstr "��̩���ؤ��鸰������"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:396
 msgid "sign a key"
 msgstr "���˽�̾"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:397
 msgid "sign a key locally"
 msgstr "��������Ū�˽�̾"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:398
 msgid "sign or edit a key"
 msgstr "���ؤν�̾���Խ�"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:399
 msgid "generate a revocation certificate"
 msgstr "���������������"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:401
 msgid "export keys"
 msgstr "����񤭽Ф�"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:402
 msgid "export keys to a key server"
 msgstr "�������С��˸���񤭽Ф�"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:403
 msgid "import keys from a key server"
 msgstr "�������С����鸰���ɤ߹���"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:405
 msgid "search for keys on a key server"
 msgstr "�������С��θ��򸡺�����"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:407
 msgid "update all keys from a keyserver"
 msgstr "�������С����鸰��������������"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:411
 msgid "import/merge keys"
 msgstr "�����ɹ���/ʻ��"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:414
 msgid "print the card status"
 msgstr "�����ɾ��֤�ɽ��"
 
-#: g10/gpg.c:414
+#: g10/gpg.c:415
 msgid "change data on a card"
 msgstr "�����ɤΥǡ������ѹ�"
 
-#: g10/gpg.c:415
+#: g10/gpg.c:416
 msgid "change a card's PIN"
 msgstr "�����ɤ�PIN���ѹ�"
 
-#: g10/gpg.c:423
+#: g10/gpg.c:424
 msgid "update the trust database"
 msgstr "���ѥǡ����١����򹹿�"
 
-#: g10/gpg.c:430
+#: g10/gpg.c:431
 msgid "|algo [files]|print message digests"
 msgstr "|���르�ꥺ�� [�ե�����]|��å����������ɽ��"
 
-#: g10/gpg.c:434 g10/gpgv.c:71
+#: g10/gpg.c:435 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1110,55 +1110,55 @@ msgstr ""
 "���ץ����:\n"
 " "
 
-#: g10/gpg.c:436
+#: g10/gpg.c:437
 msgid "create ascii armored output"
 msgstr "ASCII���������������"
 
-#: g10/gpg.c:438
+#: g10/gpg.c:439
 msgid "|NAME|encrypt for NAME"
 msgstr "|̾��|��̾�����Ѥ˰Ź沽"
 
-#: g10/gpg.c:449
+#: g10/gpg.c:450
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "��̾������ˤ��Υ桼����id\n"
 "�����"
 
-#: g10/gpg.c:450
+#: g10/gpg.c:451
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|���̥�٥��N������\n"
 "(0���󰵽�)"
 
-#: g10/gpg.c:455
+#: g10/gpg.c:456
 msgid "use canonical text mode"
 msgstr "����ƥ����ȡ��⡼�ɤ����"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:470
 msgid "use as output file"
 msgstr "���ϥե�����Ȥ��ƻ���"
 
-#: g10/gpg.c:471 g10/gpgv.c:73
+#: g10/gpg.c:472 g10/gpgv.c:73
 msgid "verbose"
 msgstr "��Ĺ"
 
-#: g10/gpg.c:482
+#: g10/gpg.c:483
 msgid "do not make any changes"
 msgstr "̵�ѹ�"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:484
 msgid "prompt before overwriting"
 msgstr "������˳�ǧ"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:525
 msgid "use strict OpenPGP behavior"
 msgstr "��̩��OpenPGP�ο�������"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "generate PGP 2.x compatible messages"
 msgstr "PGP 2.x�ߴ��Υ�å�����������"
 
-#: g10/gpg.c:553
+#: g10/gpg.c:554
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1167,7 +1167,7 @@ msgstr ""
 "(���ޥ�ɤȥ��ץ���������ΰ����ϡ�\n"
 "�ޥ˥奢�롦�ڡ���������������)\n"
 
-#: g10/gpg.c:556
+#: g10/gpg.c:557
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1187,15 +1187,15 @@ msgstr ""
 " --list-keys [̾��]         ����ɽ��\n"
 " --fingerprint [̾��]       �����ɽ��\n"
 
-#: g10/gpg.c:746 g10/gpgv.c:98
+#: g10/gpg.c:751 g10/gpgv.c:98
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "�Х��򸫤Ĥ����� <gnupg-bugs@gnu.org> �ޤǤ���𤯤�������\n"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:768
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: g10/gpg.c:766
+#: g10/gpg.c:771
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1205,7 +1205,7 @@ msgstr ""
 "��̾���������Ź沽������\n"
 "��������ϡ����ϥǡ����˰�¸\n"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:782
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1213,569 +1213,578 @@ msgstr ""
 "\n"
 "���ݡ��Ȥ��Ƥ��륢�르�ꥺ��:\n"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:785
 msgid "Pubkey: "
 msgstr "������: "
 
-#: g10/gpg.c:786 g10/keyedit.c:2266
+#: g10/gpg.c:791 g10/keyedit.c:2266
 msgid "Cipher: "
 msgstr "�Ź�ˡ: "
 
-#: g10/gpg.c:792
+#: g10/gpg.c:797
 msgid "Hash: "
 msgstr "�ϥå���: "
 
-#: g10/gpg.c:798 g10/keyedit.c:2312
+#: g10/gpg.c:803 g10/keyedit.c:2312
 msgid "Compression: "
 msgstr "����: "
 
-#: g10/gpg.c:881
+#: g10/gpg.c:886
 msgid "usage: gpg [options] "
 msgstr "�Ȥ���: gpg [���ץ����] "
 
-#: g10/gpg.c:1029
+#: g10/gpg.c:1034
 msgid "conflicting commands\n"
 msgstr "��Ω���륳�ޥ��\n"
 
-#: g10/gpg.c:1047
+#: g10/gpg.c:1052
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "=���椬�����롼�������%s����˸��Ĥ���ޤ���\n"
 
-#: g10/gpg.c:1244
+#: g10/gpg.c:1249
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ���ͭ��\n"
 
-#: g10/gpg.c:1247
+#: g10/gpg.c:1252
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ���ͭ��\n"
 
-#: g10/gpg.c:1250
+#: g10/gpg.c:1255
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ���ͭ��\n"
 
-#: g10/gpg.c:1256
+#: g10/gpg.c:1261
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ�����\n"
 
-#: g10/gpg.c:1259
+#: g10/gpg.c:1264
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ�����\n"
 
-#: g10/gpg.c:1262
+#: g10/gpg.c:1267
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ�����\n"
 
-#: g10/gpg.c:1268
+#: g10/gpg.c:1273
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
 
-#: g10/gpg.c:1271
+#: g10/gpg.c:1276
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
 
-#: g10/gpg.c:1274
+#: g10/gpg.c:1279
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼��ͭ��\n"
 
-#: g10/gpg.c:1280
+#: g10/gpg.c:1285
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "�ٹ�: homedir ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
 
-#: g10/gpg.c:1283
+#: g10/gpg.c:1288
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "�ٹ�: �����ե������%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
 
-#: g10/gpg.c:1286
+#: g10/gpg.c:1291
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "�ٹ�: ��ĥ��%s�פΰ����Ǥʤ���̥ǥ��쥯�ȥ꡼����\n"
 
-#: g10/gpg.c:1427
+#: g10/gpg.c:1432
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "̤�Τι������ܡ�%s��\n"
 
-#: g10/gpg.c:1521
+#: g10/gpg.c:1526
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1523
+#: g10/gpg.c:1528
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1525
+#: g10/gpg.c:1530
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "��̩���ؤ��б������̾������ޤ���\n"
 
-#: g10/gpg.c:1527
+#: g10/gpg.c:1532
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1536
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1538
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "���ꤵ�줿�����������С�URL��̵���Ǥ�\n"
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1540
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1542
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1544
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1546
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "��̩���ȸ������ΰ�����ȿž"
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1548
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "��̩���ؤ��б������̾������ޤ���\n"
 
-#: g10/gpg.c:1874
+#: g10/gpg.c:1879
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "����: �Ρ�������ä����ץ���󡦥ե������%s�פϡ�̵�뤵��ޤ�\n"
 
-#: g10/gpg.c:1916
+#: g10/gpg.c:1921
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "����: ����Υ��ץ���󡦥ե������%s�פ�����ޤ���\n"
 
-#: g10/gpg.c:1920
+#: g10/gpg.c:1925
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "���ץ���󡦥ե������%s��: %s\n"
 
-#: g10/gpg.c:1927
+#: g10/gpg.c:1932
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "��%s�פ��饪�ץ������ɤ߽Ф��ޤ�\n"
 
-#: g10/gpg.c:2142 g10/gpg.c:2716 g10/gpg.c:2735
+#: g10/gpg.c:2147 g10/gpg.c:2747 g10/gpg.c:2766
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "����: ����%s�ϻȤ��ޤ���!\n"
 
-#: g10/gpg.c:2158
+#: g10/gpg.c:2163
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "�����Ǥʤ����ĤΤ��ᡢ�Ź�ˡ��ĥ��%s�פ�����ɤ��ޤ���\n"
 
-#: g10/gpg.c:2312 g10/gpg.c:2324
+#: g10/gpg.c:2317 g10/gpg.c:2329
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2400
+#: g10/gpg.c:2405
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2422 g10/keyedit.c:3997
+#: g10/gpg.c:2429 g10/keyedit.c:3997
 msgid "could not parse keyserver URL\n"
 msgstr "�������С���URL�������ǽ\n"
 
-#: g10/gpg.c:2428
+#: g10/gpg.c:2441
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ̵���ʸ������С������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2431
+#: g10/gpg.c:2444
 msgid "invalid keyserver options\n"
 msgstr "̵���ʸ������С������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2438
+#: g10/gpg.c:2451
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ̵�����ɹ��ߥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2441
+#: g10/gpg.c:2454
 msgid "invalid import options\n"
 msgstr "̵�����ɹ��ߥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2448
+#: g10/gpg.c:2461
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ̵���ʽ�Ф����ץ����Ǥ�\n"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2464
 msgid "invalid export options\n"
 msgstr "̵���ʽ�Ф����ץ����Ǥ�\n"
 
-#: g10/gpg.c:2458
+#: g10/gpg.c:2471
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ̵���ʰ������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2461
+#: g10/gpg.c:2474
 msgid "invalid list options\n"
 msgstr "̵���ʰ������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2469
+#: g10/gpg.c:2482
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2471
+#: g10/gpg.c:2484
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2473
+#: g10/gpg.c:2486
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2475
+#: g10/gpg.c:2488
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2479
+#: g10/gpg.c:2492
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2481
+#: g10/gpg.c:2494
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "���ꤵ�줿�����������С�URL��̵���Ǥ�\n"
 
-#: g10/gpg.c:2483
+#: g10/gpg.c:2496
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2485
+#: g10/gpg.c:2498
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2505
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ̵���ʸ��ڥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2495
+#: g10/gpg.c:2508
 msgid "invalid verify options\n"
 msgstr "̵���ʸ��ڥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2502
+#: g10/gpg.c:2515
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-path��%s��������ǽ\n"
 
-#: g10/gpg.c:2705
+#: g10/gpg.c:2665
+#, fuzzy, c-format
+msgid "%s:%d: invalid auto-key-locate list\n"
+msgstr "%s:%d: ̵���ʸ��ڥ��ץ����Ǥ�\n"
+
+#: g10/gpg.c:2668
+msgid "invalid auto-key-locate list\n"
+msgstr ""
+
+#: g10/gpg.c:2736
 msgid "WARNING: program may create a core file!\n"
 msgstr "�ٹ�: �ץ������Υ������ե����뤬�Ǥ��뤳�Ȥ�����ޤ�!\n"
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2740
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "�ٹ�: %s��%s���ͥ��\n"
 
-#: g10/gpg.c:2718
+#: g10/gpg.c:2749
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s��%s�ȤȤ�˻Ȥ����ȤϤǤ��ޤ���!\n"
 
-#: g10/gpg.c:2721
+#: g10/gpg.c:2752
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s��%s�ȤȤ�˻ȤäƤ�̵��̣�Ǥ�!\n"
 
-#: g10/gpg.c:2728
+#: g10/gpg.c:2759
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "���Υ��å�����gpg-agent��̵���Ǥ�\n"
 
-#: g10/gpg.c:2743
+#: g10/gpg.c:2774
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "��%s�פ���̩�������֤�񤭹��ߤޤ�\n"
 
-#: g10/gpg.c:2757
+#: g10/gpg.c:2788
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤ�ʬΥ��̾�����ꥢ��̾���������Ǥ��ޤ���\n"
 
-#: g10/gpg.c:2763
+#: g10/gpg.c:2794
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤϽ�̾�ȰŹ沽��Ʊ���ˤǤ��ޤ���\n"
 
-#: g10/gpg.c:2769
+#: g10/gpg.c:2800
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "--pgp2����ꤷ���顢(�ѥ��פǤʤ�) �ե��������ꤻ�ͤФʤ�ޤ���\n"
 
-#: g10/gpg.c:2782
+#: g10/gpg.c:2813
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "--pgp2�⡼�ɤΥ�å������Ź沽�Ǥϡ�IDEA�Ź�ˡ��ɬ�פǤ�\n"
 
-#: g10/gpg.c:2849 g10/gpg.c:2873
+#: g10/gpg.c:2880 g10/gpg.c:2904
 msgid "selected cipher algorithm is invalid\n"
 msgstr "���򤵤줿�Ź楢�르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:2855 g10/gpg.c:2879
+#: g10/gpg.c:2886 g10/gpg.c:2910
 msgid "selected digest algorithm is invalid\n"
 msgstr "���򤵤줿���󥢥르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:2861
+#: g10/gpg.c:2892
 msgid "selected compression algorithm is invalid\n"
 msgstr "���򤵤줿���̥��르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:2867
+#: g10/gpg.c:2898
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "���򤵤줿���������󥢥르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:2882
+#: g10/gpg.c:2913
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed�������ͤ�ɬ�פǤ�\n"
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2915
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed��1����礭���ͤ�ɬ�פǤ�\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2917
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth��1����255���ϰϤǤʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:2888
+#: g10/gpg.c:2919
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "̵����default-cert-level��0��1��2��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:2890
+#: g10/gpg.c:2921
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "̵����min-cert-level��0��1��2��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:2893
+#: g10/gpg.c:2924
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "����: ñ���S2K�⡼��(0)�λ��Ѥˤ϶���ȿ�Ф��ޤ�\n"
 
-#: g10/gpg.c:2897
+#: g10/gpg.c:2928
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "̵����S2K�⡼�ɡ�0��1��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2935
 msgid "invalid default preferences\n"
 msgstr "̵���ʴ��������\n"
 
-#: g10/gpg.c:2913
+#: g10/gpg.c:2944
 msgid "invalid personal cipher preferences\n"
 msgstr "̵���ʸĿ��ѰŹ�ˡ������\n"
 
-#: g10/gpg.c:2917
+#: g10/gpg.c:2948
 msgid "invalid personal digest preferences\n"
 msgstr "̵���ʸĿ������������\n"
 
-#: g10/gpg.c:2921
+#: g10/gpg.c:2952
 msgid "invalid personal compress preferences\n"
 msgstr "̵���ʸĿ��Ѱ��̤�����\n"
 
-#: g10/gpg.c:2954
+#: g10/gpg.c:2985
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s��%s�ǵ�ǽ���ޤ���\n"
 
-#: g10/gpg.c:3001
+#: g10/gpg.c:3032
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "�Ź楢�르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3006
+#: g10/gpg.c:3037
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "���󥢥르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3011
+#: g10/gpg.c:3042
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "���̥��르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3107
+#: g10/gpg.c:3138
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "���ѥǡ����١����ν�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3118
+#: g10/gpg.c:3149
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "�ٹ�: �������Ź��Ȥ鷺�ˡ������ (-r) ����ꤷ�Ƥ��ޤ�\n"
 
-#: g10/gpg.c:3129
+#: g10/gpg.c:3160
 msgid "--store [filename]"
 msgstr "--store [�ե�����̾]"
 
-#: g10/gpg.c:3136
+#: g10/gpg.c:3167
 msgid "--symmetric [filename]"
 msgstr "--symmetric [�ե�����̾]"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3169
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "��%s�פ��оΰŹ�˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3148
+#: g10/gpg.c:3179
 msgid "--encrypt [filename]"
 msgstr "--encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3192
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3194
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "--symmetric --encrypt��--s2k-mode 0�ǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3166
+#: g10/gpg.c:3197
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "--symmetric --encrypt��%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3184
+#: g10/gpg.c:3215
 msgid "--sign [filename]"
 msgstr "--sign [�ե�����̾]"
 
-#: g10/gpg.c:3197
+#: g10/gpg.c:3228
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3212
+#: g10/gpg.c:3243
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3214
+#: g10/gpg.c:3245
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "--symmetric --sign --encrypt��--s2k-mode 0�ǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3217
+#: g10/gpg.c:3248
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "--symmetric --sign --encrypt��%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3237
+#: g10/gpg.c:3268
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [�ե�����̾]"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3277
 msgid "--clearsign [filename]"
 msgstr "--clearsign [�ե�����̾]"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3302
 msgid "--decrypt [filename]"
 msgstr "--decrypt [�ե�����̾]"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3310
 msgid "--sign-key user-id"
 msgstr "--sign-key �桼����id"
 
-#: g10/gpg.c:3283
+#: g10/gpg.c:3314
 msgid "--lsign-key user-id"
 msgstr "--lsign-key �桼����id"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3335
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key �桼����id [���ޥ��]"
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3406
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [�桼����id] [����]"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3443
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "�������С��ؤ������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3445
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "�������С�����μ����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3447
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "���ν�Ф��˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3427
+#: g10/gpg.c:3458
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "�������С��θ����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3437
+#: g10/gpg.c:3468
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "�������С��β����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3488
+#: g10/gpg.c:3519
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "��������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3496
+#: g10/gpg.c:3527
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3583
+#: g10/gpg.c:3614
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "̵���ʥϥå��塦���르�ꥺ���%s�פǤ�\n"
 
-#: g10/gpg.c:3706
+#: g10/gpg.c:3737
 msgid "[filename]"
 msgstr "[�ե�����̾]"
 
-#: g10/gpg.c:3710
+#: g10/gpg.c:3741
 msgid "Go ahead and type your message ...\n"
 msgstr "���Ϥ��ޤ�����å��������ǤäƤ������� ...\n"
 
-#: g10/gpg.c:4000
+#: g10/gpg.c:4031
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
 msgstr ""
 "����̾�ˤϰ�����ǽ��ʸ��������Τߤ�Ȥ���'='�ǽ����ʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:4008
+#: g10/gpg.c:4039
 msgid "a user notation name must contain the '@' character\n"
 msgstr "�桼��������̾�ϡ�'@'ʸ����ޤޤʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:4013
+#: g10/gpg.c:4044
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "�桼��������̾�ϡ�'@'ʸ����ޤޤʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:4024
+#: g10/gpg.c:4055
 msgid "a notation value must not use any control characters\n"
 msgstr "����̾���ͤ�����ʸ����ȤäƤϤ����ޤ���\n"
 
-#: g10/gpg.c:4058
+#: g10/gpg.c:4089
 msgid "the given certification policy URL is invalid\n"
 msgstr "��������줿������ݥꥷ��URL��̵���Ǥ�\n"
 
-#: g10/gpg.c:4060
+#: g10/gpg.c:4091
 msgid "the given signature policy URL is invalid\n"
 msgstr "��������줿��̾�ݥꥷ��URL��̵���Ǥ�\n"
 
-#: g10/gpg.c:4093
+#: g10/gpg.c:4124
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "���ꤵ�줿�����������С�URL��̵���Ǥ�\n"
 
@@ -1783,31 +1792,32 @@ msgstr "
 msgid "too many entries in pk cache - disabled\n"
 msgstr "pk����å���Υ���ȥ꡼��¿�����ޤ� - ���Ѷػ�\n"
 
-#: g10/getkey.c:188 g10/getkey.c:2845
+#: g10/getkey.c:188 g10/getkey.c:2876
 msgid "[User ID not found]"
 msgstr "[�桼����ID�����Ĥ���ޤ���]"
 
-#: g10/getkey.c:931 g10/getkey.c:953 g10/getkey.c:976
+#: g10/getkey.c:933 g10/getkey.c:950 g10/getkey.c:970 g10/getkey.c:986
+#: g10/getkey.c:1001
 #, c-format
 msgid "Automatically retrieved `%s' via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1769
+#: g10/getkey.c:1800
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "--allow-non-selfsigned-uid��ͭ���ˤ��줿̵���ʸ�%s�Ǥ�\n"
 
-#: g10/getkey.c:2323
+#: g10/getkey.c:2354
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "��������%s�ˤ���������̩����������ޤ��� - ̵��\n"
 
-#: g10/getkey.c:2554
+#: g10/getkey.c:2585
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "����%s��縰%s�����Ѥ��ޤ�\n"
 
-#: g10/getkey.c:2601
+#: g10/getkey.c:2632
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "��%s: �������Τʤ���̩���Ǥ� - �ȤФ��ޤ�\n"
@@ -3333,12 +3343,12 @@ msgid "(sensitive)"
 msgstr "(�ǥꥱ����)"
 
 #: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
-#: g10/keylist.c:194 g10/keyserver.c:471
+#: g10/keylist.c:194 g10/keyserver.c:525
 #, c-format
 msgid "created: %s"
 msgstr "����: %s"
 
-#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:967
+#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:960
 #, c-format
 msgid "revoked: %s"
 msgstr "����: %s"
@@ -3350,7 +3360,7 @@ msgstr "
 
 #: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
 #: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:477 g10/mainproc.c:973
+#: g10/keylist.c:914 g10/keyserver.c:531 g10/mainproc.c:966
 #, c-format
 msgid "expires: %s"
 msgstr "��λ: %s"
@@ -3386,13 +3396,13 @@ msgstr ""
 "�ץ�������Ƶ�ư����ޤǡ�ɽ�����줿����ͭ�������������ʤ����⤷��ʤ���\n"
 "�Ȥ������Ȥ�ǰƬ�ˤ����Ƥ���������\n"
 
-#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:481
-#: g10/mainproc.c:1734 g10/trustdb.c:1184 g10/trustdb.c:1704
+#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:535
+#: g10/mainproc.c:1783 g10/trustdb.c:1184 g10/trustdb.c:1704
 msgid "revoked"
 msgstr "����"
 
-#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:485
-#: g10/mainproc.c:1736 g10/trustdb.c:537 g10/trustdb.c:1706
+#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:539
+#: g10/mainproc.c:1785 g10/trustdb.c:537 g10/trustdb.c:1706
 msgid "expired"
 msgstr "��λ"
 
@@ -4210,382 +4220,379 @@ msgstr "%s: 
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:77
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:81
+#: g10/keyserver.c:79
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:83
+#: g10/keyserver.c:81
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:87
+#: g10/keyserver.c:85
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:89
-msgid "automatically retrieve keys from PKA records"
-msgstr ""
-
-#: g10/keyserver.c:91
-msgid "automatically retrieve keys from DNS"
-msgstr ""
-
-#: g10/keyserver.c:95
+#: g10/keyserver.c:87
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "�����������С�URL�����Ϥ��Ƥ�������: "
 
-#: g10/keyserver.c:139
+#: g10/keyserver.c:89
+msgid "honor the PKA record set on a key when retrieving keys"
+msgstr ""
+
+#: g10/keyserver.c:154
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "�ٹ�: �������С��Υ��ץ�����%s�פϡ����Υץ�åȥۡ���ǤϻȤ��ޤ���\n"
 
-#: g10/keyserver.c:483
+#: g10/keyserver.c:537
 msgid "disabled"
 msgstr "disabled"
 
-#: g10/keyserver.c:684
+#: g10/keyserver.c:738
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "�ֹ�(s)��N)�����ޤ���Q)��ߤ����Ϥ��Ƥ������� >"
 
-#: g10/keyserver.c:767 g10/keyserver.c:1368
+#: g10/keyserver.c:821 g10/keyserver.c:1422
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "̵���ʸ������С����ץ��ȥ���Ǥ� (us %d!=handler %d)\n"
 
-#: g10/keyserver.c:865
+#: g10/keyserver.c:919
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "����%s�ɤ��������С��˸��Ĥ���ޤ���\n"
 
-#: g10/keyserver.c:867
+#: g10/keyserver.c:921
 msgid "key not found on keyserver\n"
 msgstr "�����������С��˸��Ĥ���ޤ���\n"
 
-#: g10/keyserver.c:1092
+#: g10/keyserver.c:1146
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "��%s��%s���饵���С�%s���׵�\n"
 
-#: g10/keyserver.c:1096
+#: g10/keyserver.c:1150
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "��%s��%s���׵�\n"
 
-#: g10/keyserver.c:1120
+#: g10/keyserver.c:1174
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "��%s�ɤ�%s�����С�%s���鸡��\n"
 
-#: g10/keyserver.c:1123
+#: g10/keyserver.c:1177
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "��%s�ɤ򥵡��С�%s���鸡��\n"
 
-#: g10/keyserver.c:1271
+#: g10/keyserver.c:1325
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "��%s��%s������%s������\n"
 
-#: g10/keyserver.c:1275
+#: g10/keyserver.c:1329
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "��%s��%s������\n"
 
-#: g10/keyserver.c:1318
+#: g10/keyserver.c:1372
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "��%s�ɤ�%s�����С�%s���鸡��\n"
 
-#: g10/keyserver.c:1321
+#: g10/keyserver.c:1375
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "��%s�ɤ򥵡��С�%s���鸡��\n"
 
-#: g10/keyserver.c:1328 g10/keyserver.c:1424
+#: g10/keyserver.c:1382 g10/keyserver.c:1478
 msgid "no keyserver action!\n"
 msgstr "�������С�����������󤬤���ޤ���!\n"
 
-#: g10/keyserver.c:1376
+#: g10/keyserver.c:1430
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "�ٹ�: ���� (%s) ��GnuPG�θ������С����ϥ�ɥ�\n"
 
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1439
 msgid "keyserver did not send VERSION\n"
 msgstr "�������С���VERSION���������ޤ���Ǥ���\n"
 
-#: g10/keyserver.c:1446
+#: g10/keyserver.c:1500
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "���Τθ������С�������ޤ��� (���ץ����--keyserver��Ȥ��ޤ��礦)\n"
 
-#: g10/keyserver.c:1452
+#: g10/keyserver.c:1506
 msgid "external keyserver calls are not supported in this build\n"
 msgstr "���ι��ۤǤϡ������������С��θƽФ��ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 
-#: g10/keyserver.c:1464
+#: g10/keyserver.c:1518
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "�������С������������%s���ѤΥϥ�ɥ餬����ޤ���\n"
 
-#: g10/keyserver.c:1469
+#: g10/keyserver.c:1523
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "����%s�פϡ��������С������������%s�פǥ��ݡ��Ȥ���Ƥ��ޤ���\n"
 
-#: g10/keyserver.c:1477
+#: g10/keyserver.c:1531
 #, fuzzy, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "gpgkeys_%s�ϡ��ϥ�ɥ�%d�Ǥ򥵥ݡ��Ȥ��ޤ���\n"
 
-#: g10/keyserver.c:1484
+#: g10/keyserver.c:1538
 msgid "keyserver timed out\n"
 msgstr "�������С��Υ����ॢ����\n"
 
-#: g10/keyserver.c:1489
+#: g10/keyserver.c:1543
 msgid "keyserver internal error\n"
 msgstr "�������С����������顼\n"
 
-#: g10/keyserver.c:1498
+#: g10/keyserver.c:1552
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "�������С��̿����顼: %s\n"
 
-#: g10/keyserver.c:1523 g10/keyserver.c:1557
+#: g10/keyserver.c:1577 g10/keyserver.c:1611
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "��%s�ɸ�ID�ǤϤ���ޤ���: �ȤФ��ޤ�\n"
 
-#: g10/keyserver.c:1814
+#: g10/keyserver.c:1868
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "�ٹ�: ��%s��%s��ͳ�Dz����Ǥ��ޤ���: %s\n"
 
-#: g10/keyserver.c:1836
+#: g10/keyserver.c:1890
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "1�ܤθ���%s�������\n"
 
-#: g10/keyserver.c:1838
+#: g10/keyserver.c:1892
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "%d�ܤθ���%s�������\n"
 
-#: g10/keyserver.c:1903
+#: g10/keyserver.c:1957
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "�ٹ�: ��%s��%s��ͳ�Dz����Ǥ��ޤ���: %s\n"
 
-#: g10/keyserver.c:1909
+#: g10/keyserver.c:1963
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "�ٹ�: ��%s��%s��ͳ�Dz����Ǥ��ޤ���: %s\n"
 
-#: g10/mainproc.c:253
+#: g10/mainproc.c:240
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "�Ѥ�Ĺ���ΰŹ沽�Ѥߥ��å���� (%d)\n"
 
-#: g10/mainproc.c:304
+#: g10/mainproc.c:291
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s �Ź沽�Ѥߥ��å����\n"
 
-#: g10/mainproc.c:314
+#: g10/mainproc.c:301
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "̤�Τ����󥢥르�ꥺ����������줿�ѥ��ե졼�� %d\n"
 
-#: g10/mainproc.c:395
+#: g10/mainproc.c:382
 #, c-format
 msgid "public key is %s\n"
 msgstr "��������%s�Ǥ�\n"
 
-#: g10/mainproc.c:450
+#: g10/mainproc.c:439
 msgid "public key encrypted data: good DEK\n"
 msgstr "�������ˤ��Ź沽�Ѥߥǡ���: ������DEK�Ǥ�\n"
 
-#: g10/mainproc.c:483
+#: g10/mainproc.c:472
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "%u-�ӥå�%s��, ID %s, ����%s�˰Ź沽����ޤ���\n"
 
-#: g10/mainproc.c:487 g10/pkclist.c:219
+#: g10/mainproc.c:476 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      ��%s��\n"
 
-#: g10/mainproc.c:491
+#: g10/mainproc.c:480
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "%s��, ID %s�ǰŹ沽����ޤ���\n"
 
-#: g10/mainproc.c:505
+#: g10/mainproc.c:494
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "������������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/mainproc.c:519
+#: g10/mainproc.c:508
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "%lu �ĤΥѥ��ե졼���ǰŹ沽\n"
 
-#: g10/mainproc.c:521
+#: g10/mainproc.c:510
 msgid "encrypted with 1 passphrase\n"
 msgstr "1 �ĤΥѥ��ե졼���ǰŹ沽\n"
 
-#: g10/mainproc.c:549 g10/mainproc.c:571
+#: g10/mainproc.c:541 g10/mainproc.c:563
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "%s�Ź沽�Ѥߥǡ�������\n"
 
-#: g10/mainproc.c:557
+#: g10/mainproc.c:549
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA�Ź�ˡ��������ǽ�ʤΤǡ���ŷŪ�Ǥ���%s�����Ѥ��褦�Ȥ��Ƥ��ޤ�\n"
 
-#: g10/mainproc.c:589
+#: g10/mainproc.c:581
 msgid "decryption okay\n"
 msgstr "���������\n"
 
-#: g10/mainproc.c:593
+#: g10/mainproc.c:585
 msgid "WARNING: message was not integrity protected\n"
 msgstr "�ٹ�: ��å������δ��������ݸ��Ƥ��ޤ���\n"
 
-#: g10/mainproc.c:606
+#: g10/mainproc.c:598
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "�ٹ�: �Ź沽���줿��å������ϲ��⤵��Ƥ��ޤ�!\n"
 
-#: g10/mainproc.c:612
+#: g10/mainproc.c:604
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/mainproc.c:631
+#: g10/mainproc.c:623
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "����: �����Ԥϡ����ˤ���ɤ褦�˵��Ƥ��ޤ�\n"
 
-#: g10/mainproc.c:633
+#: g10/mainproc.c:625
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "���Υե�����̾='%.*s'\n"
 
-#: g10/mainproc.c:822
+#: g10/mainproc.c:815
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "��Ω��������gpg --import�ɤ�Ȥä�Ŭ�Ѥ��Ƥ�������\n"
 
-#: g10/mainproc.c:1168
+#: g10/mainproc.c:1161
 #, fuzzy
 msgid "no signature found\n"
 msgstr "��%s�ɤ������������̾"
 
-#: g10/mainproc.c:1418
+#: g10/mainproc.c:1419
 msgid "signature verification suppressed\n"
 msgstr "��̾�θ��ڤ��ά\n"
 
-#: g10/mainproc.c:1460 g10/mainproc.c:1470
-msgid "can't handle these multiple signatures\n"
+#: g10/mainproc.c:1519
+#, fuzzy
+msgid "can't handle this ambiguous signature data\n"
 msgstr "����¿�Ž�̾�ϼ�갷���ޤ���\n"
 
-#: g10/mainproc.c:1480
+#: g10/mainproc.c:1530
 #, c-format
 msgid "Signature made %s\n"
 msgstr "%s�˻ܤ��줿��̾\n"
 
-#: g10/mainproc.c:1481
+#: g10/mainproc.c:1531
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               %s��%s�����\n"
 
-#: g10/mainproc.c:1485
+#: g10/mainproc.c:1535
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "%s��%s��ID %s�ǻܤ��줿��̾\n"
 
-#: g10/mainproc.c:1505
+#: g10/mainproc.c:1555
 msgid "Key available at: "
 msgstr "�ʲ��˸�������ޤ�: "
 
-#: g10/mainproc.c:1639 g10/mainproc.c:1687
+#: g10/mainproc.c:1688 g10/mainproc.c:1736
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "��%s�ɤ���� ������ ��̾"
 
-#: g10/mainproc.c:1641 g10/mainproc.c:1689
+#: g10/mainproc.c:1690 g10/mainproc.c:1738
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "��%s�ɤ���δ����ڤ�ν�̾"
 
-#: g10/mainproc.c:1643 g10/mainproc.c:1691
+#: g10/mainproc.c:1692 g10/mainproc.c:1740
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "��%s�ɤ������������̾"
 
-#: g10/mainproc.c:1695
+#: g10/mainproc.c:1744
 msgid "[uncertain]"
 msgstr "[�Գ���]"
 
-#: g10/mainproc.c:1727
+#: g10/mainproc.c:1776
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                ��̾��%s��"
 
-#: g10/mainproc.c:1824
+#: g10/mainproc.c:1873
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "�����ڤ�ν�̾ %s\n"
 
-#: g10/mainproc.c:1829
+#: g10/mainproc.c:1878
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "���ν�̾��%s����λ�Ǥ�\n"
 
-#: g10/mainproc.c:1832
+#: g10/mainproc.c:1881
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s��̾�����󥢥르�ꥺ�� %s\n"
 
-#: g10/mainproc.c:1833
+#: g10/mainproc.c:1882
 msgid "binary"
 msgstr "�Х��ʥ꡼"
 
-#: g10/mainproc.c:1834
+#: g10/mainproc.c:1883
 msgid "textmode"
 msgstr "�ƥ����ȥ⡼��"
 
-#: g10/mainproc.c:1834 g10/trustdb.c:536
+#: g10/mainproc.c:1883 g10/trustdb.c:536
 msgid "unknown"
 msgstr "̤�Τ�"
 
-#: g10/mainproc.c:1854
+#: g10/mainproc.c:1903
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "��̾�򸡺��Ǥ��ޤ���: %s\n"
 
-#: g10/mainproc.c:1922 g10/mainproc.c:1938 g10/mainproc.c:2024
+#: g10/mainproc.c:1972 g10/mainproc.c:1988 g10/mainproc.c:2074
 msgid "not a detached signature\n"
 msgstr "ʬΥ��̾�Ǥ���ޤ���\n"
 
-#: g10/mainproc.c:1965
+#: g10/mainproc.c:2015
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "�ٹ�: ¿�Ž�̾�θ��С��ǽ�Τ�Τ����������ޤ���\n"
 
-#: g10/mainproc.c:1973
+#: g10/mainproc.c:2023
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "���饹0x%02x����Ω��̾\n"
 
-#: g10/mainproc.c:2030
+#: g10/mainproc.c:2080
 msgid "old style (PGP 2.x) signature\n"
 msgstr "�Ť����� (PGP 2.x) �ν�̾\n"
 
-#: g10/mainproc.c:2040
+#: g10/mainproc.c:2090
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "proc_tree() �����̵���ʥ롼�ȡ��ѥ��åȤ򸡽Ф��ޤ���\n"
 
@@ -5126,23 +5133,23 @@ msgstr ""
 msgid "error creating `%s': %s\n"
 msgstr "��%s�פκ������顼: %s\n"
 
-#: g10/plaintext.c:447
+#: g10/plaintext.c:453
 msgid "Detached signature.\n"
 msgstr "ʬΥ��̾��\n"
 
-#: g10/plaintext.c:453
+#: g10/plaintext.c:459
 msgid "Please enter name of data file: "
 msgstr "�ǡ������ե������̾��������: "
 
-#: g10/plaintext.c:485
+#: g10/plaintext.c:491
 msgid "reading stdin ...\n"
 msgstr "ɸ�����Ϥ���ɽФ��� ...\n"
 
-#: g10/plaintext.c:519
+#: g10/plaintext.c:525
 msgid "no signed data\n"
 msgstr "��̾���줿�ǡ���������ޤ���\n"
 
-#: g10/plaintext.c:533
+#: g10/plaintext.c:539
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "��̾���줿�ǡ�����%s�פ������ޤ���\n"
diff --git a/po/pl.po b/po/pl.po
index 647eb25e8..d8bfdc9d6 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.2.2\n"
 "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2006-02-14 15:28+0100\n"
+"POT-Creation-Date: 2006-03-07 11:29+0100\n"
 "PO-Revision-Date: 2004-06-23 15:54+0200\n"
 "Last-Translator: Janusz A. Urbanowicz <alex@bofh.net.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -50,9 +50,9 @@ msgstr "zapisuj
 
 #: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:992 g10/gpg.c:3360 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:997 g10/gpg.c:3391 g10/import.c:193 g10/keygen.c:2274
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:476 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
+#: g10/plaintext.c:482 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
 #: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
@@ -87,7 +87,7 @@ msgstr "nie mo
 msgid "note: random_seed file not updated\n"
 msgstr "uwaga: plik random_seed nie jest uaktualniony\n"
 
-#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:991 g10/keygen.c:2753
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2753
 #: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
 #: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
 #, c-format
@@ -712,51 +712,51 @@ msgstr "zapisuj
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Niepoprawna komenda  (spr�buj \"help\")\n"
 
-#: g10/cardglue.c:435
+#: g10/cardglue.c:434
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:572
+#: g10/cardglue.c:573
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:580
+#: g10/cardglue.c:582
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:915
+#: g10/cardglue.c:917
 #, fuzzy
 msgid "Enter New Admin PIN: "
 msgstr "Podaj identyfikator u�ytkownika (user ID): "
 
-#: g10/cardglue.c:916
+#: g10/cardglue.c:918
 #, fuzzy
 msgid "Enter New PIN: "
 msgstr "Podaj identyfikator u�ytkownika (user ID): "
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:919
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:920
 #, fuzzy
 msgid "Enter PIN: "
 msgstr "Podaj identyfikator u�ytkownika (user ID): "
 
-#: g10/cardglue.c:935
+#: g10/cardglue.c:937
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Powt�rz has�o: "
 
-#: g10/cardglue.c:950
+#: g10/cardglue.c:952
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "has�o nie zosta�o poprawnie powt�rzone; jeszcze jedna pr�ba"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3720 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3751 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -766,13 +766,13 @@ msgstr "nie mo
 msgid "--output doesn't work for this command\n"
 msgstr "opcja --output nie dzia�a z tym poleceniem\n"
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1644
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1698
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "klucz ,,%s'' nie zosta� odnaleziony: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1658
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1712
 #: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -884,12 +884,12 @@ msgstr "%s nie jest dost
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s zaszyfrowany dla: ,,%s''\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:306
+#: g10/encr-data.c:67 g10/mainproc.c:293
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "dane zaszyfrowano za pomoc� %s\n"
 
-#: g10/encr-data.c:69 g10/mainproc.c:310
+#: g10/encr-data.c:69 g10/mainproc.c:297
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "dane zaszyfrowano nieznanym algorytmem numer %d\n"
@@ -1032,7 +1032,7 @@ msgstr "OSTRZE
 msgid "WARNING: nothing exported\n"
 msgstr "OSTRZE�ENIE: nic nie zosta�o wyeksportowane!\n"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:373
 msgid ""
 "@Commands:\n"
 " "
@@ -1040,128 +1040,128 @@ msgstr ""
 "@Polecenia:\n"
 " "
 
-#: g10/gpg.c:374
+#: g10/gpg.c:375
 msgid "|[file]|make a signature"
 msgstr "|[plik]|z�o�enie podpisu"
 
-#: g10/gpg.c:375
+#: g10/gpg.c:376
 msgid "|[file]|make a clear text signature"
 msgstr "|[plik]|z�o�enie podpisu pod dokumentem"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:377
 msgid "make a detached signature"
 msgstr "z�o�enie podpisu oddzielonego od dokumentu"
 
-#: g10/gpg.c:377
+#: g10/gpg.c:378
 msgid "encrypt data"
 msgstr "szyfrowanie danych"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:380
 msgid "encryption only with symmetric cipher"
 msgstr "szyfrowanie tylko szyfrem symetrycznym"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:382
 msgid "decrypt data (default)"
 msgstr "odszyfrowywanie danych (domy�lne)"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:384
 msgid "verify a signature"
 msgstr "sprawdzenie podpisu"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:386
 msgid "list keys"
 msgstr "lista kluczy"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "list keys and signatures"
 msgstr "lista kluczy i podpis�w"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:389
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "sprawdzenie podpis�w kluczy"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:390
 msgid "list keys and fingerprints"
 msgstr "lista kluczy i ich odcisk�w"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:391
 msgid "list secret keys"
 msgstr "lista kluczy prywatnych"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:392
 msgid "generate a new key pair"
 msgstr "generacja nowej pary kluczy"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:393
 msgid "remove keys from the public keyring"
 msgstr "usuni�cie klucza ze zbioru kluczy publicznych"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:395
 msgid "remove keys from the secret keyring"
 msgstr "usuni�cie klucza ze zbioru kluczy prywatnych"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:396
 msgid "sign a key"
 msgstr "z�o�enie podpisu na kluczu"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:397
 msgid "sign a key locally"
 msgstr "z�o�enie prywatnego podpisu na kluczu"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:398
 msgid "sign or edit a key"
 msgstr "podpisanie lub modyfikacja klucza"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:399
 msgid "generate a revocation certificate"
 msgstr "tworzenie certyfikatu uniewa�nienia klucza"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:401
 msgid "export keys"
 msgstr "eksport kluczy do pliku"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:402
 msgid "export keys to a key server"
 msgstr "eksport kluczy do serwera kluczy"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:403
 msgid "import keys from a key server"
 msgstr "import kluczy z serwera kluczy"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:405
 msgid "search for keys on a key server"
 msgstr "szukanie kluczy na serwerze"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:407
 msgid "update all keys from a keyserver"
 msgstr "od�wie�enie wszystkich kluczy z serwera"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:411
 msgid "import/merge keys"
 msgstr "import/do��czenie kluczy"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:414
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:414
+#: g10/gpg.c:415
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:415
+#: g10/gpg.c:416
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:423
+#: g10/gpg.c:424
 msgid "update the trust database"
 msgstr "uaktualnienie bazy zaufania"
 
-#: g10/gpg.c:430
+#: g10/gpg.c:431
 msgid "|algo [files]|print message digests"
 msgstr "|algo [pliki]|skr�ty wiadomo�ci"
 
-#: g10/gpg.c:434 g10/gpgv.c:71
+#: g10/gpg.c:435 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1171,51 +1171,51 @@ msgstr ""
 "Opcje:\n"
 " "
 
-#: g10/gpg.c:436
+#: g10/gpg.c:437
 msgid "create ascii armored output"
 msgstr "opakowanie ASCII pliku wynikowego"
 
-#: g10/gpg.c:438
+#: g10/gpg.c:439
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAZWA|szyfrowanie dla odbiorcy NAZWA"
 
-#: g10/gpg.c:449
+#: g10/gpg.c:450
 msgid "use this user-id to sign or decrypt"
 msgstr "identyfikator do podpisania lub odszyfrowania"
 
-#: g10/gpg.c:450
+#: g10/gpg.c:451
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|poziom kompresji N (0 - bez)"
 
-#: g10/gpg.c:455
+#: g10/gpg.c:456
 msgid "use canonical text mode"
 msgstr "kanoniczny format tekstowy"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:470
 msgid "use as output file"
 msgstr "plik wyj�ciowy"
 
-#: g10/gpg.c:471 g10/gpgv.c:73
+#: g10/gpg.c:472 g10/gpgv.c:73
 msgid "verbose"
 msgstr "z dodatkowymi informacjami"
 
-#: g10/gpg.c:482
+#: g10/gpg.c:483
 msgid "do not make any changes"
 msgstr "pozostawienie bez zmian"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:484
 msgid "prompt before overwriting"
 msgstr "pytanie przed nadpisaniem plik�w"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:525
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:553
+#: g10/gpg.c:554
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1223,7 +1223,7 @@ msgstr ""
 "@\n"
 "(Pe�n� list� polece� i opcji mo�na znale�� w podr�czniku systemowym.)\n"
 
-#: g10/gpg.c:556
+#: g10/gpg.c:557
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1244,15 +1244,15 @@ msgstr ""
 " --list-keys [nazwy]        pokazuje klucze\n"
 " --fingerprint [nazwy]      pokazuje odciski kluczy\n"
 
-#: g10/gpg.c:746 g10/gpgv.c:98
+#: g10/gpg.c:751 g10/gpgv.c:98
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "B��dy prosimy zg�asza� na adres <gnupg-bugs@gnu.org>.\n"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:768
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Wywo�anie: gpg [opcje] [pliki] (-h podaje pomoc)"
 
-#: g10/gpg.c:766
+#: g10/gpg.c:771
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1262,7 +1262,7 @@ msgstr ""
 "podpisywanie, sprawdzanie podpis�w, szyfrowanie, deszyfrowanie\n"
 "domy�lnie wykonywana operacja zale�y od danych wej�ciowych\n"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:782
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1270,73 +1270,73 @@ msgstr ""
 "\n"
 "Obs�ugiwane algorytmy:\n"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:785
 msgid "Pubkey: "
 msgstr "Asymetryczne: "
 
-#: g10/gpg.c:786 g10/keyedit.c:2266
+#: g10/gpg.c:791 g10/keyedit.c:2266
 msgid "Cipher: "
 msgstr "Symetryczne: "
 
-#: g10/gpg.c:792
+#: g10/gpg.c:797
 msgid "Hash: "
 msgstr "Skr�t�w: "
 
-#: g10/gpg.c:798 g10/keyedit.c:2312
+#: g10/gpg.c:803 g10/keyedit.c:2312
 msgid "Compression: "
 msgstr "Kompresji: "
 
-#: g10/gpg.c:881
+#: g10/gpg.c:886
 msgid "usage: gpg [options] "
 msgstr "wywo�anie: gpg [opcje]"
 
-#: g10/gpg.c:1029
+#: g10/gpg.c:1034
 msgid "conflicting commands\n"
 msgstr "sprzeczne polecenia\n"
 
-#: g10/gpg.c:1047
+#: g10/gpg.c:1052
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "w definicji grupy ,,%s'' brak znaku ,,=''\n"
 
-#: g10/gpg.c:1244
+#: g10/gpg.c:1249
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do %s ,,%s''.\n"
 
-#: g10/gpg.c:1247
+#: g10/gpg.c:1252
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do %s ,,%s''.\n"
 
-#: g10/gpg.c:1250
+#: g10/gpg.c:1255
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do %s ,,%s''.\n"
 
-#: g10/gpg.c:1256
+#: g10/gpg.c:1261
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa dost�pu do %s ,,%s''.\n"
 
-#: g10/gpg.c:1259
+#: g10/gpg.c:1264
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa dost�pu do %s ,,%s''.\n"
 
-#: g10/gpg.c:1262
+#: g10/gpg.c:1267
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "OSTRZE�ENIE: niebezpieczne prawa dost�pu do %s ,,%s''.\n"
 
-#: g10/gpg.c:1268
+#: g10/gpg.c:1273
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do katalogu\n"
 "                  zawieraj�cego %s ,,%s''\n"
 
-#: g10/gpg.c:1271
+#: g10/gpg.c:1276
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1344,21 +1344,21 @@ msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do katalogu\n"
 "                  zawieraj�cego %s ,,%s''\n"
 
-#: g10/gpg.c:1274
+#: g10/gpg.c:1279
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa w�asno�ci do katalogu\n"
 "                  zawieraj�cego %s ,,%s''\n"
 
-#: g10/gpg.c:1280
+#: g10/gpg.c:1285
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa dost�pu do katalogu \n"
 "                  zawieraj�cego %s ,,%s''\n"
 
-#: g10/gpg.c:1283
+#: g10/gpg.c:1288
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1366,471 +1366,480 @@ msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa dost�pu do katalogu \n"
 "                  zawieraj�cego %s ,,%s''\n"
 
-#: g10/gpg.c:1286
+#: g10/gpg.c:1291
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "OSTRZE�ENIE: niebezpieczne prawa dost�pu do katalogu \n"
 "                  zawieraj�cego %s ,,%s''\n"
 
-#: g10/gpg.c:1427
+#: g10/gpg.c:1432
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "nieznana opcja ,,%s''\n"
 
-#: g10/gpg.c:1521
+#: g10/gpg.c:1526
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1523
+#: g10/gpg.c:1528
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1525
+#: g10/gpg.c:1530
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Brak odpowiadaj�cego podpisu w zbiorze kluczy prywatnych\n"
 
-#: g10/gpg.c:1527
+#: g10/gpg.c:1532
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1536
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1538
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1540
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1542
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1544
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1546
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "okazanie, w kt�rym zbiorze znajduje si� dany klucz"
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1548
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Brak odpowiadaj�cego podpisu w zbiorze kluczy prywatnych\n"
 
-#: g10/gpg.c:1874
+#: g10/gpg.c:1879
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "UWAGA: stary domy�lny plik opcji ,,%s'' zosta� zignorowany\n"
 
-#: g10/gpg.c:1916
+#: g10/gpg.c:1921
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "UWAGA: brak domy�lnego pliku opcji ,,%s''\n"
 
-#: g10/gpg.c:1920
+#: g10/gpg.c:1925
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "plik opcji ,,%s'': %s\n"
 
-#: g10/gpg.c:1927
+#: g10/gpg.c:1932
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "odczyt opcji z ,,%s''\n"
 
-#: g10/gpg.c:2142 g10/gpg.c:2716 g10/gpg.c:2735
+#: g10/gpg.c:2147 g10/gpg.c:2747 g10/gpg.c:2766
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "UWAGA: %s nie jest do normalnego u�ytku!\n"
 
-#: g10/gpg.c:2158
+#: g10/gpg.c:2163
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "modu� szyfru ,,%s'' nie zosta� za�adowany z powodu niebezpiecznych praw "
 "dost�pu\n"
 
-#: g10/gpg.c:2312 g10/gpg.c:2324
+#: g10/gpg.c:2317 g10/gpg.c:2329
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
 
-#: g10/gpg.c:2400
+#: g10/gpg.c:2405
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
 
-#: g10/gpg.c:2422 g10/keyedit.c:3997
+#: g10/gpg.c:2429 g10/keyedit.c:3997
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "niezrozuma�y URI serwera kluczy\n"
 
-#: g10/gpg.c:2428
+#: g10/gpg.c:2441
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2431
+#: g10/gpg.c:2444
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2438
+#: g10/gpg.c:2451
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: niepoprawne opcje wczytania kluczy\n"
 
-#: g10/gpg.c:2441
+#: g10/gpg.c:2454
 msgid "invalid import options\n"
 msgstr "niepoprawne opcje wczytania kluczy\n"
 
-#: g10/gpg.c:2448
+#: g10/gpg.c:2461
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2464
 msgid "invalid export options\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2458
+#: g10/gpg.c:2471
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: niepoprawne opcje wczytania kluczy\n"
 
-#: g10/gpg.c:2461
+#: g10/gpg.c:2474
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "niepoprawne opcje wczytania kluczy\n"
 
-#: g10/gpg.c:2469
+#: g10/gpg.c:2482
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2471
+#: g10/gpg.c:2484
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2473
+#: g10/gpg.c:2486
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
 
-#: g10/gpg.c:2475
+#: g10/gpg.c:2488
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2479
+#: g10/gpg.c:2492
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2481
+#: g10/gpg.c:2494
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
 
-#: g10/gpg.c:2483
+#: g10/gpg.c:2496
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s nie jest poprawn� nazw� zestawu znak�w\n"
 
-#: g10/gpg.c:2485
+#: g10/gpg.c:2498
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2505
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2495
+#: g10/gpg.c:2508
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2502
+#: g10/gpg.c:2515
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nie mo�na ustawi� �cie�ki program�w wykonywalnych na %s\n"
 
-#: g10/gpg.c:2705
+#: g10/gpg.c:2665
+#, fuzzy, c-format
+msgid "%s:%d: invalid auto-key-locate list\n"
+msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
+
+#: g10/gpg.c:2668
+msgid "invalid auto-key-locate list\n"
+msgstr ""
+
+#: g10/gpg.c:2736
 msgid "WARNING: program may create a core file!\n"
 msgstr "OSTRZE�ENIE: program mo�e stworzy� plik zrzutu pami�ci!\n"
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2740
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "OSTRZE�ENIE: %s powoduje obej�cie %s\n"
 
-#: g10/gpg.c:2718
+#: g10/gpg.c:2749
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nie wolno u�ywa� %s z %s!\n"
 
-#: g10/gpg.c:2721
+#: g10/gpg.c:2752
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nie ma sensu w po��czeniu z %s!\n"
 
-#: g10/gpg.c:2728
+#: g10/gpg.c:2759
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "gpg-agent nie jest dost�pny w tej sesji\n"
 
-#: g10/gpg.c:2743
+#: g10/gpg.c:2774
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "zapisuj� klucz tajny w '%s'\n"
 
-#: g10/gpg.c:2757
+#: g10/gpg.c:2788
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "w trybie --pgp2 mo�na sk�ada� tylko podpisy oddzielne lub do��czone do "
 "tekstu\n"
 
-#: g10/gpg.c:2763
+#: g10/gpg.c:2794
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "w trybie --pgp2 nie mo�na jednocze�nie szyfrowa� i podpisywa�\n"
 
-#: g10/gpg.c:2769
+#: g10/gpg.c:2800
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "w trybie --pgp2 trzeba u�ywa� plik�w a nie potok�w.\n"
 
-#: g10/gpg.c:2782
+#: g10/gpg.c:2813
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "szyfrowanie wiadomo�ci w trybie --pgp2 wymaga modu�u szyfru IDEA\n"
 
-#: g10/gpg.c:2849 g10/gpg.c:2873
+#: g10/gpg.c:2880 g10/gpg.c:2904
 msgid "selected cipher algorithm is invalid\n"
 msgstr "wybrany algorytm szyfruj�cy jest niepoprawny\n"
 
-#: g10/gpg.c:2855 g10/gpg.c:2879
+#: g10/gpg.c:2886 g10/gpg.c:2910
 msgid "selected digest algorithm is invalid\n"
 msgstr "wybrany algorytm skr�t�w wiadomo�ci jest niepoprawny\n"
 
-#: g10/gpg.c:2861
+#: g10/gpg.c:2892
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "wybrany algorytm szyfruj�cy jest niepoprawny\n"
 
-#: g10/gpg.c:2867
+#: g10/gpg.c:2898
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "wybrany algorytm skr�t�w po�wiadcze� jest niepoprawny\n"
 
-#: g10/gpg.c:2882
+#: g10/gpg.c:2913
 msgid "completes-needed must be greater than 0\n"
 msgstr "warto�� completes-needed musi by� wi�ksza od 0\n"
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2915
 msgid "marginals-needed must be greater than 1\n"
 msgstr "warto�� marginals-needed musi by� wi�ksza od 1\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2917
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "warto�� max-cert-depth musi mie�ci� si� w zakresie od 1 do 255\n"
 
-#: g10/gpg.c:2888
+#: g10/gpg.c:2919
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 "niew�a�ciwy domy�lny poziom sprawdzania; musi mie� warto�� 0, 1, 2 lub 3\n"
 
-#: g10/gpg.c:2890
+#: g10/gpg.c:2921
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr ""
 "niew�a�ciwy minimalny poziom sprawdzania; musi mie� warto�� 0, 1, 2 lub 3\n"
 
-#: g10/gpg.c:2893
+#: g10/gpg.c:2924
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "UWAGA: prosty tryb S2K (0) jest stanowczo odradzany\n"
 
-#: g10/gpg.c:2897
+#: g10/gpg.c:2928
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "niepoprawny tryb S2K; musi mie� warto�� 0, 1 lub 3\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2935
 msgid "invalid default preferences\n"
 msgstr "niew�a�ciwe domy�lne ustawienia\n"
 
-#: g10/gpg.c:2913
+#: g10/gpg.c:2944
 msgid "invalid personal cipher preferences\n"
 msgstr "niew�a�ciwe ustawienia szyfr�w\n"
 
-#: g10/gpg.c:2917
+#: g10/gpg.c:2948
 msgid "invalid personal digest preferences\n"
 msgstr "niew�a�ciwe ustawienia skr�t�w\n"
 
-#: g10/gpg.c:2921
+#: g10/gpg.c:2952
 msgid "invalid personal compress preferences\n"
 msgstr "niew�a�ciwe ustawienia algorytm�w kompresji\n"
 
-#: g10/gpg.c:2954
+#: g10/gpg.c:2985
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s jeszcze nie dzia�a z %s!\n"
 
-#: g10/gpg.c:3001
+#: g10/gpg.c:3032
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "szyfr ,,%s'' nie jest dost�pny w trybie %s\n"
 
-#: g10/gpg.c:3006
+#: g10/gpg.c:3037
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "skr�t ,,%s'' nie jest dost�pny w trybie %s\n"
 
-#: g10/gpg.c:3011
+#: g10/gpg.c:3042
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "kompresja ,,%s'' nie jest dost�pna w trybie %s\n"
 
-#: g10/gpg.c:3107
+#: g10/gpg.c:3138
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3118
+#: g10/gpg.c:3149
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "OSTRZE�ENIE: podano adresat�w (-r) w dzia�aniu kt�re ich nie dotyczy\n"
 
-#: g10/gpg.c:3129
+#: g10/gpg.c:3160
 msgid "--store [filename]"
 msgstr "--store [plik]"
 
-#: g10/gpg.c:3136
+#: g10/gpg.c:3167
 msgid "--symmetric [filename]"
 msgstr "--symmetric [plik]"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3169
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "b��d odszyfrowywania: %s\n"
 
-#: g10/gpg.c:3148
+#: g10/gpg.c:3179
 msgid "--encrypt [filename]"
 msgstr "--encrypt [plik]"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3192
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3194
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3166
+#: g10/gpg.c:3197
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "%s nie jest dost�pne w trybie %s\n"
 
-#: g10/gpg.c:3184
+#: g10/gpg.c:3215
 msgid "--sign [filename]"
 msgstr "--sign [plik]"
 
-#: g10/gpg.c:3197
+#: g10/gpg.c:3228
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/gpg.c:3212
+#: g10/gpg.c:3243
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/gpg.c:3214
+#: g10/gpg.c:3245
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3217
+#: g10/gpg.c:3248
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "%s nie jest dost�pne w trybie %s\n"
 
-#: g10/gpg.c:3237
+#: g10/gpg.c:3268
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [plik]"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3277
 msgid "--clearsign [filename]"
 msgstr "--clearsign [plik]\""
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3302
 msgid "--decrypt [filename]"
 msgstr "--decrypt [plik]"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3310
 msgid "--sign-key user-id"
 msgstr "--sign-key nazwa u�ytkownika"
 
-#: g10/gpg.c:3283
+#: g10/gpg.c:3314
 msgid "--lsign-key user-id"
 msgstr "--lsign-key nazwa u�ytkownika"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3335
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key nazwa u�ytkownika [polecenia]"
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3406
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [identyfikator] [zbi�r kluczy]"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3443
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "wysy�ka do serwera kluczy nie powiod�a si�: %s\n"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3445
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "odbi�r z serwera kluczy nie powi�d� si�: %s\n"
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3447
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "eksport kluczy nie powi�d� si�: %s\n"
 
-#: g10/gpg.c:3427
+#: g10/gpg.c:3458
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "szukanie w serwerze kluczy nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3437
+#: g10/gpg.c:3468
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "od�wie�enie kluczy z serwera nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3488
+#: g10/gpg.c:3519
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zdj�cie opakowania ASCII nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3496
+#: g10/gpg.c:3527
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "opakowywanie ASCII nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3583
+#: g10/gpg.c:3614
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "niew�a�ciwy algorytm skr�tu ,%s'\n"
 
-#: g10/gpg.c:3706
+#: g10/gpg.c:3737
 msgid "[filename]"
 msgstr "[nazwa pliku]"
 
-#: g10/gpg.c:3710
+#: g10/gpg.c:3741
 msgid "Go ahead and type your message ...\n"
 msgstr "Wpisz tutaj swoj� wiadomo�� ...\n"
 
-#: g10/gpg.c:4000
+#: g10/gpg.c:4031
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1838,28 +1847,28 @@ msgstr ""
 "nazwa adnotacji mo�e zawiera� tylko litery, cyfry, kropki i podkre�lenia, \n"
 "i musi ko�czy� si� ,,=''\n"
 
-#: g10/gpg.c:4008
+#: g10/gpg.c:4039
 msgid "a user notation name must contain the '@' character\n"
 msgstr "adnotacja u�ytkownika musi zawiera� znak '@'\n"
 
-#: g10/gpg.c:4013
+#: g10/gpg.c:4044
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "adnotacja u�ytkownika musi zawiera� znak '@'\n"
 
-#: g10/gpg.c:4024
+#: g10/gpg.c:4055
 msgid "a notation value must not use any control characters\n"
 msgstr "tre�� adnotacji nie mo�e zawiera� znak�w steruj�cych\n"
 
-#: g10/gpg.c:4058
+#: g10/gpg.c:4089
 msgid "the given certification policy URL is invalid\n"
 msgstr "podany URL regulaminu po�wiadczania jest niepoprawny\n"
 
-#: g10/gpg.c:4060
+#: g10/gpg.c:4091
 msgid "the given signature policy URL is invalid\n"
 msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
 
-#: g10/gpg.c:4093
+#: g10/gpg.c:4124
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
@@ -1868,33 +1877,34 @@ msgstr "podany URL regulaminu podpis
 msgid "too many entries in pk cache - disabled\n"
 msgstr "zbyt wiele wpis�w w buforze kluczy publicznych - wy��czony\n"
 
-#: g10/getkey.c:188 g10/getkey.c:2845
+#: g10/getkey.c:188 g10/getkey.c:2876
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[brak identyfikatora u�ytkownika]"
 
-#: g10/getkey.c:931 g10/getkey.c:953 g10/getkey.c:976
+#: g10/getkey.c:933 g10/getkey.c:950 g10/getkey.c:970 g10/getkey.c:986
+#: g10/getkey.c:1001
 #, c-format
 msgid "Automatically retrieved `%s' via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1769
+#: g10/getkey.c:1800
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Opcja --allow-non-selfsigned-uid wymusi�a uznanie za poprawny klucza %08lX.\n"
 
-#: g10/getkey.c:2323
+#: g10/getkey.c:2354
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "brak prywatnego odpowiednika podklucza publicznego %08lX - pomini�ty\n"
 
-#: g10/getkey.c:2554
+#: g10/getkey.c:2585
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "u�ywany jest podklucz %08lX zamiast klucza g��wnego %08lX\n"
 
-#: g10/getkey.c:2601
+#: g10/getkey.c:2632
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "klucz %08lX: klucz tajny bez klucza jawnego - pomini�ty\n"
@@ -3467,12 +3477,12 @@ msgid "(sensitive)"
 msgstr " (poufne)"
 
 #: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
-#: g10/keylist.c:194 g10/keyserver.c:471
+#: g10/keylist.c:194 g10/keyserver.c:525
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "nie mo�na utworzy� %s: %s\n"
 
-#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:967
+#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:960
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[uniewa�niony]"
@@ -3484,7 +3494,7 @@ msgstr " [wygasa :%s]"
 
 #: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
 #: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:477 g10/mainproc.c:973
+#: g10/keylist.c:914 g10/keyserver.c:531 g10/mainproc.c:966
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [wygasa :%s]"
@@ -3520,14 +3530,14 @@ msgstr ""
 "Pokazana warto�� wiarygodno�ci klucza mo�e by� niepoprawna,\n"
 "dop�ki program nie zostanie uruchomiony ponownie.\n"
 
-#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:481
-#: g10/mainproc.c:1734 g10/trustdb.c:1184 g10/trustdb.c:1704
+#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:535
+#: g10/mainproc.c:1783 g10/trustdb.c:1184 g10/trustdb.c:1704
 #, fuzzy
 msgid "revoked"
 msgstr "[uniewa�niony]"
 
-#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:485
-#: g10/mainproc.c:1736 g10/trustdb.c:537 g10/trustdb.c:1706
+#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:539
+#: g10/mainproc.c:1785 g10/trustdb.c:537 g10/trustdb.c:1706
 #, fuzzy
 msgid "expired"
 msgstr "data"
@@ -4377,390 +4387,387 @@ msgstr "%s: zbi
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:77
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:81
+#: g10/keyserver.c:79
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:83
+#: g10/keyserver.c:81
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:87
+#: g10/keyserver.c:85
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:89
-msgid "automatically retrieve keys from PKA records"
-msgstr ""
-
-#: g10/keyserver.c:91
-msgid "automatically retrieve keys from DNS"
-msgstr ""
-
-#: g10/keyserver.c:95
+#: g10/keyserver.c:87
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
 
-#: g10/keyserver.c:139
+#: g10/keyserver.c:89
+msgid "honor the PKA record set on a key when retrieving keys"
+msgstr ""
+
+#: g10/keyserver.c:154
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "OSTRZE�ENIE: opcje w ,,%s'' nie s� jeszcze uwzgl�dnione.\n"
 
-#: g10/keyserver.c:483
+#: g10/keyserver.c:537
 #, fuzzy
 msgid "disabled"
 msgstr "wy�kl"
 
-#: g10/keyserver.c:684
+#: g10/keyserver.c:738
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:767 g10/keyserver.c:1368
+#: g10/keyserver.c:821 g10/keyserver.c:1422
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/keyserver.c:865
+#: g10/keyserver.c:919
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "klucz ,,%s'' nie zosta� odnaleziony: %s\n"
 
-#: g10/keyserver.c:867
+#: g10/keyserver.c:921
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "klucz ,,%s'' nie zosta� odnaleziony: %s\n"
 
-#: g10/keyserver.c:1092
+#: g10/keyserver.c:1146
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "zapytanie o klucz %08lX w %s\n"
 
-#: g10/keyserver.c:1096
+#: g10/keyserver.c:1150
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "zapytanie o klucz %08lX w %s\n"
 
-#: g10/keyserver.c:1120
+#: g10/keyserver.c:1174
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "zapytanie o ,,%s'' w serwerze HKP %s\n"
 
-#: g10/keyserver.c:1123
+#: g10/keyserver.c:1177
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "zapytanie o ,,%s'' w serwerze HKP %s\n"
 
-#: g10/keyserver.c:1271
+#: g10/keyserver.c:1325
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "zapytanie o ,,%s'' w serwerze HKP %s\n"
 
-#: g10/keyserver.c:1275
+#: g10/keyserver.c:1329
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "podpisano Twoim kluczem %08lX w %s\n"
 
-#: g10/keyserver.c:1318
+#: g10/keyserver.c:1372
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "zapytanie o ,,%s'' w serwerze HKP %s\n"
 
-#: g10/keyserver.c:1321
+#: g10/keyserver.c:1375
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "zapytanie o ,,%s'' w serwerze HKP %s\n"
 
-#: g10/keyserver.c:1328 g10/keyserver.c:1424
+#: g10/keyserver.c:1382 g10/keyserver.c:1478
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/keyserver.c:1376
+#: g10/keyserver.c:1430
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1439
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1446
+#: g10/keyserver.c:1500
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "brak znanyk serwer�w kluczy (u�yj opcji --keyserver)\n"
 
-#: g10/keyserver.c:1452
+#: g10/keyserver.c:1506
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1464
+#: g10/keyserver.c:1518
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1469
+#: g10/keyserver.c:1523
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1477
+#: g10/keyserver.c:1531
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1484
+#: g10/keyserver.c:1538
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "b��d serwera kluczy"
 
-#: g10/keyserver.c:1489
+#: g10/keyserver.c:1543
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "b��d serwera kluczy"
 
-#: g10/keyserver.c:1498
+#: g10/keyserver.c:1552
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "odbi�r z serwera kluczy nie powi�d� si�: %s\n"
 
-#: g10/keyserver.c:1523 g10/keyserver.c:1557
+#: g10/keyserver.c:1577 g10/keyserver.c:1611
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s: nie jest poprawnym identyfikatorem klucza\n"
 
-#: g10/keyserver.c:1814
+#: g10/keyserver.c:1868
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "OSTRZE�ENIE: nie mo�na skasowa� pliku tymczasowego (%s) ,,%s'': %s.\n"
 
-#: g10/keyserver.c:1836
+#: g10/keyserver.c:1890
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "zapytanie o klucz %08lX w %s\n"
 
-#: g10/keyserver.c:1838
+#: g10/keyserver.c:1892
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "zapytanie o klucz %08lX w %s\n"
 
-#: g10/keyserver.c:1903
+#: g10/keyserver.c:1957
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "OSTRZE�ENIE: nie mo�na skasowa� pliku tymczasowego (%s) ,,%s'': %s.\n"
 
-#: g10/keyserver.c:1909
+#: g10/keyserver.c:1963
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "OSTRZE�ENIE: nie mo�na skasowa� pliku tymczasowego (%s) ,,%s'': %s.\n"
 
-#: g10/mainproc.c:253
+#: g10/mainproc.c:240
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "%d - dziwny rozmiar jak na zaszyfrowany klucz sesyjny\n"
 
-#: g10/mainproc.c:304
+#: g10/mainproc.c:291
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "klucz sesyjny zaszyfrowany %s\n"
 
-#: g10/mainproc.c:314
+#: g10/mainproc.c:301
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "dane zaszyfrowano nieznanym algorytmem numer %d\n"
 
-#: g10/mainproc.c:395
+#: g10/mainproc.c:382
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "klucz publiczny %08lX\n"
 
-#: g10/mainproc.c:450
+#: g10/mainproc.c:439
 msgid "public key encrypted data: good DEK\n"
 msgstr "dane zaszyfrowane kluczem publicznym: poprawny klucz sesyjny\n"
 
-#: g10/mainproc.c:483
+#: g10/mainproc.c:472
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "zaszyfrowano %u-bitowym kluczem %s, numer %08lX, stworzonym %s\n"
 
-#: g10/mainproc.c:487 g10/pkclist.c:219
+#: g10/mainproc.c:476 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                        alias \""
 
-#: g10/mainproc.c:491
+#: g10/mainproc.c:480
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "zaszyfrowano kluczem %s, o numerze %08lX\n"
 
-#: g10/mainproc.c:505
+#: g10/mainproc.c:494
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "b��d odszyfrowywania kluczem publicznym: %s\n"
 
-#: g10/mainproc.c:519
+#: g10/mainproc.c:508
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "zaszyfrowane za pomoc� %lu hase�\n"
 
-#: g10/mainproc.c:521
+#: g10/mainproc.c:510
 msgid "encrypted with 1 passphrase\n"
 msgstr "zaszyfrowane jednym has�em\n"
 
-#: g10/mainproc.c:549 g10/mainproc.c:571
+#: g10/mainproc.c:541 g10/mainproc.c:563
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "przyjmuj�c �e dane zosta�y zaszyfrowane za pomoc� %s\n"
 
-#: g10/mainproc.c:557
+#: g10/mainproc.c:549
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "szyfr IDEA nie jest dost�pny, pr�ba u�ycia %s zamiast\n"
 
-#: g10/mainproc.c:589
+#: g10/mainproc.c:581
 msgid "decryption okay\n"
 msgstr "odszyfrowanie poprawne\n"
 
-#: g10/mainproc.c:593
+#: g10/mainproc.c:585
 msgid "WARNING: message was not integrity protected\n"
 msgstr "OSTRZE�ENIE: wiadomo�� nie by�a zabezpieczona przed manipulacj�\n"
 
-#: g10/mainproc.c:606
+#: g10/mainproc.c:598
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "OSTRZE�ENIE: zaszyfrowana wiadomo�� by�a manipulowana!\n"
 
-#: g10/mainproc.c:612
+#: g10/mainproc.c:604
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "b��d odszyfrowywania: %s\n"
 
-#: g10/mainproc.c:631
+#: g10/mainproc.c:623
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "UWAGA: nadawca zaznaczy� �e wiadomo�� nie powinna by� zapisywana\n"
 
-#: g10/mainproc.c:633
+#: g10/mainproc.c:625
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "pierwotna nazwa pliku='%.*s'\n"
 
-#: g10/mainproc.c:822
+#: g10/mainproc.c:815
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "osobny certyfikat uniewa�nienia - u�yj ,,gpg --import'' aby go wczyta�\n"
 
-#: g10/mainproc.c:1168
+#: g10/mainproc.c:1161
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Poprawny podpis z�o�ony przez \""
 
-#: g10/mainproc.c:1418
+#: g10/mainproc.c:1419
 msgid "signature verification suppressed\n"
 msgstr "wymuszono pomini�cie sprawdzenia podpisu\n"
 
-#: g10/mainproc.c:1460 g10/mainproc.c:1470
-msgid "can't handle these multiple signatures\n"
+#: g10/mainproc.c:1519
+#, fuzzy
+msgid "can't handle this ambiguous signature data\n"
 msgstr "nie mo�na obs�uzy� tych wielokrotnych podpis�w\n"
 
-#: g10/mainproc.c:1480
+#: g10/mainproc.c:1530
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Wa�no�� podpisu wygas�a %s.\n"
 
-#: g10/mainproc.c:1481
+#: g10/mainproc.c:1531
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                        alias \""
 
-#: g10/mainproc.c:1485
+#: g10/mainproc.c:1535
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Podpisano w %.*s kluczem %s o numerze %08lX.\n"
 
-#: g10/mainproc.c:1505
+#: g10/mainproc.c:1555
 msgid "Key available at: "
 msgstr "Klucz dost�pny w: "
 
-#: g10/mainproc.c:1639 g10/mainproc.c:1687
+#: g10/mainproc.c:1688 g10/mainproc.c:1736
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "NIEPOPRAWNY podpis z�o�ony przez \""
 
-#: g10/mainproc.c:1641 g10/mainproc.c:1689
+#: g10/mainproc.c:1690 g10/mainproc.c:1738
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Przeterminowany podpis z�o�ony przez \""
 
-#: g10/mainproc.c:1643 g10/mainproc.c:1691
+#: g10/mainproc.c:1692 g10/mainproc.c:1740
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Poprawny podpis z�o�ony przez \""
 
-#: g10/mainproc.c:1695
+#: g10/mainproc.c:1744
 msgid "[uncertain]"
 msgstr "[niepewne]"
 
-#: g10/mainproc.c:1727
+#: g10/mainproc.c:1776
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                        alias \""
 
-#: g10/mainproc.c:1824
+#: g10/mainproc.c:1873
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Wa�no�� podpisu wygas�a %s.\n"
 
-#: g10/mainproc.c:1829
+#: g10/mainproc.c:1878
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Wa�no�� podpisu wygasa %s.\n"
 
-#: g10/mainproc.c:1832
+#: g10/mainproc.c:1881
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "podpis %s, skr�t %s\n"
 
-#: g10/mainproc.c:1833
+#: g10/mainproc.c:1882
 msgid "binary"
 msgstr "binarny"
 
-#: g10/mainproc.c:1834
+#: g10/mainproc.c:1883
 msgid "textmode"
 msgstr "tekstowy"
 
-#: g10/mainproc.c:1834 g10/trustdb.c:536
+#: g10/mainproc.c:1883 g10/trustdb.c:536
 msgid "unknown"
 msgstr "nieznany"
 
-#: g10/mainproc.c:1854
+#: g10/mainproc.c:1903
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nie mo�na sprawdzi� podpisu: %s\n"
 
-#: g10/mainproc.c:1922 g10/mainproc.c:1938 g10/mainproc.c:2024
+#: g10/mainproc.c:1972 g10/mainproc.c:1988 g10/mainproc.c:2074
 msgid "not a detached signature\n"
 msgstr "nie jest oddzielonym podpisem.\n"
 
-#: g10/mainproc.c:1965
+#: g10/mainproc.c:2015
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "OSTRZE�ENIE: wielokrotne podpisy. Tylko pierwszy zostanie sprawdzony.\n"
 
-#: g10/mainproc.c:1973
+#: g10/mainproc.c:2023
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "oddzielony podpis klasy 0x%02x.\n"
 
-#: g10/mainproc.c:2030
+#: g10/mainproc.c:2080
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis starego typu (PGP 2.x).\n"
 
-#: g10/mainproc.c:2040
+#: g10/mainproc.c:2090
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "wykryto niepoprawny pakiet pierwotny w proc_tree()\n"
 
@@ -5325,23 +5332,23 @@ msgstr ""
 msgid "error creating `%s': %s\n"
 msgstr "b��d tworzenia `%s': %s\n"
 
-#: g10/plaintext.c:447
+#: g10/plaintext.c:453
 msgid "Detached signature.\n"
 msgstr "Podpis oddzielony od danych.\n"
 
-#: g10/plaintext.c:453
+#: g10/plaintext.c:459
 msgid "Please enter name of data file: "
 msgstr "Nazwa pliku danych: "
 
-#: g10/plaintext.c:485
+#: g10/plaintext.c:491
 msgid "reading stdin ...\n"
 msgstr "czytam strumie� standardowego wej�cia\n"
 
-#: g10/plaintext.c:519
+#: g10/plaintext.c:525
 msgid "no signed data\n"
 msgstr "brak podpisanych danych\n"
 
-#: g10/plaintext.c:533
+#: g10/plaintext.c:539
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "nie mo�na otworzy� podpisanego pliku ,,%s''\n"
diff --git a/po/pt.po b/po/pt.po
index d98787992..ad5282013 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg\n"
 "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2006-02-14 15:28+0100\n"
+"POT-Creation-Date: 2006-03-07 11:29+0100\n"
 "PO-Revision-Date: 2002-09-13 18:26+0100\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
@@ -43,9 +43,9 @@ msgstr "a escrever chave privada para `%s'\n"
 
 #: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:992 g10/gpg.c:3360 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:997 g10/gpg.c:3391 g10/import.c:193 g10/keygen.c:2274
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:476 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
+#: g10/plaintext.c:482 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
 #: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
@@ -80,7 +80,7 @@ msgstr "imposs
 msgid "note: random_seed file not updated\n"
 msgstr "nota: ficheiro random_seed n�o actualizado\n"
 
-#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:991 g10/keygen.c:2753
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2753
 #: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
 #: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
 #, c-format
@@ -694,48 +694,48 @@ msgstr "a escrever chave privada para `%s'\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando inv�lido (tente \"help\")\n"
 
-#: g10/cardglue.c:435
+#: g10/cardglue.c:434
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:572
+#: g10/cardglue.c:573
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:580
+#: g10/cardglue.c:582
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:915
+#: g10/cardglue.c:917
 msgid "Enter New Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:916
+#: g10/cardglue.c:918
 msgid "Enter New PIN: "
 msgstr ""
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:919
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:920
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/cardglue.c:935
+#: g10/cardglue.c:937
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Repita a frase secreta: "
 
-#: g10/cardglue.c:950
+#: g10/cardglue.c:952
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "a frase secreta n�o foi repetida corretamente; tente outra vez"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3720 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3751 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -745,13 +745,13 @@ msgstr "imposs
 msgid "--output doesn't work for this command\n"
 msgstr "--output n�o funciona para este comando\n"
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1644
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1698
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "chave `%s' n�o encontrada: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1658
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1712
 #: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -866,12 +866,12 @@ msgstr "n
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s cifrado para: \"%s\"\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:306
+#: g10/encr-data.c:67 g10/mainproc.c:293
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "dados cifrados com %s\n"
 
-#: g10/encr-data.c:69 g10/mainproc.c:310
+#: g10/encr-data.c:69 g10/mainproc.c:297
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrado com algoritmo desconhecido %d\n"
@@ -1011,7 +1011,7 @@ msgstr ""
 msgid "WARNING: nothing exported\n"
 msgstr "AVISO: nada exportado\n"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:373
 msgid ""
 "@Commands:\n"
 " "
@@ -1019,128 +1019,128 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/gpg.c:374
+#: g10/gpg.c:375
 msgid "|[file]|make a signature"
 msgstr "|[ficheiro]|fazer uma assinatura"
 
-#: g10/gpg.c:375
+#: g10/gpg.c:376
 msgid "|[file]|make a clear text signature"
 msgstr "|[ficheiro]|fazer uma assinatura em texto puro"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:377
 msgid "make a detached signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/gpg.c:377
+#: g10/gpg.c:378
 msgid "encrypt data"
 msgstr "cifrar dados"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:380
 msgid "encryption only with symmetric cipher"
 msgstr "cifrar apenas com cifra sim�trica"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:382
 msgid "decrypt data (default)"
 msgstr "decifrar dados (ac��o por omiss�o)"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:384
 msgid "verify a signature"
 msgstr "verificar uma assinatura"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:386
 msgid "list keys"
 msgstr "listar as chaves"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "list keys and signatures"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:389
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:390
 msgid "list keys and fingerprints"
 msgstr "listar as chaves e as impress�es digitais"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:391
 msgid "list secret keys"
 msgstr "listar as chaves secretas"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:392
 msgid "generate a new key pair"
 msgstr "gerar um novo par de chaves"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:393
 msgid "remove keys from the public keyring"
 msgstr "remover chaves do porta-chaves p�blico"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:395
 msgid "remove keys from the secret keyring"
 msgstr "remover chaves do porta-chaves secreto"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:396
 msgid "sign a key"
 msgstr "assinar uma chave"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:397
 msgid "sign a key locally"
 msgstr "assinar uma chave localmente"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:398
 msgid "sign or edit a key"
 msgstr "assinar ou editar uma chave"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:399
 msgid "generate a revocation certificate"
 msgstr "gerar um certificado de revoga��o"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:401
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:402
 msgid "export keys to a key server"
 msgstr "exportar chaves para um servidor de chaves"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:403
 msgid "import keys from a key server"
 msgstr "importar chaves de um servidor de chaves"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:405
 msgid "search for keys on a key server"
 msgstr "procurar chaves num servidor de chaves"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:407
 msgid "update all keys from a keyserver"
 msgstr "actualizar todas as chaves a partir de um servidor de chaves"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:411
 msgid "import/merge keys"
 msgstr "importar/fundir chaves"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:414
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:414
+#: g10/gpg.c:415
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:415
+#: g10/gpg.c:416
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:423
+#: g10/gpg.c:424
 msgid "update the trust database"
 msgstr "actualizar a base de dados de confian�a"
 
-#: g10/gpg.c:430
+#: g10/gpg.c:431
 msgid "|algo [files]|print message digests"
 msgstr "|algo [ficheiros]|imprimir \"digests\" de mensagens"
 
-#: g10/gpg.c:434 g10/gpgv.c:71
+#: g10/gpg.c:435 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1150,55 +1150,55 @@ msgstr ""
 "Op��es:\n"
 " "
 
-#: g10/gpg.c:436
+#: g10/gpg.c:437
 msgid "create ascii armored output"
 msgstr "criar sa�da com armadura ascii"
 
-#: g10/gpg.c:438
+#: g10/gpg.c:439
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|cifrar para NOME"
 
-#: g10/gpg.c:449
+#: g10/gpg.c:450
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "usar este identificador de utilizador para\n"
 "assinar ou decifrar"
 
-#: g10/gpg.c:450
+#: g10/gpg.c:451
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|estabelecer n�vel de compress�o N\n"
 "(0 desactiva)"
 
-#: g10/gpg.c:455
+#: g10/gpg.c:456
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:470
 msgid "use as output file"
 msgstr "usar como ficheiro de sa�da"
 
-#: g10/gpg.c:471 g10/gpgv.c:73
+#: g10/gpg.c:472 g10/gpgv.c:73
 msgid "verbose"
 msgstr "detalhado"
 
-#: g10/gpg.c:482
+#: g10/gpg.c:483
 msgid "do not make any changes"
 msgstr "n�o fazer altera��es"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:484
 msgid "prompt before overwriting"
 msgstr "perguntar antes de sobrep�r"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:525
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:553
+#: g10/gpg.c:554
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1206,7 +1206,7 @@ msgstr ""
 "@\n"
 "(Veja a p�gina man para uma lista completa de comandos e op��es)\n"
 
-#: g10/gpg.c:556
+#: g10/gpg.c:557
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1226,15 +1226,15 @@ msgstr ""
 " --list-keys [nomes]        mostrar chaves\n"
 " --fingerprint [nomes]      mostrar impress�es digitais\n"
 
-#: g10/gpg.c:746 g10/gpgv.c:98
+#: g10/gpg.c:751 g10/gpgv.c:98
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Por favor comunique bugs para <gnupg-bugs@gnu.org>.\n"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:768
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: g10/gpg.c:766
+#: g10/gpg.c:771
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1244,7 +1244,7 @@ msgstr ""
 "assina, verifica, cifra ou decifra\n"
 "a opera��o por omiss�o depende dos dados de entrada\n"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:782
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1252,555 +1252,564 @@ msgstr ""
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:785
 msgid "Pubkey: "
 msgstr "Chave p�blica: "
 
-#: g10/gpg.c:786 g10/keyedit.c:2266
+#: g10/gpg.c:791 g10/keyedit.c:2266
 msgid "Cipher: "
 msgstr "Cifra: "
 
-#: g10/gpg.c:792
+#: g10/gpg.c:797
 msgid "Hash: "
 msgstr "Dispers�o: "
 
-#: g10/gpg.c:798 g10/keyedit.c:2312
+#: g10/gpg.c:803 g10/keyedit.c:2312
 msgid "Compression: "
 msgstr "Compress�o: "
 
-#: g10/gpg.c:881
+#: g10/gpg.c:886
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [op��es] "
 
-#: g10/gpg.c:1029
+#: g10/gpg.c:1034
 msgid "conflicting commands\n"
 msgstr "comandos em conflito\n"
 
-#: g10/gpg.c:1047
+#: g10/gpg.c:1052
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "nenhum sinal = encontrada na defini��o de grupo \"%s\"\n"
 
-#: g10/gpg.c:1244
+#: g10/gpg.c:1249
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1247
+#: g10/gpg.c:1252
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1250
+#: g10/gpg.c:1255
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1256
+#: g10/gpg.c:1261
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1259
+#: g10/gpg.c:1264
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1262
+#: g10/gpg.c:1267
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1268
+#: g10/gpg.c:1273
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1271
+#: g10/gpg.c:1276
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1274
+#: g10/gpg.c:1279
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/gpg.c:1280
+#: g10/gpg.c:1285
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1283
+#: g10/gpg.c:1288
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1286
+#: g10/gpg.c:1291
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "AVISO: permiss�es pouco seguras em %s \"%s\"\n"
 
-#: g10/gpg.c:1427
+#: g10/gpg.c:1432
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "criado um novo ficheiro de configura��o `%s'\n"
 
-#: g10/gpg.c:1521
+#: g10/gpg.c:1526
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1523
+#: g10/gpg.c:1528
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1525
+#: g10/gpg.c:1530
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/gpg.c:1527
+#: g10/gpg.c:1532
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1536
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1538
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1540
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1542
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1544
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1546
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mostrar em que porta-chave a chave est�"
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1548
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/gpg.c:1874
+#: g10/gpg.c:1879
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: o ficheiro antigo de op��es por omiss�o `%s' foi ignorado\n"
 
-#: g10/gpg.c:1916
+#: g10/gpg.c:1921
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: ficheiro de op��es por omiss�o `%s' inexistente\n"
 
-#: g10/gpg.c:1920
+#: g10/gpg.c:1925
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de op��es `%s': %s\n"
 
-#: g10/gpg.c:1927
+#: g10/gpg.c:1932
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "a ler op��es de `%s'\n"
 
-#: g10/gpg.c:2142 g10/gpg.c:2716 g10/gpg.c:2735
+#: g10/gpg.c:2147 g10/gpg.c:2747 g10/gpg.c:2766
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s n�o � para uso normal!\n"
 
-#: g10/gpg.c:2158
+#: g10/gpg.c:2163
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "a extens�o de cifra \"%s\" n�o foi carregada devido �s suas permiss�es "
 "inseguras\n"
 
-#: g10/gpg.c:2312 g10/gpg.c:2324
+#: g10/gpg.c:2317 g10/gpg.c:2329
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2400
+#: g10/gpg.c:2405
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2422 g10/keyedit.c:3997
+#: g10/gpg.c:2429 g10/keyedit.c:3997
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "n�o consegui processar a URI do servidor de chaves\n"
 
-#: g10/gpg.c:2428
+#: g10/gpg.c:2441
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2431
+#: g10/gpg.c:2444
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2438
+#: g10/gpg.c:2451
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: op��es de importa��o inv�lidas\n"
 
-#: g10/gpg.c:2441
+#: g10/gpg.c:2454
 msgid "invalid import options\n"
 msgstr "op��es de importa��o inv�lidas\n"
 
-#: g10/gpg.c:2448
+#: g10/gpg.c:2461
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2464
 msgid "invalid export options\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2458
+#: g10/gpg.c:2471
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: op��es de importa��o inv�lidas\n"
 
-#: g10/gpg.c:2461
+#: g10/gpg.c:2474
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "op��es de importa��o inv�lidas\n"
 
-#: g10/gpg.c:2469
+#: g10/gpg.c:2482
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2471
+#: g10/gpg.c:2484
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2473
+#: g10/gpg.c:2486
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2475
+#: g10/gpg.c:2488
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2479
+#: g10/gpg.c:2492
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2481
+#: g10/gpg.c:2494
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
 
-#: g10/gpg.c:2483
+#: g10/gpg.c:2496
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2485
+#: g10/gpg.c:2498
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2505
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2495
+#: g10/gpg.c:2508
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2502
+#: g10/gpg.c:2515
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "n�o foi poss�vel alterar o exec-path para %s\n"
 
-#: g10/gpg.c:2705
+#: g10/gpg.c:2665
+#, fuzzy, c-format
+msgid "%s:%d: invalid auto-key-locate list\n"
+msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
+
+#: g10/gpg.c:2668
+msgid "invalid auto-key-locate list\n"
+msgstr ""
+
+#: g10/gpg.c:2736
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um ficheiro core!\n"
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2740
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s sobrep�e %s\n"
 
-#: g10/gpg.c:2718
+#: g10/gpg.c:2749
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: g10/gpg.c:2721
+#: g10/gpg.c:2752
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/gpg.c:2728
+#: g10/gpg.c:2759
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "o gpg-agent n�o est� dispon�vel nesta sess�o\n"
 
-#: g10/gpg.c:2743
+#: g10/gpg.c:2774
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/gpg.c:2757
+#: g10/gpg.c:2788
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "s� pode fazer assinaturas separadas ou em texto puro no modo --pgp2\n"
 
-#: g10/gpg.c:2763
+#: g10/gpg.c:2794
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "n�o pode assinar e cifrar ao mesmo tempo no modo --pgp2\n"
 
-#: g10/gpg.c:2769
+#: g10/gpg.c:2800
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "deve utilizar ficheiros (e n�o um 'pipe') quando trabalho no modo --pgp2.\n"
 
-#: g10/gpg.c:2782
+#: g10/gpg.c:2813
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "cifrar uma mensagem no modo --pgp2 necessita da cifra IDEA\n"
 
-#: g10/gpg.c:2849 g10/gpg.c:2873
+#: g10/gpg.c:2880 g10/gpg.c:2904
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado � inv�lido\n"
 
-#: g10/gpg.c:2855 g10/gpg.c:2879
+#: g10/gpg.c:2886 g10/gpg.c:2910
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado � inv�lido\n"
 
-#: g10/gpg.c:2861
+#: g10/gpg.c:2892
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado � inv�lido\n"
 
-#: g10/gpg.c:2867
+#: g10/gpg.c:2898
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" de certifica��o selecionado � inv�lido\n"
 
-#: g10/gpg.c:2882
+#: g10/gpg.c:2913
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2915
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2917
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth deve estar na entre 1 e 255\n"
 
-#: g10/gpg.c:2888
+#: g10/gpg.c:2919
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "n�vel de verifica��o por omiss�o inv�lido: deve ser 0, 1, 2 ou 3\n"
 
-#: g10/gpg.c:2890
+#: g10/gpg.c:2921
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "n�vel de verifica��o por omiss�o inv�lido: deve ser 0, 1, 2 ou 3\n"
 
-#: g10/gpg.c:2893
+#: g10/gpg.c:2924
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: o modo S2K simples (0) n�o � recomend�vel\n"
 
-#: g10/gpg.c:2897
+#: g10/gpg.c:2928
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2935
 msgid "invalid default preferences\n"
 msgstr "prefer�ncias por omiss�o inv�lidas\n"
 
-#: g10/gpg.c:2913
+#: g10/gpg.c:2944
 msgid "invalid personal cipher preferences\n"
 msgstr "prefer�ncias pessoais de cifra inv�lidas\n"
 
-#: g10/gpg.c:2917
+#: g10/gpg.c:2948
 msgid "invalid personal digest preferences\n"
 msgstr "prefer�ncias pessoais de 'digest' inv�lidas\n"
 
-#: g10/gpg.c:2921
+#: g10/gpg.c:2952
 msgid "invalid personal compress preferences\n"
 msgstr "prefer�ncias pessoais de compress�o inv�lidas\n"
 
-#: g10/gpg.c:2954
+#: g10/gpg.c:2985
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/gpg.c:3001
+#: g10/gpg.c:3032
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/gpg.c:3006
+#: g10/gpg.c:3037
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/gpg.c:3011
+#: g10/gpg.c:3042
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/gpg.c:3107
+#: g10/gpg.c:3138
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
 
-#: g10/gpg.c:3118
+#: g10/gpg.c:3149
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AVISO: destinat�rios (-r) dados sem utilizar uma cifra de chave p�blica\n"
 
-#: g10/gpg.c:3129
+#: g10/gpg.c:3160
 msgid "--store [filename]"
 msgstr "--store [nome_do_ficheiro]"
 
-#: g10/gpg.c:3136
+#: g10/gpg.c:3167
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_ficheiro]"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3169
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "decifragem falhou: %s\n"
 
-#: g10/gpg.c:3148
+#: g10/gpg.c:3179
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3192
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3194
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3166
+#: g10/gpg.c:3197
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/gpg.c:3184
+#: g10/gpg.c:3215
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_ficheiro]"
 
-#: g10/gpg.c:3197
+#: g10/gpg.c:3228
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3212
+#: g10/gpg.c:3243
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3214
+#: g10/gpg.c:3245
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3217
+#: g10/gpg.c:3248
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/gpg.c:3237
+#: g10/gpg.c:3268
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nome_do_ficheiro]"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3277
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_ficheiro]"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3302
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3310
 msgid "--sign-key user-id"
 msgstr "--sign-key id-utilizador"
 
-#: g10/gpg.c:3283
+#: g10/gpg.c:3314
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-utilizador"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3335
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-utilizador [comandos]"
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3406
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-utilizador] [porta-chaves]"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3443
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3445
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3447
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3427
+#: g10/gpg.c:3458
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3437
+#: g10/gpg.c:3468
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "actualiza��o da chave secreta falhou: %s\n"
 
-#: g10/gpg.c:3488
+#: g10/gpg.c:3519
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/gpg.c:3496
+#: g10/gpg.c:3527
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "cria��o de armadura falhou: %s\n"
 
-#: g10/gpg.c:3583
+#: g10/gpg.c:3614
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de dispers�o inv�lido `%s'\n"
 
-#: g10/gpg.c:3706
+#: g10/gpg.c:3737
 msgid "[filename]"
 msgstr "[nome_do_ficheiro]"
 
-#: g10/gpg.c:3710
+#: g10/gpg.c:3741
 msgid "Go ahead and type your message ...\n"
 msgstr "Digite a sua mensagem ...\n"
 
-#: g10/gpg.c:4000
+#: g10/gpg.c:4031
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1808,28 +1817,28 @@ msgstr ""
 "um nome de nota��o deve ter apenas caracteres imprim�veis ou espa�os, e "
 "terminar com um '='\n"
 
-#: g10/gpg.c:4008
+#: g10/gpg.c:4039
 msgid "a user notation name must contain the '@' character\n"
 msgstr "um valor de nota��o de utilizador n�o deve conter o caracter '@'\n"
 
-#: g10/gpg.c:4013
+#: g10/gpg.c:4044
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "um valor de nota��o de utilizador n�o deve conter o caracter '@'\n"
 
-#: g10/gpg.c:4024
+#: g10/gpg.c:4055
 msgid "a notation value must not use any control characters\n"
 msgstr "um valor de nota��o n�o deve usar caracteres de controle\n"
 
-#: g10/gpg.c:4058
+#: g10/gpg.c:4089
 msgid "the given certification policy URL is invalid\n"
 msgstr "a URL de pol�tica de certifica��o dada � inv�lida\n"
 
-#: g10/gpg.c:4060
+#: g10/gpg.c:4091
 msgid "the given signature policy URL is invalid\n"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
 
-#: g10/gpg.c:4093
+#: g10/gpg.c:4124
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
@@ -1838,32 +1847,33 @@ msgstr "a URL de pol
 msgid "too many entries in pk cache - disabled\n"
 msgstr "entradas demais no cache pk - desactivado\n"
 
-#: g10/getkey.c:188 g10/getkey.c:2845
+#: g10/getkey.c:188 g10/getkey.c:2876
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[Utilizador n�o encontrado]"
 
-#: g10/getkey.c:931 g10/getkey.c:953 g10/getkey.c:976
+#: g10/getkey.c:933 g10/getkey.c:950 g10/getkey.c:970 g10/getkey.c:986
+#: g10/getkey.c:1001
 #, c-format
 msgid "Automatically retrieved `%s' via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1769
+#: g10/getkey.c:1800
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Chave inv�lida %08lX tornada v�lida por --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2323
+#: g10/getkey.c:2354
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "h� uma chave secreta para a chave p�blica \"%s\"!\n"
 
-#: g10/getkey.c:2554
+#: g10/getkey.c:2585
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "usando chave secund�ria %08lX ao inv�s de chave prim�ria %08lX\n"
 
-#: g10/getkey.c:2601
+#: g10/getkey.c:2632
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
@@ -3440,12 +3450,12 @@ msgid "(sensitive)"
 msgstr " (sens�vel)"
 
 #: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
-#: g10/keylist.c:194 g10/keyserver.c:471
+#: g10/keylist.c:194 g10/keyserver.c:525
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:967
+#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:960
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "revkey"
@@ -3457,7 +3467,7 @@ msgstr "[expira: %s]"
 
 #: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
 #: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:477 g10/mainproc.c:973
+#: g10/keylist.c:914 g10/keyserver.c:531 g10/mainproc.c:966
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "[expira: %s]"
@@ -3493,14 +3503,14 @@ msgstr ""
 "N�o se esque�a que a validade de chave mostrada n�o � necess�riamente a\n"
 "correcta a n�o ser que reinicie o programa.\n"
 
-#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:481
-#: g10/mainproc.c:1734 g10/trustdb.c:1184 g10/trustdb.c:1704
+#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:535
+#: g10/mainproc.c:1783 g10/trustdb.c:1184 g10/trustdb.c:1704
 #, fuzzy
 msgid "revoked"
 msgstr "revkey"
 
-#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:485
-#: g10/mainproc.c:1736 g10/trustdb.c:537 g10/trustdb.c:1706
+#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:539
+#: g10/mainproc.c:1785 g10/trustdb.c:537 g10/trustdb.c:1706
 #, fuzzy
 msgid "expired"
 msgstr "expire"
@@ -4343,393 +4353,390 @@ msgstr "%s: porta-chaves criado\n"
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:77
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:81
+#: g10/keyserver.c:79
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:83
+#: g10/keyserver.c:81
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:87
+#: g10/keyserver.c:85
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:89
-msgid "automatically retrieve keys from PKA records"
-msgstr ""
-
-#: g10/keyserver.c:91
-msgid "automatically retrieve keys from DNS"
-msgstr ""
-
-#: g10/keyserver.c:95
+#: g10/keyserver.c:87
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
 
-#: g10/keyserver.c:139
+#: g10/keyserver.c:89
+msgid "honor the PKA record set on a key when retrieving keys"
+msgstr ""
+
+#: g10/keyserver.c:154
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "AVISO: op��es em `%s' ainda n�o est�o activas nesta execu��o\n"
 
-#: g10/keyserver.c:483
+#: g10/keyserver.c:537
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:684
+#: g10/keyserver.c:738
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:767 g10/keyserver.c:1368
+#: g10/keyserver.c:821 g10/keyserver.c:1422
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/keyserver.c:865
+#: g10/keyserver.c:919
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "chave `%s' n�o encontrada: %s\n"
 
-#: g10/keyserver.c:867
+#: g10/keyserver.c:921
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "chave `%s' n�o encontrada: %s\n"
 
-#: g10/keyserver.c:1092
+#: g10/keyserver.c:1146
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "a pedir a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1096
+#: g10/keyserver.c:1150
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "a pedir a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1120
+#: g10/keyserver.c:1174
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "a procurar por \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1123
+#: g10/keyserver.c:1177
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "a procurar por \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1271
+#: g10/keyserver.c:1325
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "a procurar por \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1275
+#: g10/keyserver.c:1329
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "assinado com a sua chave %08lX em %s\n"
 
-#: g10/keyserver.c:1318
+#: g10/keyserver.c:1372
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "a procurar por \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1321
+#: g10/keyserver.c:1375
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "a procurar por \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1328 g10/keyserver.c:1424
+#: g10/keyserver.c:1382 g10/keyserver.c:1478
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/keyserver.c:1376
+#: g10/keyserver.c:1430
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1439
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1446
+#: g10/keyserver.c:1500
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1452
+#: g10/keyserver.c:1506
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1464
+#: g10/keyserver.c:1518
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1469
+#: g10/keyserver.c:1523
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1477
+#: g10/keyserver.c:1531
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1484
+#: g10/keyserver.c:1538
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "erro do servidor de chaves"
 
-#: g10/keyserver.c:1489
+#: g10/keyserver.c:1543
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "erro do servidor de chaves"
 
-#: g10/keyserver.c:1498
+#: g10/keyserver.c:1552
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/keyserver.c:1523 g10/keyserver.c:1557
+#: g10/keyserver.c:1577 g10/keyserver.c:1611
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1814
+#: g10/keyserver.c:1868
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/keyserver.c:1836
+#: g10/keyserver.c:1890
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "a pedir a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1838
+#: g10/keyserver.c:1892
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "a pedir a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1903
+#: g10/keyserver.c:1957
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/keyserver.c:1909
+#: g10/keyserver.c:1963
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/mainproc.c:253
+#: g10/mainproc.c:240
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "tamanho estranho para uma chave de sess�o cifrada (%d)\n"
 
-#: g10/mainproc.c:304
+#: g10/mainproc.c:291
 #, fuzzy, c-format
 msgid "%s encrypted session key\n"
 msgstr "tamanho estranho para uma chave de sess�o cifrada (%d)\n"
 
-#: g10/mainproc.c:314
+#: g10/mainproc.c:301
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "cifrado com algoritmo desconhecido %d\n"
 
-#: g10/mainproc.c:395
+#: g10/mainproc.c:382
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "a chave p�blica � %08lX\n"
 
-#: g10/mainproc.c:450
+#: g10/mainproc.c:439
 msgid "public key encrypted data: good DEK\n"
 msgstr "dados cifrados com chave p�blica: DEK v�lido\n"
 
-#: g10/mainproc.c:483
+#: g10/mainproc.c:472
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "cifrado com chave %u-bit %s, ID %08lX, criada em %s\n"
 
-#: g10/mainproc.c:487 g10/pkclist.c:219
+#: g10/mainproc.c:476 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                   ou \""
 
-#: g10/mainproc.c:491
+#: g10/mainproc.c:480
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "cifrado com chave %s, ID %08lX\n"
 
-#: g10/mainproc.c:505
+#: g10/mainproc.c:494
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "decifragem de chave p�blica falhou: %s\n"
 
-#: g10/mainproc.c:519
+#: g10/mainproc.c:508
 #, fuzzy, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "Repita a frase secreta\n"
 
-#: g10/mainproc.c:521
+#: g10/mainproc.c:510
 #, fuzzy
 msgid "encrypted with 1 passphrase\n"
 msgstr "Repita a frase secreta\n"
 
-#: g10/mainproc.c:549 g10/mainproc.c:571
+#: g10/mainproc.c:541 g10/mainproc.c:563
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "a assumir dados cifrados %s\n"
 
-#: g10/mainproc.c:557
+#: g10/mainproc.c:549
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "Cifra IDEO n�o dispon�vel, a tentar utilizar %s em substitui��o\n"
 
-#: g10/mainproc.c:589
+#: g10/mainproc.c:581
 msgid "decryption okay\n"
 msgstr "decifragem correcta\n"
 
-#: g10/mainproc.c:593
+#: g10/mainproc.c:585
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVISO: a mensagem n�o tinha a sua integridade protegida\n"
 
-#: g10/mainproc.c:606
+#: g10/mainproc.c:598
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "CUIDADO: a mensagem cifrada foi manipulada!\n"
 
-#: g10/mainproc.c:612
+#: g10/mainproc.c:604
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decifragem falhou: %s\n"
 
-#: g10/mainproc.c:631
+#: g10/mainproc.c:623
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: o remetente solicitou \"apenas-para-seus-olhos\"\n"
 
-#: g10/mainproc.c:633
+#: g10/mainproc.c:625
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome do ficheiro original='%.*s'\n"
 
-#: g10/mainproc.c:822
+#: g10/mainproc.c:815
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revoca��o solit�ria - utilize \"gpg --import\" para aplicar\n"
 
-#: g10/mainproc.c:1168
+#: g10/mainproc.c:1161
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Assinatura correcta de \""
 
-#: g10/mainproc.c:1418
+#: g10/mainproc.c:1419
 msgid "signature verification suppressed\n"
 msgstr "verifica��o de assinatura suprimida\n"
 
-#: g10/mainproc.c:1460 g10/mainproc.c:1470
-msgid "can't handle these multiple signatures\n"
+#: g10/mainproc.c:1519
+#, fuzzy
+msgid "can't handle this ambiguous signature data\n"
 msgstr "n�o consigo tratar estas assinaturas m�ltiplas\n"
 
-#: g10/mainproc.c:1480
+#: g10/mainproc.c:1530
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/mainproc.c:1481
+#: g10/mainproc.c:1531
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1485
+#: g10/mainproc.c:1535
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Assinatura feita em %.*s usando %s, ID da chave %08lX\n"
 
-#: g10/mainproc.c:1505
+#: g10/mainproc.c:1555
 #, fuzzy
 msgid "Key available at: "
 msgstr "Nenhuma ajuda dispon�vel"
 
-#: g10/mainproc.c:1639 g10/mainproc.c:1687
+#: g10/mainproc.c:1688 g10/mainproc.c:1736
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Assinatura INCORRECTA de \""
 
-#: g10/mainproc.c:1641 g10/mainproc.c:1689
+#: g10/mainproc.c:1690 g10/mainproc.c:1738
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Assinatura expirada de \""
 
-#: g10/mainproc.c:1643 g10/mainproc.c:1691
+#: g10/mainproc.c:1692 g10/mainproc.c:1740
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Assinatura correcta de \""
 
-#: g10/mainproc.c:1695
+#: g10/mainproc.c:1744
 msgid "[uncertain]"
 msgstr "[incerto]"
 
-#: g10/mainproc.c:1727
+#: g10/mainproc.c:1776
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1824
+#: g10/mainproc.c:1873
 #, fuzzy, c-format
 msgid "Signature expired %s\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/mainproc.c:1829
+#: g10/mainproc.c:1878
 #, fuzzy, c-format
 msgid "Signature expires %s\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/mainproc.c:1832
+#: g10/mainproc.c:1881
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "assinatura %s de: \"%s\"\n"
 
-#: g10/mainproc.c:1833
+#: g10/mainproc.c:1882
 #, fuzzy
 msgid "binary"
 msgstr "primary"
 
-#: g10/mainproc.c:1834
+#: g10/mainproc.c:1883
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1834 g10/trustdb.c:536
+#: g10/mainproc.c:1883 g10/trustdb.c:536
 #, fuzzy
 msgid "unknown"
 msgstr "vers�o desconhecida"
 
-#: g10/mainproc.c:1854
+#: g10/mainproc.c:1903
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposs�vel verificar assinatura: %s\n"
 
-#: g10/mainproc.c:1922 g10/mainproc.c:1938 g10/mainproc.c:2024
+#: g10/mainproc.c:1972 g10/mainproc.c:1988 g10/mainproc.c:2074
 msgid "not a detached signature\n"
 msgstr "n�o � uma assinatura separada\n"
 
-#: g10/mainproc.c:1965
+#: g10/mainproc.c:2015
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "AVISO: v�rias assinaturas detectadas.  Apenas a primeira ser� verificada.\n"
 
-#: g10/mainproc.c:1973
+#: g10/mainproc.c:2023
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "assinatura de classe 0x%02x\n"
 
-#: g10/mainproc.c:2030
+#: g10/mainproc.c:2080
 msgid "old style (PGP 2.x) signature\n"
 msgstr "formato de assinatura antigo (PGP2.x)\n"
 
-#: g10/mainproc.c:2040
+#: g10/mainproc.c:2090
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pacote raiz inv�lido detectado em proc_tree()\n"
 
@@ -5295,23 +5302,23 @@ msgstr "dados n
 msgid "error creating `%s': %s\n"
 msgstr "erro ao criar `%s': %s\n"
 
-#: g10/plaintext.c:447
+#: g10/plaintext.c:453
 msgid "Detached signature.\n"
 msgstr "Assinatura separada.\n"
 
-#: g10/plaintext.c:453
+#: g10/plaintext.c:459
 msgid "Please enter name of data file: "
 msgstr "Por favor digite o nome do ficheiro de dados: "
 
-#: g10/plaintext.c:485
+#: g10/plaintext.c:491
 msgid "reading stdin ...\n"
 msgstr "lendo do \"stdin\" ...\n"
 
-#: g10/plaintext.c:519
+#: g10/plaintext.c:525
 msgid "no signed data\n"
 msgstr "n�o h� dados assinados\n"
 
-#: g10/plaintext.c:533
+#: g10/plaintext.c:539
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "imposs�vel abrir dados assinados `%s'\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 077a47211..794df08bf 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU gnupg 1.0\n"
 "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2006-02-14 15:28+0100\n"
+"POT-Creation-Date: 2006-03-07 11:29+0100\n"
 "PO-Revision-Date: 1998-11-20 23:46:36-0200\n"
 "Last-Translator:\n"
 "Language-Team: ?\n"
@@ -47,9 +47,9 @@ msgstr "escrevendo certificado privado para `%s'\n"
 
 #: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:992 g10/gpg.c:3360 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:997 g10/gpg.c:3391 g10/import.c:193 g10/keygen.c:2274
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:476 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
+#: g10/plaintext.c:482 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
 #: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
@@ -84,7 +84,7 @@ msgstr "imposs
 msgid "note: random_seed file not updated\n"
 msgstr ""
 
-#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:991 g10/keygen.c:2753
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2753
 #: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
 #: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
 #, fuzzy, c-format
@@ -701,51 +701,51 @@ msgstr "escrevendo certificado privado para `%s'\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando inv�lido (tente \"help\")\n"
 
-#: g10/cardglue.c:435
+#: g10/cardglue.c:434
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:572
+#: g10/cardglue.c:573
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:580
+#: g10/cardglue.c:582
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:915
+#: g10/cardglue.c:917
 #, fuzzy
 msgid "Enter New Admin PIN: "
 msgstr "Digite o identificador de usu�rio: "
 
-#: g10/cardglue.c:916
+#: g10/cardglue.c:918
 #, fuzzy
 msgid "Enter New PIN: "
 msgstr "Digite o identificador de usu�rio: "
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:919
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:920
 #, fuzzy
 msgid "Enter PIN: "
 msgstr "Digite o identificador de usu�rio: "
 
-#: g10/cardglue.c:935
+#: g10/cardglue.c:937
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Repita a frase secreta: "
 
-#: g10/cardglue.c:950
+#: g10/cardglue.c:952
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "A frase secreta n�o foi repetida corretamente; tente outra vez.\n"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3720 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3751 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -755,13 +755,13 @@ msgstr "imposs
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1644
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1698
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "usu�rio `%s' n�o encontrado: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1658
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1712
 #: g10/revoke.c:234 g10/revoke.c:478
 #, fuzzy, c-format
 msgid "error reading keyblock: %s\n"
@@ -871,12 +871,12 @@ msgstr ""
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s criptografado para: %s\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:306
+#: g10/encr-data.c:67 g10/mainproc.c:293
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "dados criptografados com %s\n"
 
-#: g10/encr-data.c:69 g10/mainproc.c:310
+#: g10/encr-data.c:69 g10/mainproc.c:297
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "criptografado com algoritmo desconhecido %d\n"
@@ -1017,7 +1017,7 @@ msgstr ""
 msgid "WARNING: nothing exported\n"
 msgstr "AVISO: nada exportado\n"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:373
 msgid ""
 "@Commands:\n"
 " "
@@ -1025,134 +1025,134 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: g10/gpg.c:374
+#: g10/gpg.c:375
 msgid "|[file]|make a signature"
 msgstr "|[arquivo]|fazer uma assinatura"
 
-#: g10/gpg.c:375
+#: g10/gpg.c:376
 msgid "|[file]|make a clear text signature"
 msgstr "|[arquivo]|fazer uma assinatura em texto puro"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:377
 msgid "make a detached signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/gpg.c:377
+#: g10/gpg.c:378
 msgid "encrypt data"
 msgstr "criptografar dados"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:380
 msgid "encryption only with symmetric cipher"
 msgstr ""
 "criptografar apenas com criptografia\n"
 "sim�trica"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:382
 msgid "decrypt data (default)"
 msgstr "descriptografar dados (padr�o)"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:384
 msgid "verify a signature"
 msgstr "verificar uma assinatura"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:386
 msgid "list keys"
 msgstr "listar as chaves"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "list keys and signatures"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:389
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:390
 msgid "list keys and fingerprints"
 msgstr "listar as chaves e as impress�es digitais"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:391
 msgid "list secret keys"
 msgstr "listar as chaves secretas"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:392
 msgid "generate a new key pair"
 msgstr "gerar um novo par de chaves"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:393
 #, fuzzy
 msgid "remove keys from the public keyring"
 msgstr "remover a chave do chaveiro p�blico"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:395
 #, fuzzy
 msgid "remove keys from the secret keyring"
 msgstr "remover a chave do chaveiro secreto"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:396
 msgid "sign a key"
 msgstr "assinar uma chave"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:397
 msgid "sign a key locally"
 msgstr "assinar uma chave localmente"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:398
 msgid "sign or edit a key"
 msgstr "assinar ou editar uma chave"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:399
 msgid "generate a revocation certificate"
 msgstr "gerar um certificado de revoga��o"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:401
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:402
 msgid "export keys to a key server"
 msgstr "exportar chaves para um servidor"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:403
 msgid "import keys from a key server"
 msgstr "importar chaves de um servidor"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:405
 #, fuzzy
 msgid "search for keys on a key server"
 msgstr "exportar chaves para um servidor"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:407
 #, fuzzy
 msgid "update all keys from a keyserver"
 msgstr "importar chaves de um servidor"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:411
 msgid "import/merge keys"
 msgstr "importar/fundir chaves"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:414
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:414
+#: g10/gpg.c:415
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:415
+#: g10/gpg.c:416
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:423
+#: g10/gpg.c:424
 msgid "update the trust database"
 msgstr "atualizar o banco de dados de confiabilidade"
 
-#: g10/gpg.c:430
+#: g10/gpg.c:431
 msgid "|algo [files]|print message digests"
 msgstr "|algo [arquivos]|imprimir \"digests\" de mensagens"
 
-#: g10/gpg.c:434 g10/gpgv.c:71
+#: g10/gpg.c:435 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1162,61 +1162,61 @@ msgstr ""
 "Op��es:\n"
 " "
 
-#: g10/gpg.c:436
+#: g10/gpg.c:437
 msgid "create ascii armored output"
 msgstr "criar sa�da com armadura ascii"
 
-#: g10/gpg.c:438
+#: g10/gpg.c:439
 msgid "|NAME|encrypt for NAME"
 msgstr "|NOME|criptografar para NOME"
 
-#: g10/gpg.c:449
+#: g10/gpg.c:450
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "usar este identificador de usu�rio para\n"
 "assinar ou descriptografar"
 
-#: g10/gpg.c:450
+#: g10/gpg.c:451
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|estabelecer n�vel de compress�o N\n"
 "(0 desabilita)"
 
-#: g10/gpg.c:455
+#: g10/gpg.c:456
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:470
 msgid "use as output file"
 msgstr "usar como arquivo de sa�da"
 
-#: g10/gpg.c:471 g10/gpgv.c:73
+#: g10/gpg.c:472 g10/gpgv.c:73
 msgid "verbose"
 msgstr "detalhado"
 
-#: g10/gpg.c:482
+#: g10/gpg.c:483
 msgid "do not make any changes"
 msgstr "n�o fazer altera��es"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:484
 msgid "prompt before overwriting"
 msgstr ""
 
-#: g10/gpg.c:524
+#: g10/gpg.c:525
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:553
+#: g10/gpg.c:554
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/gpg.c:556
+#: g10/gpg.c:557
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1236,15 +1236,15 @@ msgstr ""
 " --list-keys [nomes]        mostrar chaves\n"
 " --fingerprint [nomes]      mostrar impress�es digitais\n"
 
-#: g10/gpg.c:746 g10/gpgv.c:98
+#: g10/gpg.c:751 g10/gpgv.c:98
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Por favor comunique bugs para <gnupg-bugs@gnu.org>.\n"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:768
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
 
-#: g10/gpg.c:766
+#: g10/gpg.c:771
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1254,7 +1254,7 @@ msgstr ""
 "assina, verifica, criptografa ou descriptografa\n"
 "a opera��o padr�o depende dos dados de entrada\n"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:782
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1262,561 +1262,570 @@ msgstr ""
 "\n"
 "Algoritmos suportados:\n"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:785
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/gpg.c:786 g10/keyedit.c:2266
+#: g10/gpg.c:791 g10/keyedit.c:2266
 msgid "Cipher: "
 msgstr ""
 
-#: g10/gpg.c:792
+#: g10/gpg.c:797
 msgid "Hash: "
 msgstr ""
 
-#: g10/gpg.c:798 g10/keyedit.c:2312
+#: g10/gpg.c:803 g10/keyedit.c:2312
 #, fuzzy
 msgid "Compression: "
 msgstr "Coment�rio: "
 
-#: g10/gpg.c:881
+#: g10/gpg.c:886
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [op��es] "
 
-#: g10/gpg.c:1029
+#: g10/gpg.c:1034
 msgid "conflicting commands\n"
 msgstr "comandos conflitantes\n"
 
-#: g10/gpg.c:1047
+#: g10/gpg.c:1052
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr ""
 
-#: g10/gpg.c:1244
+#: g10/gpg.c:1249
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1247
+#: g10/gpg.c:1252
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1250
+#: g10/gpg.c:1255
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1256
+#: g10/gpg.c:1261
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1259
+#: g10/gpg.c:1264
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1262
+#: g10/gpg.c:1267
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1268
+#: g10/gpg.c:1273
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1271
+#: g10/gpg.c:1276
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1274
+#: g10/gpg.c:1279
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1280
+#: g10/gpg.c:1285
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1283
+#: g10/gpg.c:1288
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1286
+#: g10/gpg.c:1291
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1427
+#: g10/gpg.c:1432
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1521
+#: g10/gpg.c:1526
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1523
+#: g10/gpg.c:1528
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1525
+#: g10/gpg.c:1530
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
 
-#: g10/gpg.c:1527
+#: g10/gpg.c:1532
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1536
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1538
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1540
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1542
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1544
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1546
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "alterna entre listagem de chave secreta e p�blica"
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1548
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
 
-#: g10/gpg.c:1874
+#: g10/gpg.c:1879
 #, fuzzy, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTA: arquivo de op��es padr�o `%s' inexistente\n"
 
-#: g10/gpg.c:1916
+#: g10/gpg.c:1921
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTA: arquivo de op��es padr�o `%s' inexistente\n"
 
-#: g10/gpg.c:1920
+#: g10/gpg.c:1925
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "arquivo de op��es `%s': %s\n"
 
-#: g10/gpg.c:1927
+#: g10/gpg.c:1932
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo op��es de `%s'\n"
 
-#: g10/gpg.c:2142 g10/gpg.c:2716 g10/gpg.c:2735
+#: g10/gpg.c:2147 g10/gpg.c:2747 g10/gpg.c:2766
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s n�o � para uso normal!\n"
 
-#: g10/gpg.c:2158
+#: g10/gpg.c:2163
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 
-#: g10/gpg.c:2312 g10/gpg.c:2324
+#: g10/gpg.c:2317 g10/gpg.c:2329
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2400
+#: g10/gpg.c:2405
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2422 g10/keyedit.c:3997
+#: g10/gpg.c:2429 g10/keyedit.c:3997
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
 
-#: g10/gpg.c:2428
+#: g10/gpg.c:2441
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2431
+#: g10/gpg.c:2444
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/gpg.c:2438
+#: g10/gpg.c:2451
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2441
+#: g10/gpg.c:2454
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "armadura inv�lida"
 
-#: g10/gpg.c:2448
+#: g10/gpg.c:2461
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2464
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/gpg.c:2458
+#: g10/gpg.c:2471
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2461
+#: g10/gpg.c:2474
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "armadura inv�lida"
 
-#: g10/gpg.c:2469
+#: g10/gpg.c:2482
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2471
+#: g10/gpg.c:2484
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2473
+#: g10/gpg.c:2486
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2475
+#: g10/gpg.c:2488
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2479
+#: g10/gpg.c:2492
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2481
+#: g10/gpg.c:2494
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/gpg.c:2483
+#: g10/gpg.c:2496
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2485
+#: g10/gpg.c:2498
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2505
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2495
+#: g10/gpg.c:2508
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/gpg.c:2502
+#: g10/gpg.c:2515
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2705
+#: g10/gpg.c:2665
+#, fuzzy, c-format
+msgid "%s:%d: invalid auto-key-locate list\n"
+msgstr "AVISO: `%s' � um arquivo vazio\n"
+
+#: g10/gpg.c:2668
+msgid "invalid auto-key-locate list\n"
+msgstr ""
+
+#: g10/gpg.c:2736
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um arquivo core!\n"
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2740
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/gpg.c:2718
+#: g10/gpg.c:2749
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: g10/gpg.c:2721
+#: g10/gpg.c:2752
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/gpg.c:2728
+#: g10/gpg.c:2759
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "chave RSA n�o pode ser usada nesta vers�o\n"
 
-#: g10/gpg.c:2743
+#: g10/gpg.c:2774
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/gpg.c:2757
+#: g10/gpg.c:2788
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:2763
+#: g10/gpg.c:2794
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:2769
+#: g10/gpg.c:2800
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/gpg.c:2782
+#: g10/gpg.c:2813
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/gpg.c:2849 g10/gpg.c:2873
+#: g10/gpg.c:2880 g10/gpg.c:2904
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:2855 g10/gpg.c:2879
+#: g10/gpg.c:2886 g10/gpg.c:2910
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:2861
+#: g10/gpg.c:2892
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:2867
+#: g10/gpg.c:2898
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:2882
+#: g10/gpg.c:2913
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2915
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2917
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth deve estar na entre 1 e 255\n"
 
-#: g10/gpg.c:2888
+#: g10/gpg.c:2919
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
 
-#: g10/gpg.c:2890
+#: g10/gpg.c:2921
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
 
-#: g10/gpg.c:2893
+#: g10/gpg.c:2924
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: o modo S2K simples (0) n�o � recomend�vel\n"
 
-#: g10/gpg.c:2897
+#: g10/gpg.c:2928
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2935
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/gpg.c:2913
+#: g10/gpg.c:2944
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/gpg.c:2917
+#: g10/gpg.c:2948
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/gpg.c:2921
+#: g10/gpg.c:2952
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/gpg.c:2954
+#: g10/gpg.c:2985
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/gpg.c:3001
+#: g10/gpg.c:3032
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3006
+#: g10/gpg.c:3037
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3011
+#: g10/gpg.c:3042
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:3107
+#: g10/gpg.c:3138
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
 
-#: g10/gpg.c:3118
+#: g10/gpg.c:3149
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3129
+#: g10/gpg.c:3160
 msgid "--store [filename]"
 msgstr "--store [nome_do_arquivo]"
 
-#: g10/gpg.c:3136
+#: g10/gpg.c:3167
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3169
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "descriptografia falhou: %s\n"
 
-#: g10/gpg.c:3148
+#: g10/gpg.c:3179
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3192
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3194
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3166
+#: g10/gpg.c:3197
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3184
+#: g10/gpg.c:3215
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_arquivo]"
 
-#: g10/gpg.c:3197
+#: g10/gpg.c:3228
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3212
+#: g10/gpg.c:3243
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3214
+#: g10/gpg.c:3245
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3217
+#: g10/gpg.c:3248
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3237
+#: g10/gpg.c:3268
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3277
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_arquivo]"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3302
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3310
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usu�rio"
 
-#: g10/gpg.c:3283
+#: g10/gpg.c:3314
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usu�rio"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3335
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usu�rio [comandos]"
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3406
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-usu�rio] [chaveiro]"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3443
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3445
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "enumera��o de chaves secretas falhou: %s\n"
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3447
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3427
+#: g10/gpg.c:3458
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "get_dir_record: search_record falhou: %s\n"
 
-#: g10/gpg.c:3437
+#: g10/gpg.c:3468
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "enumera��o de chaves secretas falhou: %s\n"
 
-#: g10/gpg.c:3488
+#: g10/gpg.c:3519
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/gpg.c:3496
+#: g10/gpg.c:3527
 #, 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/gpg.c:3583
+#: g10/gpg.c:3614
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash inv�lido `%s'\n"
 
-#: g10/gpg.c:3706
+#: g10/gpg.c:3737
 msgid "[filename]"
 msgstr "[nome_do_arquivo]"
 
-#: g10/gpg.c:3710
+#: g10/gpg.c:3741
 msgid "Go ahead and type your message ...\n"
 msgstr "V� em frente e digite sua mensagem ...\n"
 
-#: g10/gpg.c:4000
+#: g10/gpg.c:4031
 #, fuzzy
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
@@ -1825,31 +1834,31 @@ msgstr ""
 "um nome de nota��o deve ter apenas letras, d�gitos, pontos ou sublinhados e "
 "terminar com '='\n"
 
-#: g10/gpg.c:4008
+#: g10/gpg.c:4039
 #, fuzzy
 msgid "a user notation name must contain the '@' character\n"
 msgstr "um valor de nota��o n�o deve usar caracteres de controle\n"
 
-#: g10/gpg.c:4013
+#: g10/gpg.c:4044
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "um valor de nota��o n�o deve usar caracteres de controle\n"
 
-#: g10/gpg.c:4024
+#: g10/gpg.c:4055
 msgid "a notation value must not use any control characters\n"
 msgstr "um valor de nota��o n�o deve usar caracteres de controle\n"
 
-#: g10/gpg.c:4058
+#: g10/gpg.c:4089
 #, fuzzy
 msgid "the given certification policy URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/gpg.c:4060
+#: g10/gpg.c:4091
 #, fuzzy
 msgid "the given signature policy URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/gpg.c:4093
+#: g10/gpg.c:4124
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
@@ -1858,32 +1867,33 @@ msgstr "a URL de pol
 msgid "too many entries in pk cache - disabled\n"
 msgstr "entradas demais no cache pk - desativado\n"
 
-#: g10/getkey.c:188 g10/getkey.c:2845
+#: g10/getkey.c:188 g10/getkey.c:2876
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[usu�rio n�o encontrado]"
 
-#: g10/getkey.c:931 g10/getkey.c:953 g10/getkey.c:976
+#: g10/getkey.c:933 g10/getkey.c:950 g10/getkey.c:970 g10/getkey.c:986
+#: g10/getkey.c:1001
 #, c-format
 msgid "Automatically retrieved `%s' via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1769
+#: g10/getkey.c:1800
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 
-#: g10/getkey.c:2323
+#: g10/getkey.c:2354
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "h� uma chave secreta para esta chave p�blica!\n"
 
-#: g10/getkey.c:2554
+#: g10/getkey.c:2585
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "usando chave secund�ria %08lX ao inv�s de chave prim�ria %08lX\n"
 
-#: g10/getkey.c:2601
+#: g10/getkey.c:2632
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
@@ -3389,12 +3399,12 @@ msgid "(sensitive)"
 msgstr ""
 
 #: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
-#: g10/keylist.c:194 g10/keyserver.c:471
+#: g10/keylist.c:194 g10/keyserver.c:525
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:967
+#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:960
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "revkey"
@@ -3406,7 +3416,7 @@ msgstr "A chave expira em %s\n"
 
 #: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
 #: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:477 g10/mainproc.c:973
+#: g10/keylist.c:914 g10/keyserver.c:531 g10/mainproc.c:966
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "A chave expira em %s\n"
@@ -3440,14 +3450,14 @@ msgid ""
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:481
-#: g10/mainproc.c:1734 g10/trustdb.c:1184 g10/trustdb.c:1704
+#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:535
+#: g10/mainproc.c:1783 g10/trustdb.c:1184 g10/trustdb.c:1704
 #, fuzzy
 msgid "revoked"
 msgstr "revkey"
 
-#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:485
-#: g10/mainproc.c:1736 g10/trustdb.c:537 g10/trustdb.c:1706
+#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:539
+#: g10/mainproc.c:1785 g10/trustdb.c:537 g10/trustdb.c:1706
 #, fuzzy
 msgid "expired"
 msgstr "expire"
@@ -4300,394 +4310,390 @@ msgstr "%s: chaveiro criado\n"
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:77
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:81
+#: g10/keyserver.c:79
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:83
+#: g10/keyserver.c:81
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:87
+#: g10/keyserver.c:85
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:89
-msgid "automatically retrieve keys from PKA records"
-msgstr ""
-
-#: g10/keyserver.c:91
-msgid "automatically retrieve keys from DNS"
-msgstr ""
-
-#: g10/keyserver.c:95
+#: g10/keyserver.c:87
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/keyserver.c:139
+#: g10/keyserver.c:89
+msgid "honor the PKA record set on a key when retrieving keys"
+msgstr ""
+
+#: g10/keyserver.c:154
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 
-#: g10/keyserver.c:483
+#: g10/keyserver.c:537
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:684
+#: g10/keyserver.c:738
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:767 g10/keyserver.c:1368
+#: g10/keyserver.c:821 g10/keyserver.c:1422
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/keyserver.c:865
+#: g10/keyserver.c:919
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "usu�rio `%s' n�o encontrado: %s\n"
 
-#: g10/keyserver.c:867
+#: g10/keyserver.c:921
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "usu�rio `%s' n�o encontrado: %s\n"
 
-#: g10/keyserver.c:1092
+#: g10/keyserver.c:1146
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
 
-#: g10/keyserver.c:1096
+#: g10/keyserver.c:1150
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
 
-#: g10/keyserver.c:1120
+#: g10/keyserver.c:1174
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "exportar chaves para um servidor"
 
-#: g10/keyserver.c:1123
+#: g10/keyserver.c:1177
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "lendo op��es de `%s'\n"
 
-#: g10/keyserver.c:1271
+#: g10/keyserver.c:1325
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1275
+#: g10/keyserver.c:1329
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "assinado com sua chave %08lX em %s\n"
 
-#: g10/keyserver.c:1318
+#: g10/keyserver.c:1372
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "exportar chaves para um servidor"
 
-#: g10/keyserver.c:1321
+#: g10/keyserver.c:1375
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "lendo op��es de `%s'\n"
 
-#: g10/keyserver.c:1328 g10/keyserver.c:1424
+#: g10/keyserver.c:1382 g10/keyserver.c:1478
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/keyserver.c:1376
+#: g10/keyserver.c:1430
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1439
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1446
+#: g10/keyserver.c:1500
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1452
+#: g10/keyserver.c:1506
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1464
+#: g10/keyserver.c:1518
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1469
+#: g10/keyserver.c:1523
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1477
+#: g10/keyserver.c:1531
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1484
+#: g10/keyserver.c:1538
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "erro geral"
 
-#: g10/keyserver.c:1489
+#: g10/keyserver.c:1543
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "erro geral"
 
-#: g10/keyserver.c:1498
+#: g10/keyserver.c:1552
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "enumera��o de chaves secretas falhou: %s\n"
 
-#: g10/keyserver.c:1523 g10/keyserver.c:1557
+#: g10/keyserver.c:1577 g10/keyserver.c:1611
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s n�o � um mapa de caracteres v�lido\n"
 
-#: g10/keyserver.c:1814
+#: g10/keyserver.c:1868
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/keyserver.c:1836
+#: g10/keyserver.c:1890
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
 
-#: g10/keyserver.c:1838
+#: g10/keyserver.c:1892
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
 
-#: g10/keyserver.c:1903
+#: g10/keyserver.c:1957
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/keyserver.c:1909
+#: g10/keyserver.c:1963
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/mainproc.c:253
+#: g10/mainproc.c:240
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr ""
 
-#: g10/mainproc.c:304
+#: g10/mainproc.c:291
 #, fuzzy, c-format
 msgid "%s encrypted session key\n"
 msgstr "dados criptografados com %s\n"
 
-#: g10/mainproc.c:314
+#: g10/mainproc.c:301
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "criptografado com algoritmo desconhecido %d\n"
 
-#: g10/mainproc.c:395
+#: g10/mainproc.c:382
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "a chave p�blica � %08lX\n"
 
-#: g10/mainproc.c:450
+#: g10/mainproc.c:439
 msgid "public key encrypted data: good DEK\n"
 msgstr "dados criptografados com chave p�blica: DEK v�lido\n"
 
-#: g10/mainproc.c:483
+#: g10/mainproc.c:472
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "criptografado com chave %u-bit %s, ID %08lX, criada em %s\n"
 
-#: g10/mainproc.c:487 g10/pkclist.c:219
+#: g10/mainproc.c:476 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                   ou \""
 
-#: g10/mainproc.c:491
+#: g10/mainproc.c:480
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "criptografado com chave %s, ID %08lX\n"
 
-#: g10/mainproc.c:505
+#: g10/mainproc.c:494
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "descriptografia de chave p�blica falhou: %s\n"
 
-#: g10/mainproc.c:519
+#: g10/mainproc.c:508
 #, fuzzy, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "Repita a frase secreta: "
 
-#: g10/mainproc.c:521
+#: g10/mainproc.c:510
 #, fuzzy
 msgid "encrypted with 1 passphrase\n"
 msgstr "Repita a frase secreta: "
 
-#: g10/mainproc.c:549 g10/mainproc.c:571
+#: g10/mainproc.c:541 g10/mainproc.c:563
 #, fuzzy, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "dados criptografados com %s\n"
 
-#: g10/mainproc.c:557
+#: g10/mainproc.c:549
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 
-#: g10/mainproc.c:589
+#: g10/mainproc.c:581
 msgid "decryption okay\n"
 msgstr "descriptografia correta\n"
 
-#: g10/mainproc.c:593
+#: g10/mainproc.c:585
 #, fuzzy
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVISO: nada exportado\n"
 
-#: g10/mainproc.c:606
+#: g10/mainproc.c:598
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "CUIDADO: a mensagem criptografada foi manipulada!\n"
 
-#: g10/mainproc.c:612
+#: g10/mainproc.c:604
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "descriptografia falhou: %s\n"
 
-#: g10/mainproc.c:631
+#: g10/mainproc.c:623
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOTA: o remetente solicitou \"apenas-para-seus-olhos\"\n"
 
-#: g10/mainproc.c:633
+#: g10/mainproc.c:625
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nome de arquivo original='%.*s'\n"
 
-#: g10/mainproc.c:822
+#: g10/mainproc.c:815
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revoga��o isolada - use \"gpg --import\" para aplic�-la\n"
 
-#: g10/mainproc.c:1168
+#: g10/mainproc.c:1161
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Assinatura correta de \""
 
-#: g10/mainproc.c:1418
+#: g10/mainproc.c:1419
 msgid "signature verification suppressed\n"
 msgstr "verifica��o de assinatura suprimida\n"
 
-#: g10/mainproc.c:1460 g10/mainproc.c:1470
+#: g10/mainproc.c:1519
 #, fuzzy
-msgid "can't handle these multiple signatures\n"
+msgid "can't handle this ambiguous signature data\n"
 msgstr "fazer uma assinatura separada"
 
-#: g10/mainproc.c:1480
+#: g10/mainproc.c:1530
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/mainproc.c:1481
+#: g10/mainproc.c:1531
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1485
+#: g10/mainproc.c:1535
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Assinatura feita em %.*s usando %s, ID da chave %08lX\n"
 
-#: g10/mainproc.c:1505
+#: g10/mainproc.c:1555
 #, fuzzy
 msgid "Key available at: "
 msgstr "Nenhuma ajuda dispon�vel"
 
-#: g10/mainproc.c:1639 g10/mainproc.c:1687
+#: g10/mainproc.c:1688 g10/mainproc.c:1736
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Assinatura INCORRETA de \""
 
-#: g10/mainproc.c:1641 g10/mainproc.c:1689
+#: g10/mainproc.c:1690 g10/mainproc.c:1738
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Assinatura correta de \""
 
-#: g10/mainproc.c:1643 g10/mainproc.c:1691
+#: g10/mainproc.c:1692 g10/mainproc.c:1740
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Assinatura correta de \""
 
-#: g10/mainproc.c:1695
+#: g10/mainproc.c:1744
 msgid "[uncertain]"
 msgstr ""
 
-#: g10/mainproc.c:1727
+#: g10/mainproc.c:1776
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                   ou \""
 
-#: g10/mainproc.c:1824
+#: g10/mainproc.c:1873
 #, fuzzy, c-format
 msgid "Signature expired %s\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/mainproc.c:1829
+#: g10/mainproc.c:1878
 #, fuzzy, c-format
 msgid "Signature expires %s\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/mainproc.c:1832
+#: g10/mainproc.c:1881
 #, fuzzy, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "assinatura %s de: %s\n"
 
-#: g10/mainproc.c:1833
+#: g10/mainproc.c:1882
 msgid "binary"
 msgstr ""
 
-#: g10/mainproc.c:1834
+#: g10/mainproc.c:1883
 msgid "textmode"
 msgstr ""
 
-#: g10/mainproc.c:1834 g10/trustdb.c:536
+#: g10/mainproc.c:1883 g10/trustdb.c:536
 #, fuzzy
 msgid "unknown"
 msgstr "vers�o desconhecida"
 
-#: g10/mainproc.c:1854
+#: g10/mainproc.c:1903
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Imposs�vel verificar assinatura: %s\n"
 
-#: g10/mainproc.c:1922 g10/mainproc.c:1938 g10/mainproc.c:2024
+#: g10/mainproc.c:1972 g10/mainproc.c:1988 g10/mainproc.c:2074
 #, fuzzy
 msgid "not a detached signature\n"
 msgstr "fazer uma assinatura separada"
 
-#: g10/mainproc.c:1965
+#: g10/mainproc.c:2015
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 
-#: g10/mainproc.c:1973
+#: g10/mainproc.c:2023
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "assinatura isolada da classe 0x%02x\n"
 
-#: g10/mainproc.c:2030
+#: g10/mainproc.c:2080
 msgid "old style (PGP 2.x) signature\n"
 msgstr "formato de assinatura antigo (PGP2.x)\n"
 
-#: g10/mainproc.c:2040
+#: g10/mainproc.c:2090
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pacote raiz inv�lido detectado em proc_tree()\n"
 
@@ -5255,24 +5261,24 @@ msgstr "dados n
 msgid "error creating `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/plaintext.c:447
+#: g10/plaintext.c:453
 msgid "Detached signature.\n"
 msgstr "Assinatura separada.\n"
 
-#: g10/plaintext.c:453
+#: g10/plaintext.c:459
 msgid "Please enter name of data file: "
 msgstr "Por favor digite o nome do arquivo de dados: "
 
-#: g10/plaintext.c:485
+#: g10/plaintext.c:491
 msgid "reading stdin ...\n"
 msgstr "lendo de \"stdin\" ...\n"
 
-#: g10/plaintext.c:519
+#: g10/plaintext.c:525
 #, fuzzy
 msgid "no signed data\n"
 msgstr "no dados assinados\n"
 
-#: g10/plaintext.c:533
+#: g10/plaintext.c:539
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "imposs�vel abrir dados assinados `%s'\n"
diff --git a/po/ro.po b/po/ro.po
index 9a4caff5b..6910e9bbc 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.2rc1\n"
 "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2006-02-14 15:28+0100\n"
+"POT-Creation-Date: 2006-03-07 11:29+0100\n"
 "PO-Revision-Date: 2005-05-31 22:00-0500\n"
 "Last-Translator: Laurentiu Buzdugan <lbuz@rolix.org>\n"
 "Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
@@ -44,9 +44,9 @@ msgstr "scriu cheia secret
 
 #: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:992 g10/gpg.c:3360 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:997 g10/gpg.c:3391 g10/import.c:193 g10/keygen.c:2274
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:476 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
+#: g10/plaintext.c:482 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
 #: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
@@ -82,7 +82,7 @@ msgstr "nu pot citi `%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "not�: fi�ierul random_seed nu a fost actualizat\n"
 
-#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:991 g10/keygen.c:2753
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2753
 #: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
 #: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
 #, c-format
@@ -669,13 +669,13 @@ msgstr "Nu sunt permise comenzi administrare\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comand� invalid�  (�ncerca�i \"ajutor\")\n"
 
-#: g10/cardglue.c:435
+#: g10/cardglue.c:434
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 "V� rug�m introduce�i cardul �i ap�sa�i return sau ap�sa�i 'c' pentru a "
 "renun�a: "
 
-#: g10/cardglue.c:572
+#: g10/cardglue.c:573
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
@@ -684,35 +684,35 @@ msgstr ""
 "V� rug�m scoate�i cardul curent �i introduca�i unul cu num�r de serie:\n"
 "   %.*s\n"
 
-#: g10/cardglue.c:580
+#: g10/cardglue.c:582
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr "Ap�sa�i return c�nd sunte�i gata sau ap�sa�i 'c' pentru a renun�a: "
 
-#: g10/cardglue.c:915
+#: g10/cardglue.c:917
 msgid "Enter New Admin PIN: "
 msgstr "Introduce�i noul PIN Admin: "
 
-#: g10/cardglue.c:916
+#: g10/cardglue.c:918
 msgid "Enter New PIN: "
 msgstr "introduce�i noul PIN: "
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:919
 msgid "Enter Admin PIN: "
 msgstr "Introduce�i PIN Admin: "
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:920
 msgid "Enter PIN: "
 msgstr "Introduce�i PIN: "
 
-#: g10/cardglue.c:935
+#: g10/cardglue.c:937
 msgid "Repeat this PIN: "
 msgstr "Repeta�i acest PIN: "
 
-#: g10/cardglue.c:950
+#: g10/cardglue.c:952
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN-ul nu a fost repetat corect; mai �ncerca�i o dat�"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3720 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3751 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -722,13 +722,13 @@ msgstr "nu pot deschide `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output nu merge pentru aceast� comand�\n"
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1644
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1698
 #: g10/revoke.c:228
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "cheia \"%s\" nu a fost g�sit�: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1658
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1712
 #: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -842,12 +842,12 @@ msgstr "nu pute
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s cifrat pentru: \"%s\"\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:306
+#: g10/encr-data.c:67 g10/mainproc.c:293
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s date cifrate\n"
 
-#: g10/encr-data.c:69 g10/mainproc.c:310
+#: g10/encr-data.c:69 g10/mainproc.c:297
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "cifrat cu un algoritm necunoscut %d\n"
@@ -987,7 +987,7 @@ msgstr "AVERTISMENT: cheia secret
 msgid "WARNING: nothing exported\n"
 msgstr "AVERTISMENT: nimic exportat\n"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:373
 msgid ""
 "@Commands:\n"
 " "
@@ -995,127 +995,127 @@ msgstr ""
 "@Comenzi:\n"
 " "
 
-#: g10/gpg.c:374
+#: g10/gpg.c:375
 msgid "|[file]|make a signature"
 msgstr "|[fi�ier]|creaz� o semn�tur�"
 
-#: g10/gpg.c:375
+#: g10/gpg.c:376
 msgid "|[file]|make a clear text signature"
 msgstr "|[fi�ier]|creaz� o semn�tur� text �n clar"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:377
 msgid "make a detached signature"
 msgstr "creaz� o semn�tur� deta�at�"
 
-#: g10/gpg.c:377
+#: g10/gpg.c:378
 msgid "encrypt data"
 msgstr "cifreaz� datele"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:380
 msgid "encryption only with symmetric cipher"
 msgstr "cifreaz� numai cu cifru simetric"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:382
 msgid "decrypt data (default)"
 msgstr "decripteaz� datele (implicit)"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:384
 msgid "verify a signature"
 msgstr "verific� o semn�tur�"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:386
 msgid "list keys"
 msgstr "enumer� chei"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "list keys and signatures"
 msgstr "enumer� chei �i semn�turi"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:389
 msgid "list and check key signatures"
 msgstr "enumer� �i verific� semn�turile cheii"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:390
 msgid "list keys and fingerprints"
 msgstr "enumer� chei �i amprente"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:391
 msgid "list secret keys"
 msgstr "enumer� chei secrete"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:392
 msgid "generate a new key pair"
 msgstr "genereaz� o nou� perechi de chei"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:393
 msgid "remove keys from the public keyring"
 msgstr "�terge chei de pe inelul de chei public"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:395
 msgid "remove keys from the secret keyring"
 msgstr "�terge chei de pe inelul de chei secret"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:396
 msgid "sign a key"
 msgstr "semneaz� o cheie"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:397
 msgid "sign a key locally"
 msgstr "semneaz� o cheie local"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:398
 msgid "sign or edit a key"
 msgstr "semneaz� sau editeaz� o cheie"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:399
 msgid "generate a revocation certificate"
 msgstr "genereaz� un certificat de revocare"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:401
 msgid "export keys"
 msgstr "export� chei"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:402
 msgid "export keys to a key server"
 msgstr "export� chei pentru un server de chei"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:403
 msgid "import keys from a key server"
 msgstr "import� chei de la un server de chei"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:405
 msgid "search for keys on a key server"
 msgstr "caut� pentru chei pe un server de chei"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:407
 msgid "update all keys from a keyserver"
 msgstr "actualizeaz� toate cheile de la un server de chei"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:411
 msgid "import/merge keys"
 msgstr "import�/combin� chei"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:414
 msgid "print the card status"
 msgstr "afi�eaz� starea cardului"
 
-#: g10/gpg.c:414
+#: g10/gpg.c:415
 msgid "change data on a card"
 msgstr "schimb� data de pe card"
 
-#: g10/gpg.c:415
+#: g10/gpg.c:416
 msgid "change a card's PIN"
 msgstr "schimb� PIN-ul unui card"
 
-#: g10/gpg.c:423
+#: g10/gpg.c:424
 msgid "update the trust database"
 msgstr "actualizeaz� baza de date de �ncredere"
 
-#: g10/gpg.c:430
+#: g10/gpg.c:431
 msgid "|algo [files]|print message digests"
 msgstr "|algo [fi�iere]|afi�eaz� rezumate mesaje"
 
-#: g10/gpg.c:434 g10/gpgv.c:71
+#: g10/gpg.c:435 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1125,51 +1125,51 @@ msgstr ""
 "Op�iuni:\n"
 " "
 
-#: g10/gpg.c:436
+#: g10/gpg.c:437
 msgid "create ascii armored output"
 msgstr "creaz� ie�ire �n armur� ascii"
 
-#: g10/gpg.c:438
+#: g10/gpg.c:439
 msgid "|NAME|encrypt for NAME"
 msgstr "|NUME|cifrare pentru NUME"
 
-#: g10/gpg.c:449
+#: g10/gpg.c:450
 msgid "use this user-id to sign or decrypt"
 msgstr "folose�te acest id-utilizator pentru a semna sau decripta"
 
-#: g10/gpg.c:450
+#: g10/gpg.c:451
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|seteaz� nivel de compresie N (0 deactiveaz�)"
 
-#: g10/gpg.c:455
+#: g10/gpg.c:456
 msgid "use canonical text mode"
 msgstr "folose�te modul text canonic"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:470
 msgid "use as output file"
 msgstr "folose�te ca fi�ier ie�ire"
 
-#: g10/gpg.c:471 g10/gpgv.c:73
+#: g10/gpg.c:472 g10/gpgv.c:73
 msgid "verbose"
 msgstr "locvace"
 
-#: g10/gpg.c:482
+#: g10/gpg.c:483
 msgid "do not make any changes"
 msgstr "nu face nici o schimbare"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:484
 msgid "prompt before overwriting"
 msgstr "�ntreab� �nainte de a suprascrie"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:525
 msgid "use strict OpenPGP behavior"
 msgstr "folose�te comportament strict OpenPGP"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "generate PGP 2.x compatible messages"
 msgstr "genereaz� mesaje compatibile cu PGP 2.x"
 
-#: g10/gpg.c:553
+#: g10/gpg.c:554
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1177,7 +1177,7 @@ msgstr ""
 "@\n"
 "(Arat� pagina man pentru o list� complet� a comenzilor �i op�iunilor)\n"
 
-#: g10/gpg.c:556
+#: g10/gpg.c:557
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1197,15 +1197,15 @@ msgstr ""
 " --list-keys [nume]         arat� chei\n"
 " --fingerprint [nume]       arat� amprente\n"
 
-#: g10/gpg.c:746 g10/gpgv.c:98
+#: g10/gpg.c:751 g10/gpgv.c:98
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "Raporta�i bug-uri la <gnupg-bugs@gnu.org>.\n"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:768
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
 
-#: g10/gpg.c:766
+#: g10/gpg.c:771
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1215,7 +1215,7 @@ msgstr ""
 "sign, check, encrypt sau decrypt\n"
 "opera�iunea implicit� depinde de datele de intrare\n"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:782
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1223,77 +1223,77 @@ msgstr ""
 "\n"
 "Algoritmuri suportate:\n"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:785
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/gpg.c:786 g10/keyedit.c:2266
+#: g10/gpg.c:791 g10/keyedit.c:2266
 msgid "Cipher: "
 msgstr "Cifru: "
 
-#: g10/gpg.c:792
+#: g10/gpg.c:797
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:798 g10/keyedit.c:2312
+#: g10/gpg.c:803 g10/keyedit.c:2312
 msgid "Compression: "
 msgstr "Compresie: "
 
-#: g10/gpg.c:881
+#: g10/gpg.c:886
 msgid "usage: gpg [options] "
 msgstr "folosire: gpg [op�iuni] "
 
-#: g10/gpg.c:1029
+#: g10/gpg.c:1034
 msgid "conflicting commands\n"
 msgstr "comenzi �n conflict\n"
 
-#: g10/gpg.c:1047
+#: g10/gpg.c:1052
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "nu am g�sit nici un semn = �n defini�ia grupului `%s'\n"
 
-#: g10/gpg.c:1244
+#: g10/gpg.c:1249
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr ""
 "AVERTISMENT: proprietate nesigur� (unsafe) pentru directorul home `%s'\n"
 
-#: g10/gpg.c:1247
+#: g10/gpg.c:1252
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr ""
 "AVERTISMENT: proprietate nesigur� (unsafe) pentru fi�ier configurare `%s'\n"
 
-#: g10/gpg.c:1250
+#: g10/gpg.c:1255
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "AVERTISMENT: proprietate nesigur� (unsafe) pentru extensia `%s'\n"
 
-#: g10/gpg.c:1256
+#: g10/gpg.c:1261
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr ""
 "AVERTISMENT: permisiuni nesigure (unsafe) pentru directorul home `%s'\n"
 
-#: g10/gpg.c:1259
+#: g10/gpg.c:1264
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr ""
 "AVERTISMENT: permisiuni nesigure (unsafe) pentru fi�ier configurare `%s'\n"
 
-#: g10/gpg.c:1262
+#: g10/gpg.c:1267
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "AVERTISMENT: permisiuni nesigure (unsafe) pentru extensia `%s'\n"
 
-#: g10/gpg.c:1268
+#: g10/gpg.c:1273
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru "
 "directorul home `%s'\n"
 
-#: g10/gpg.c:1271
+#: g10/gpg.c:1276
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
@@ -1301,21 +1301,21 @@ msgstr ""
 "AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru fi�ier "
 "configurare `%s'\n"
 
-#: g10/gpg.c:1274
+#: g10/gpg.c:1279
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "AVERTISMENT: proprietate director incluziuni nesigur (unsafe) pentru "
 "extensia `%s'\n"
 
-#: g10/gpg.c:1280
+#: g10/gpg.c:1285
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru "
 "directorul home `%s'\n"
 
-#: g10/gpg.c:1283
+#: g10/gpg.c:1288
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1323,467 +1323,476 @@ msgstr ""
 "AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru fi�ier "
 "configurare `%s'\n"
 
-#: g10/gpg.c:1286
+#: g10/gpg.c:1291
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "AVERTISMENT: permisiuni director incluziuni nesigure (unsafe) pentru "
 "extensia `%s'\n"
 
-#: g10/gpg.c:1427
+#: g10/gpg.c:1432
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "articol configurare necunoscut `%s'\n"
 
-#: g10/gpg.c:1521
+#: g10/gpg.c:1526
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1523
+#: g10/gpg.c:1528
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1525
+#: g10/gpg.c:1530
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nici o semn�tur� corespunz�toare �n inelul secret\n"
 
-#: g10/gpg.c:1527
+#: g10/gpg.c:1532
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1536
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1538
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1540
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1542
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1544
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1546
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "arat� c�ruia dintre inelele de chei �i apar�ine o cheie enumerat�"
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1548
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nici o semn�tur� corespunz�toare �n inelul secret\n"
 
-#: g10/gpg.c:1874
+#: g10/gpg.c:1879
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOT�: fisier op�iuni implicite vechi `%s' ignorat\n"
 
-#: g10/gpg.c:1916
+#: g10/gpg.c:1921
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOT�: nici un fi�ier op�iuni implicit `%s'\n"
 
-#: g10/gpg.c:1920
+#: g10/gpg.c:1925
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fi�ier op�iuni `%s': %s\n"
 
-#: g10/gpg.c:1927
+#: g10/gpg.c:1932
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "citesc op�iuni din `%s'\n"
 
-#: g10/gpg.c:2142 g10/gpg.c:2716 g10/gpg.c:2735
+#: g10/gpg.c:2147 g10/gpg.c:2747 g10/gpg.c:2766
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOT�: %s nu este pentru o folosire normal�!\n"
 
-#: g10/gpg.c:2158
+#: g10/gpg.c:2163
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "extensie cifru `%s' nu a fost �nc�rcat din cauza permisiunilor nesigure "
 "(unsafe)\n"
 
-#: g10/gpg.c:2312 g10/gpg.c:2324
+#: g10/gpg.c:2317 g10/gpg.c:2329
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' nu este expirare de semn�tur� valid�\n"
 
-#: g10/gpg.c:2400
+#: g10/gpg.c:2405
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' nu este un set de carectere valid\n"
 
 #
-#: g10/gpg.c:2422 g10/keyedit.c:3997
+#: g10/gpg.c:2429 g10/keyedit.c:3997
 msgid "could not parse keyserver URL\n"
 msgstr "nu am putut interpreta URL-ul serverului de chei\n"
 
-#: g10/gpg.c:2428
+#: g10/gpg.c:2441
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: op�iuni server de chei invalide\n"
 
-#: g10/gpg.c:2431
+#: g10/gpg.c:2444
 msgid "invalid keyserver options\n"
 msgstr "op�iuni server de chei invalide\n"
 
-#: g10/gpg.c:2438
+#: g10/gpg.c:2451
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: op�iuni import invalide\n"
 
-#: g10/gpg.c:2441
+#: g10/gpg.c:2454
 msgid "invalid import options\n"
 msgstr "op�iuni import invalide\n"
 
-#: g10/gpg.c:2448
+#: g10/gpg.c:2461
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: op�iuni export invalide\n"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2464
 msgid "invalid export options\n"
 msgstr "op�iuni export invalide\n"
 
-#: g10/gpg.c:2458
+#: g10/gpg.c:2471
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: op�iuni enumerare invalide\n"
 
-#: g10/gpg.c:2461
+#: g10/gpg.c:2474
 msgid "invalid list options\n"
 msgstr "op�iuni enumerare invalide\n"
 
-#: g10/gpg.c:2469
+#: g10/gpg.c:2482
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2471
+#: g10/gpg.c:2484
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2473
+#: g10/gpg.c:2486
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' nu este expirare de semn�tur� valid�\n"
 
-#: g10/gpg.c:2475
+#: g10/gpg.c:2488
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2479
+#: g10/gpg.c:2492
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2481
+#: g10/gpg.c:2494
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
 
-#: g10/gpg.c:2483
+#: g10/gpg.c:2496
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' nu este expirare de semn�tur� valid�\n"
 
-#: g10/gpg.c:2485
+#: g10/gpg.c:2498
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2505
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: op�iuni verificare invalide\n"
 
-#: g10/gpg.c:2495
+#: g10/gpg.c:2508
 msgid "invalid verify options\n"
 msgstr "op�iuni verificare invalide\n"
 
-#: g10/gpg.c:2502
+#: g10/gpg.c:2515
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nu pot seta cale-execu�ie ca %s\n"
 
-#: g10/gpg.c:2705
+#: g10/gpg.c:2665
+#, fuzzy, c-format
+msgid "%s:%d: invalid auto-key-locate list\n"
+msgstr "%s:%d: op�iuni verificare invalide\n"
+
+#: g10/gpg.c:2668
+msgid "invalid auto-key-locate list\n"
+msgstr ""
+
+#: g10/gpg.c:2736
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVERTISMENT: programul ar putea crea un fi�ier core!\n"
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2740
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVERTISMENT: %s �nlocuie�te %s\n"
 
-#: g10/gpg.c:2718
+#: g10/gpg.c:2749
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s nu este permis cu %s!\n"
 
-#: g10/gpg.c:2721
+#: g10/gpg.c:2752
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nu are sens cu %s!\n"
 
-#: g10/gpg.c:2728
+#: g10/gpg.c:2759
 #, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "NOT�: %s nu este disponibil �n aceast� sesiune\n"
 
-#: g10/gpg.c:2743
+#: g10/gpg.c:2774
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "nu va rula cu memorie neprotejat� (insecure) pentru c� %s\n"
 
-#: g10/gpg.c:2757
+#: g10/gpg.c:2788
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "pute�i crea doar semn�turi deta�ate sau �n clar c�t� vreme sunte�i �n modul "
 "--pgp2\n"
 
-#: g10/gpg.c:2763
+#: g10/gpg.c:2794
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 "nu pute�i semna �i cifra �n acela�i timp c�t� vreme sunte�i �n modul --pgp2\n"
 
-#: g10/gpg.c:2769
+#: g10/gpg.c:2800
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "trebuie s� folosi�i fi�iere (�i nu un pipe) c�nd lucra�i cu modul --pgp2 "
 "activat.\n"
 
-#: g10/gpg.c:2782
+#: g10/gpg.c:2813
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "cifrarea unui mesaj �n modul --pgp2 necesit� un cifru IDEA\n"
 
-#: g10/gpg.c:2849 g10/gpg.c:2873
+#: g10/gpg.c:2880 g10/gpg.c:2904
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritm cifrare selectat este invalid\n"
 
-#: g10/gpg.c:2855 g10/gpg.c:2879
+#: g10/gpg.c:2886 g10/gpg.c:2910
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritm rezumat selectat este invalid\n"
 
-#: g10/gpg.c:2861
+#: g10/gpg.c:2892
 msgid "selected compression algorithm is invalid\n"
 msgstr "algoritm compresie selectat este invalid\n"
 
-#: g10/gpg.c:2867
+#: g10/gpg.c:2898
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "algoritm rezumat certificare selectat este invalid\n"
 
-#: g10/gpg.c:2882
+#: g10/gpg.c:2913
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed trebuie s� fie mai mare dec�t 0\n"
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2915
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed trebuie s� fie mai mare dec�t 1\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2917
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth trebuie s� fie �n intervalul de la 1 la 255\n"
 
-#: g10/gpg.c:2888
+#: g10/gpg.c:2919
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-cert-level invalid; trebuie s� fie 0, 1, 2 sau 3\n"
 
-#: g10/gpg.c:2890
+#: g10/gpg.c:2921
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "min-cert-level invalid; trebuie s� fie 0, 1, 2 sau 3\n"
 
-#: g10/gpg.c:2893
+#: g10/gpg.c:2924
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOT�: modul S2K simplu (0) este contraindicat cu insisten��\n"
 
-#: g10/gpg.c:2897
+#: g10/gpg.c:2928
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mod S2K invalid; trebuie s� fie 0, 1 sau 3\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2935
 msgid "invalid default preferences\n"
 msgstr "preferin�e implicite invalide\n"
 
-#: g10/gpg.c:2913
+#: g10/gpg.c:2944
 msgid "invalid personal cipher preferences\n"
 msgstr "preferin�e cifrare personale invalide\n"
 
-#: g10/gpg.c:2917
+#: g10/gpg.c:2948
 msgid "invalid personal digest preferences\n"
 msgstr "preferin�e rezumat personale invalide\n"
 
-#: g10/gpg.c:2921
+#: g10/gpg.c:2952
 msgid "invalid personal compress preferences\n"
 msgstr "preferin�e compresie personale invalide\n"
 
-#: g10/gpg.c:2954
+#: g10/gpg.c:2985
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s nu merge �nc� cu %s!\n"
 
-#: g10/gpg.c:3001
+#: g10/gpg.c:3032
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "nu pute�i folosi algoritmul de cifrare `%s' c�t� vreme �n modul %s\n"
 
-#: g10/gpg.c:3006
+#: g10/gpg.c:3037
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "nu pute�i folosi algorimul de rezumat `%s' c�t� vreme �n modul %s\n"
 
-#: g10/gpg.c:3011
+#: g10/gpg.c:3042
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "nu pute�i folosi algoritmul de compresie `%s' c�t� vreme �n modul %s\n"
 
-#: g10/gpg.c:3107
+#: g10/gpg.c:3138
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "am e�uat s� ini�ializez TrustDB:%s\n"
 
-#: g10/gpg.c:3118
+#: g10/gpg.c:3149
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AVERTISMENT: destinatari (-r) furniza�i f�r� a folosi cifrare cu cheie "
 "public�\n"
 
-#: g10/gpg.c:3129
+#: g10/gpg.c:3160
 msgid "--store [filename]"
 msgstr "--store [nume_fi�ier]"
 
-#: g10/gpg.c:3136
+#: g10/gpg.c:3167
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nume_fi�ier]"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3169
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "cifrarea simetric� a lui `%s' a e�uat: %s\n"
 
-#: g10/gpg.c:3148
+#: g10/gpg.c:3179
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3192
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3194
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "nu pute�i folosi --symmetric --encrypt cu --s2k-mode 0\n"
 
-#: g10/gpg.c:3166
+#: g10/gpg.c:3197
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "nu pute�i folosi --symmetric --encrypt c�t� vreme �n modul %s\n"
 
-#: g10/gpg.c:3184
+#: g10/gpg.c:3215
 msgid "--sign [filename]"
 msgstr "--sign [nume_fi�ier]"
 
-#: g10/gpg.c:3197
+#: g10/gpg.c:3228
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3212
+#: g10/gpg.c:3243
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3214
+#: g10/gpg.c:3245
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "nu pute�i folosi --symmetric --sign --encrypt cu --s2k-mode 0\n"
 
-#: g10/gpg.c:3217
+#: g10/gpg.c:3248
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "nu pute�i folosi --symmetric --sign --encrypt c�t� vreme �n modul %s\n"
 
-#: g10/gpg.c:3237
+#: g10/gpg.c:3268
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nume_fi�ier]"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3277
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nume_fi�ier]"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3302
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3310
 msgid "--sign-key user-id"
 msgstr "--sign-key id-utilizator"
 
-#: g10/gpg.c:3283
+#: g10/gpg.c:3314
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-utilizator"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3335
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-utilizator [comenzi]"
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3406
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id-utilizator] [inel_chei]"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3443
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "trimitere server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3445
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "recep�ie server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3447
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export cheie e�uat: %s\n"
 
-#: g10/gpg.c:3427
+#: g10/gpg.c:3458
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "c�utare server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3437
+#: g10/gpg.c:3468
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "actualizare server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3488
+#: g10/gpg.c:3519
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminarea armurii a e�uat: %s\n"
 
-#: g10/gpg.c:3496
+#: g10/gpg.c:3527
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "punerea armurii a e�uat: %s\n"
 
-#: g10/gpg.c:3583
+#: g10/gpg.c:3614
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritm hash invalid `%s'\n"
 
-#: g10/gpg.c:3706
+#: g10/gpg.c:3737
 msgid "[filename]"
 msgstr "[nume_fi�ier]"
 
-#: g10/gpg.c:3710
+#: g10/gpg.c:3741
 msgid "Go ahead and type your message ...\n"
 msgstr "Da�i-i drumul �i scrie�i mesajul ...\n"
 
-#: g10/gpg.c:4000
+#: g10/gpg.c:4031
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1791,28 +1800,28 @@ msgstr ""
 "un nume de nota�ie trebuie s� con�in� numai caractere imprimabile sau spa�ii "
 "�i s� se termine cu un '='\n"
 
-#: g10/gpg.c:4008
+#: g10/gpg.c:4039
 msgid "a user notation name must contain the '@' character\n"
 msgstr "un nume de nota�ie utilizator trebuie s� con�in� caracterul '@'\n"
 
-#: g10/gpg.c:4013
+#: g10/gpg.c:4044
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "un nume de nota�ie trebuie s� nu con�in� mai mult de un caracter '@'\n"
 
-#: g10/gpg.c:4024
+#: g10/gpg.c:4055
 msgid "a notation value must not use any control characters\n"
 msgstr ""
 "o valoare de nota�ie trebuie s� nu foloseasc� nici un caracter de control\n"
 
-#: g10/gpg.c:4058
+#: g10/gpg.c:4089
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL-ul politicii de certificare furnizat este invalid\n"
 
-#: g10/gpg.c:4060
+#: g10/gpg.c:4091
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL-ul politicii de semn�turi furnizat este invalid\n"
 
-#: g10/gpg.c:4093
+#: g10/gpg.c:4124
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
 
@@ -1820,31 +1829,32 @@ msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "prea multe intr�ri �n cache-ul pk - deactivat\n"
 
-#: g10/getkey.c:188 g10/getkey.c:2845
+#: g10/getkey.c:188 g10/getkey.c:2876
 msgid "[User ID not found]"
 msgstr "[ID utilizator nu a fost g�sit]"
 
-#: g10/getkey.c:931 g10/getkey.c:953 g10/getkey.c:976
+#: g10/getkey.c:933 g10/getkey.c:950 g10/getkey.c:970 g10/getkey.c:986
+#: g10/getkey.c:1001
 #, c-format
 msgid "Automatically retrieved `%s' via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1769
+#: g10/getkey.c:1800
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Cheia invalid� %s f�cut� valid� de --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2323
+#: g10/getkey.c:2354
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "nici o subcheie secret� pentru subcheia public� %s - ignorat�\n"
 
-#: g10/getkey.c:2554
+#: g10/getkey.c:2585
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "folosim subcheia %s �n loc de cheia primar� %s\n"
 
-#: g10/getkey.c:2601
+#: g10/getkey.c:2632
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "cheia %s: cheie secret� f�r� cheie public� - s�rit�\n"
@@ -3381,12 +3391,12 @@ msgid "(sensitive)"
 msgstr " (senzitiv)"
 
 #: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
-#: g10/keylist.c:194 g10/keyserver.c:471
+#: g10/keylist.c:194 g10/keyserver.c:525
 #, c-format
 msgid "created: %s"
 msgstr "creat�: %s"
 
-#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:967
+#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:960
 #, c-format
 msgid "revoked: %s"
 msgstr "revocat�: %s"
@@ -3398,7 +3408,7 @@ msgstr "expirat
 
 #: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
 #: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:477 g10/mainproc.c:973
+#: g10/keylist.c:914 g10/keyserver.c:531 g10/mainproc.c:966
 #, c-format
 msgid "expires: %s"
 msgstr "expir�: %s"
@@ -3435,13 +3445,13 @@ msgstr ""
 "corect� dac� nu reporni�i programul.\n"
 
 #
-#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:481
-#: g10/mainproc.c:1734 g10/trustdb.c:1184 g10/trustdb.c:1704
+#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:535
+#: g10/mainproc.c:1783 g10/trustdb.c:1184 g10/trustdb.c:1704
 msgid "revoked"
 msgstr "revocat�"
 
-#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:485
-#: g10/mainproc.c:1736 g10/trustdb.c:537 g10/trustdb.c:1706
+#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:539
+#: g10/mainproc.c:1785 g10/trustdb.c:537 g10/trustdb.c:1706
 msgid "expired"
 msgstr "expirat�"
 
@@ -4267,387 +4277,384 @@ msgstr "%s: inelul de chei creat\n"
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:77
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:81
+#: g10/keyserver.c:79
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:83
+#: g10/keyserver.c:81
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:87
+#: g10/keyserver.c:85
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:89
-msgid "automatically retrieve keys from PKA records"
-msgstr ""
-
-#: g10/keyserver.c:91
-msgid "automatically retrieve keys from DNS"
-msgstr ""
-
-#: g10/keyserver.c:95
+#: g10/keyserver.c:87
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "Introduce�i URL-ul serverului de chei preferat: "
 
-#: g10/keyserver.c:139
+#: g10/keyserver.c:89
+msgid "honor the PKA record set on a key when retrieving keys"
+msgstr ""
+
+#: g10/keyserver.c:154
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "AVERTISMENT: op�iunile serverului de chei `%s' nu sunt folosite pe aceast� "
 "platform�\n"
 
-#: g10/keyserver.c:483
+#: g10/keyserver.c:537
 msgid "disabled"
 msgstr "deactivat(�)"
 
-#: g10/keyserver.c:684
+#: g10/keyserver.c:738
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Introduce�i num�r/numere, N)ext (urm�tor), sau Q)uit (termin�) > "
 
-#: g10/keyserver.c:767 g10/keyserver.c:1368
+#: g10/keyserver.c:821 g10/keyserver.c:1422
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "protocol server de chei invalid (us %d!=handler %d)\n"
 
-#: g10/keyserver.c:865
+#: g10/keyserver.c:919
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "cheia \"%s\" nu a fost g�sit� pe serverul de chei\n"
 
-#: g10/keyserver.c:867
+#: g10/keyserver.c:921
 msgid "key not found on keyserver\n"
 msgstr "cheia nu a fost g�sit� pe serverul de chei\n"
 
-#: g10/keyserver.c:1092
+#: g10/keyserver.c:1146
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "cer cheia %s de la serverul %s %s\n"
 
-#: g10/keyserver.c:1096
+#: g10/keyserver.c:1150
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "cer cheia %s de la %s\n"
 
-#: g10/keyserver.c:1120
+#: g10/keyserver.c:1174
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "caut \"%s\" de pe serverul %s %s\n"
 
-#: g10/keyserver.c:1123
+#: g10/keyserver.c:1177
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "caut \"%s\" de pe %s\n"
 
-#: g10/keyserver.c:1271
+#: g10/keyserver.c:1325
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "trimit cheia %s serverului %s %s\n"
 
-#: g10/keyserver.c:1275
+#: g10/keyserver.c:1329
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "trimit cheia %s lui %s\n"
 
-#: g10/keyserver.c:1318
+#: g10/keyserver.c:1372
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "caut \"%s\" de pe serverul %s %s\n"
 
-#: g10/keyserver.c:1321
+#: g10/keyserver.c:1375
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "caut \"%s\" de pe %s\n"
 
-#: g10/keyserver.c:1328 g10/keyserver.c:1424
+#: g10/keyserver.c:1382 g10/keyserver.c:1478
 msgid "no keyserver action!\n"
 msgstr "nici o ac�iune pentru serverul de chei!\n"
 
-#: g10/keyserver.c:1376
+#: g10/keyserver.c:1430
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 "AVERTISMENT: manipulator server de chei dintr-o versiune diferit� de GnuPG (%"
 "s)\n"
 
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1439
 msgid "keyserver did not send VERSION\n"
 msgstr "serverul de chei nu a trimis VERSION (versiune)\n"
 
-#: g10/keyserver.c:1446
+#: g10/keyserver.c:1500
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "nici un server de chei cunoscut (folosi�i op�iunea --keyserver)\n"
 
-#: g10/keyserver.c:1452
+#: g10/keyserver.c:1506
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 "apeluri c�tre server de chei extern nu este suportat de acest program\n"
 
-#: g10/keyserver.c:1464
+#: g10/keyserver.c:1518
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "nici un manipulator (handler) pentru schema serverului de chei `%s'\n"
 
-#: g10/keyserver.c:1469
+#: g10/keyserver.c:1523
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "ac�iunea `%s' nu este suportat� cu schema serverului de chei `%s'\n"
 
-#: g10/keyserver.c:1477
+#: g10/keyserver.c:1531
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "%s nu suport� versiunea de manipulator (handler) %d\n"
 
-#: g10/keyserver.c:1484
+#: g10/keyserver.c:1538
 msgid "keyserver timed out\n"
 msgstr "serverul de chei a epuizat timpul de a�teptare (timed out)\n"
 
-#: g10/keyserver.c:1489
+#: g10/keyserver.c:1543
 msgid "keyserver internal error\n"
 msgstr "eroare intern� server de chei\n"
 
-#: g10/keyserver.c:1498
+#: g10/keyserver.c:1552
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "eroare de comunicare server de chei: %s\n"
 
-#: g10/keyserver.c:1523 g10/keyserver.c:1557
+#: g10/keyserver.c:1577 g10/keyserver.c:1611
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" nu este un ID de cheie: s�rit\n"
 
-#: g10/keyserver.c:1814
+#: g10/keyserver.c:1868
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "AVERTISMENT: nu pot reactualiza cheia %s via %s: %s\n"
 
-#: g10/keyserver.c:1836
+#: g10/keyserver.c:1890
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "reactualizez 1 cheie de la %s\n"
 
-#: g10/keyserver.c:1838
+#: g10/keyserver.c:1892
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "reactualizez %d chei de la %s\n"
 
-#: g10/keyserver.c:1903
+#: g10/keyserver.c:1957
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "AVERTISMENT: nu pot reactualiza cheia %s via %s: %s\n"
 
-#: g10/keyserver.c:1909
+#: g10/keyserver.c:1963
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "AVERTISMENT: nu pot reactualiza cheia %s via %s: %s\n"
 
-#: g10/mainproc.c:253
+#: g10/mainproc.c:240
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "dimensiune ciudat� pentru o cheie de sesiune cifrat� (%d)\n"
 
-#: g10/mainproc.c:304
+#: g10/mainproc.c:291
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s cheie de sesiune cifrat�\n"
 
-#: g10/mainproc.c:314
+#: g10/mainproc.c:301
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "fraza-parol� generat� cu un algoritm rezumat necunoscut %d\n"
 
-#: g10/mainproc.c:395
+#: g10/mainproc.c:382
 #, c-format
 msgid "public key is %s\n"
 msgstr "cheia public� este %s\n"
 
-#: g10/mainproc.c:450
+#: g10/mainproc.c:439
 msgid "public key encrypted data: good DEK\n"
 msgstr "date cigrate cu cheie public�: DEK bun\n"
 
-#: g10/mainproc.c:483
+#: g10/mainproc.c:472
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "cifrat cu cheia %u-bit %s, ID %s, creat� %s\n"
 
-#: g10/mainproc.c:487 g10/pkclist.c:219
+#: g10/mainproc.c:476 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:491
+#: g10/mainproc.c:480
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "cifrat cu cheia %s, ID %s\n"
 
-#: g10/mainproc.c:505
+#: g10/mainproc.c:494
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "decriptarea cu cheie public� a e�uat: %s\n"
 
-#: g10/mainproc.c:519
+#: g10/mainproc.c:508
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "cifrat� cu %lu fraze-parol�\n"
 
-#: g10/mainproc.c:521
+#: g10/mainproc.c:510
 msgid "encrypted with 1 passphrase\n"
 msgstr "cifrat� cu 1 fraz�-parol�\n"
 
-#: g10/mainproc.c:549 g10/mainproc.c:571
+#: g10/mainproc.c:541 g10/mainproc.c:563
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "presupunem date cifrate %s\n"
 
-#: g10/mainproc.c:557
+#: g10/mainproc.c:549
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "cifru IDEA indisponibil, vom �ncerca s� folosim %s �n loc\n"
 
-#: g10/mainproc.c:589
+#: g10/mainproc.c:581
 msgid "decryption okay\n"
 msgstr "decriptare OK\n"
 
-#: g10/mainproc.c:593
+#: g10/mainproc.c:585
 msgid "WARNING: message was not integrity protected\n"
 msgstr "AVERTISMENT: mesajul nu a avut integritatea protejat�\n"
 
-#: g10/mainproc.c:606
+#: g10/mainproc.c:598
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "AVERTISMENT: mesajul cifrat a fost manipulat!\n"
 
-#: g10/mainproc.c:612
+#: g10/mainproc.c:604
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "decriptarea a e�uat: %s\n"
 
-#: g10/mainproc.c:631
+#: g10/mainproc.c:623
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "NOT�: expeditorul a cerut \"doar-pentru-ochii-d-voastr�\"\n"
 
-#: g10/mainproc.c:633
+#: g10/mainproc.c:625
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "nume fi�ier original='%.*s'\n"
 
-#: g10/mainproc.c:822
+#: g10/mainproc.c:815
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "revocare standalone - folosi�i \"gpg --import\" pentru a aplica\n"
 
-#: g10/mainproc.c:1168
+#: g10/mainproc.c:1161
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Semn�tur� bun� din \"%s\""
 
-#: g10/mainproc.c:1418
+#: g10/mainproc.c:1419
 msgid "signature verification suppressed\n"
 msgstr "verificare semn�tur� eliminat�\n"
 
-#: g10/mainproc.c:1460 g10/mainproc.c:1470
-msgid "can't handle these multiple signatures\n"
+#: g10/mainproc.c:1519
+#, fuzzy
+msgid "can't handle this ambiguous signature data\n"
 msgstr "nu pot m�nui aceste semn�turi multiple\n"
 
-#: g10/mainproc.c:1480
+#: g10/mainproc.c:1530
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Semn�tur� f�cut� %s\n"
 
-#: g10/mainproc.c:1481
+#: g10/mainproc.c:1531
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               folosind cheia %s %s\n"
 
-#: g10/mainproc.c:1485
+#: g10/mainproc.c:1535
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Semn�tur� f�cut� %s folosind cheia %s cu ID %s\n"
 
-#: g10/mainproc.c:1505
+#: g10/mainproc.c:1555
 msgid "Key available at: "
 msgstr "Cheie disponibil� la: "
 
-#: g10/mainproc.c:1639 g10/mainproc.c:1687
+#: g10/mainproc.c:1688 g10/mainproc.c:1736
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "Semn�tur� INCORECT� din \"%s\""
 
-#: g10/mainproc.c:1641 g10/mainproc.c:1689
+#: g10/mainproc.c:1690 g10/mainproc.c:1738
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Semn�tur� expirat� din \"%s\""
 
-#: g10/mainproc.c:1643 g10/mainproc.c:1691
+#: g10/mainproc.c:1692 g10/mainproc.c:1740
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Semn�tur� bun� din \"%s\""
 
-#: g10/mainproc.c:1695
+#: g10/mainproc.c:1744
 msgid "[uncertain]"
 msgstr "[nesigur]"
 
-#: g10/mainproc.c:1727
+#: g10/mainproc.c:1776
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                aka \"%s\""
 
-#: g10/mainproc.c:1824
+#: g10/mainproc.c:1873
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Semn�tur� expirat� %s\n"
 
-#: g10/mainproc.c:1829
+#: g10/mainproc.c:1878
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Semn�tura expir� %s\n"
 
-#: g10/mainproc.c:1832
+#: g10/mainproc.c:1881
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "semn�tur� %s, algoritm rezumat %s\n"
 
-#: g10/mainproc.c:1833
+#: g10/mainproc.c:1882
 msgid "binary"
 msgstr "binar"
 
-#: g10/mainproc.c:1834
+#: g10/mainproc.c:1883
 msgid "textmode"
 msgstr "modtext"
 
-#: g10/mainproc.c:1834 g10/trustdb.c:536
+#: g10/mainproc.c:1883 g10/trustdb.c:536
 msgid "unknown"
 msgstr "necunoscut"
 
-#: g10/mainproc.c:1854
+#: g10/mainproc.c:1903
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nu pot verifica semn�tura: %s\n"
 
-#: g10/mainproc.c:1922 g10/mainproc.c:1938 g10/mainproc.c:2024
+#: g10/mainproc.c:1972 g10/mainproc.c:1988 g10/mainproc.c:2074
 msgid "not a detached signature\n"
 msgstr "nu o semn�tur� deta�at�\n"
 
-#: g10/mainproc.c:1965
+#: g10/mainproc.c:2015
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "AVERTISMENT: am detectat multiple semn�turi.  Numai prima va fi verificat�.\n"
 
-#: g10/mainproc.c:1973
+#: g10/mainproc.c:2023
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "semn�tur� de sine st�t�toare (standalone) de clas� 0x%02x\n"
 
-#: g10/mainproc.c:2030
+#: g10/mainproc.c:2080
 msgid "old style (PGP 2.x) signature\n"
 msgstr "semn�tur� de stil vechi (PGP 2.x)\n"
 
-#: g10/mainproc.c:2040
+#: g10/mainproc.c:2090
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "pachet root invalid detectat �n proc_tree()\n"
 
@@ -5211,23 +5218,23 @@ msgstr ""
 msgid "error creating `%s': %s\n"
 msgstr "eroare la creearea `%s': %s\n"
 
-#: g10/plaintext.c:447
+#: g10/plaintext.c:453
 msgid "Detached signature.\n"
 msgstr "Semn�tur� deta�at�.\n"
 
-#: g10/plaintext.c:453
+#: g10/plaintext.c:459
 msgid "Please enter name of data file: "
 msgstr "V� rug�m introduce�i numele fi�ierului de date: "
 
-#: g10/plaintext.c:485
+#: g10/plaintext.c:491
 msgid "reading stdin ...\n"
 msgstr "citesc stdin ...\n"
 
-#: g10/plaintext.c:519
+#: g10/plaintext.c:525
 msgid "no signed data\n"
 msgstr "nici o dat� semnat�\n"
 
-#: g10/plaintext.c:533
+#: g10/plaintext.c:539
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "nu pot deschide date semnate `%s'\n"
diff --git a/po/ru.po b/po/ru.po
index 0cdfa8e5a..a134037d4 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GnuPG 1.4.2\n"
 "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2006-02-14 15:28+0100\n"
+"POT-Creation-Date: 2006-03-07 11:29+0100\n"
 "PO-Revision-Date: 2005-06-22 02:53+0200\n"
 "Last-Translator: Maxim Britov <maxbritov@tut.by>\n"
 "Language-Team: Russian <gnupg-ru@gnupg.org>\n"
@@ -42,9 +42,9 @@ msgstr "сохранение секретного ключа в `%s'\n"
 
 #: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:992 g10/gpg.c:3360 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:997 g10/gpg.c:3391 g10/import.c:193 g10/keygen.c:2274
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:476 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
+#: g10/plaintext.c:482 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
 #: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
@@ -78,7 +78,7 @@ msgstr "не могу прочитать `%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "замечание: файл random_seed не обновлен\n"
 
-#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:991 g10/keygen.c:2753
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2753
 #: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
 #: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
 #, c-format
@@ -667,11 +667,11 @@ msgstr "Команды администрирования не разрешен
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Недопустимая команда  (список команд: \"help\")\n"
 
-#: g10/cardglue.c:435
+#: g10/cardglue.c:434
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr "Вставьте карту и нажмите Enter или введите 'c' для отмены: "
 
-#: g10/cardglue.c:572
+#: g10/cardglue.c:573
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
@@ -680,35 +680,35 @@ msgstr ""
 "Извлеките текущую карту и вставьте карту с серийным номером:\n"
 "   %.*s\n"
 
-#: g10/cardglue.c:580
+#: g10/cardglue.c:582
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr "Нажмите Enter, когда будете готовы или введите 'c' для отмены: "
 
-#: g10/cardglue.c:915
+#: g10/cardglue.c:917
 msgid "Enter New Admin PIN: "
 msgstr "Введите новый Admin PIN: "
 
-#: g10/cardglue.c:916
+#: g10/cardglue.c:918
 msgid "Enter New PIN: "
 msgstr "Введите новый PIN: "
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:919
 msgid "Enter Admin PIN: "
 msgstr "Введите Admin PIN: "
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:920
 msgid "Enter PIN: "
 msgstr "Введите PIN: "
 
-#: g10/cardglue.c:935
+#: g10/cardglue.c:937
 msgid "Repeat this PIN: "
 msgstr "Повторите ввод PIN: "
 
-#: g10/cardglue.c:950
+#: g10/cardglue.c:952
 msgid "PIN not correctly repeated; try again"
 msgstr "повторный ввод PIN некорректен; попробуйте еще раз"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3720 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3751 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -718,13 +718,13 @@ msgstr "не могу открыть `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output не работает для данной команды\n"
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1644
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1698
 #: g10/revoke.c:228
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "ключ \"%s\" не найден: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1658
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1712
 #: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -831,12 +831,12 @@ msgstr "Вы не можете использовать %s в режиме %s\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s зашифровано для: \"%s\"\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:306
+#: g10/encr-data.c:67 g10/mainproc.c:293
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "Данные зашифрованы алгоритмом %s\n"
 
-#: g10/encr-data.c:69 g10/mainproc.c:310
+#: g10/encr-data.c:69 g10/mainproc.c:297
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "зашифровано неизвестным алгоритмом %d\n"
@@ -974,7 +974,7 @@ msgstr "ВНИМАНИЕ: секретный ключ %s не имеет про
 msgid "WARNING: nothing exported\n"
 msgstr "ВНИМАНИЕ: нечего экспортировать\n"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:373
 msgid ""
 "@Commands:\n"
 " "
@@ -982,127 +982,127 @@ msgstr ""
 "@Команды:\n"
 " "
 
-#: g10/gpg.c:374
+#: g10/gpg.c:375
 msgid "|[file]|make a signature"
 msgstr "|[file]|создать подпись к файлу"
 
-#: g10/gpg.c:375
+#: g10/gpg.c:376
 msgid "|[file]|make a clear text signature"
 msgstr "|[file]|создать прозрачную подпись к файлу"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:377
 msgid "make a detached signature"
 msgstr "создать отделенную подпись"
 
-#: g10/gpg.c:377
+#: g10/gpg.c:378
 msgid "encrypt data"
 msgstr "зашифровать данные"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:380
 msgid "encryption only with symmetric cipher"
 msgstr "зашифровать только симметричным шифром"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:382
 msgid "decrypt data (default)"
 msgstr "расшифровать данные (по умолчанию)"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:384
 msgid "verify a signature"
 msgstr "проверить подпись"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:386
 msgid "list keys"
 msgstr "вывести список ключей"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "list keys and signatures"
 msgstr "вывести список ключей и подписей"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:389
 msgid "list and check key signatures"
 msgstr "вывести и проверить подписи ключей"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:390
 msgid "list keys and fingerprints"
 msgstr "вывести список ключей и их отпечатков"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:391
 msgid "list secret keys"
 msgstr "вывести список секретных ключей"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:392
 msgid "generate a new key pair"
 msgstr "создать новую пару ключей"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:393
 msgid "remove keys from the public keyring"
 msgstr "удалить ключи из таблицы открытых ключей"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:395
 msgid "remove keys from the secret keyring"
 msgstr "удалить ключи из таблицы закрытых ключей"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:396
 msgid "sign a key"
 msgstr "подписать ключ"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:397
 msgid "sign a key locally"
 msgstr "подписать ключ локально"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:398
 msgid "sign or edit a key"
 msgstr "подписать или редактировать ключ"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:399
 msgid "generate a revocation certificate"
 msgstr "создать сертификат отзыва"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:401
 msgid "export keys"
 msgstr "экспортировать ключи"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:402
 msgid "export keys to a key server"
 msgstr "экспортировать ключи на сервер ключей"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:403
 msgid "import keys from a key server"
 msgstr "импортировать ключи с сервера ключей"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:405
 msgid "search for keys on a key server"
 msgstr "искать ключи на сервере ключей"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:407
 msgid "update all keys from a keyserver"
 msgstr "обновить все ключи с сервера ключей"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:411
 msgid "import/merge keys"
 msgstr "импортировать/объединить ключи"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:414
 msgid "print the card status"
 msgstr "показать состояние карты"
 
-#: g10/gpg.c:414
+#: g10/gpg.c:415
 msgid "change data on a card"
 msgstr "изменить данные на карте"
 
-#: g10/gpg.c:415
+#: g10/gpg.c:416
 msgid "change a card's PIN"
 msgstr "сменить PIN карты"
 
-#: g10/gpg.c:423
+#: g10/gpg.c:424
 msgid "update the trust database"
 msgstr "обновить таблицу доверий"
 
-#: g10/gpg.c:430
+#: g10/gpg.c:431
 msgid "|algo [files]|print message digests"
 msgstr "|algo [files]|вывести хэши файлов"
 
-#: g10/gpg.c:434 g10/gpgv.c:71
+#: g10/gpg.c:435 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1112,51 +1112,51 @@ msgstr ""
 "Параметры:\n"
 " "
 
-#: g10/gpg.c:436
+#: g10/gpg.c:437
 msgid "create ascii armored output"
 msgstr "вывод в ASCII формате"
 
-#: g10/gpg.c:438
+#: g10/gpg.c:439
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAME|зашифровать для получателя NAME"
 
-#: g10/gpg.c:449
+#: g10/gpg.c:450
 msgid "use this user-id to sign or decrypt"
 msgstr "использовать данный User ID для подписывания и расшифрования"
 
-#: g10/gpg.c:450
+#: g10/gpg.c:451
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|установить уровень сжатия N (по умолчанию - 0)"
 
-#: g10/gpg.c:455
+#: g10/gpg.c:456
 msgid "use canonical text mode"
 msgstr "использовать канонический текстовый режим"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:470
 msgid "use as output file"
 msgstr "вывод в указанный файл"
 
-#: g10/gpg.c:471 g10/gpgv.c:73
+#: g10/gpg.c:472 g10/gpgv.c:73
 msgid "verbose"
 msgstr "подробно"
 
-#: g10/gpg.c:482
+#: g10/gpg.c:483
 msgid "do not make any changes"
 msgstr "не делать никаких изменений"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:484
 msgid "prompt before overwriting"
 msgstr "спросить перед перезаписью"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:525
 msgid "use strict OpenPGP behavior"
 msgstr "строго следовать стандарту OpenPGP"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "generate PGP 2.x compatible messages"
 msgstr "создает сообщение совместимым с PGP 2.x"
 
-#: g10/gpg.c:553
+#: g10/gpg.c:554
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1164,7 +1164,7 @@ msgstr ""
 "@\n"
 "(См. документацию для более полного ознакомления с командами и параметрами)\n"
 
-#: g10/gpg.c:556
+#: g10/gpg.c:557
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1184,15 +1184,15 @@ msgstr ""
 " --list-keys [имена]        показать ключи\n"
 " --fingerprint [имена]      показать отпечатки\n"
 
-#: g10/gpg.c:746 g10/gpgv.c:98
+#: g10/gpg.c:751 g10/gpgv.c:98
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "О найденных ошибка сообщайте <gnupg-bugs@gnu.org>.\n"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:768
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Использование: gpg [параметры] [файлы] (-h для подсказки)"
 
-#: g10/gpg.c:766
+#: g10/gpg.c:771
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1202,7 +1202,7 @@ msgstr ""
 "подписать и проверить, зашифровать или расшифровать\n"
 "операция по умолчанию зависит от входных данных\n"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:782
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1210,92 +1210,92 @@ msgstr ""
 "\n"
 "Поддерживаются следующие алгоритмы:\n"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:785
 msgid "Pubkey: "
 msgstr "С открытым ключом: "
 
-#: g10/gpg.c:786 g10/keyedit.c:2266
+#: g10/gpg.c:791 g10/keyedit.c:2266
 msgid "Cipher: "
 msgstr "Симметричные шифры: "
 
-#: g10/gpg.c:792
+#: g10/gpg.c:797
 msgid "Hash: "
 msgstr "Хэш-функции: "
 
-#: g10/gpg.c:798 g10/keyedit.c:2312
+#: g10/gpg.c:803 g10/keyedit.c:2312
 msgid "Compression: "
 msgstr "Алгоритмы сжатия: "
 
-#: g10/gpg.c:881
+#: g10/gpg.c:886
 msgid "usage: gpg [options] "
 msgstr "использование: gpg [опции] "
 
-#: g10/gpg.c:1029
+#: g10/gpg.c:1034
 msgid "conflicting commands\n"
 msgstr "несовместимые команды\n"
 
-#: g10/gpg.c:1047
+#: g10/gpg.c:1052
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "отсутствует знак = в определении группы `%s'\n"
 
-#: g10/gpg.c:1244
+#: g10/gpg.c:1249
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасный владелец домашнего каталога `%s'\n"
 
-#: g10/gpg.c:1247
+#: g10/gpg.c:1252
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасный владелец файла конфигурации `%s'\n"
 
-#: g10/gpg.c:1250
+#: g10/gpg.c:1255
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасный владелец файла модуля расширения `%s'\n"
 
-#: g10/gpg.c:1256
+#: g10/gpg.c:1261
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасные права доступа к домашнему каталогу `%s'\n"
 
-#: g10/gpg.c:1259
+#: g10/gpg.c:1264
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасные права доступа к файлу конфигурации `%s'\n"
 
-#: g10/gpg.c:1262
+#: g10/gpg.c:1267
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "ВНИМАНИЕ: небезопасные права доступа к файлу модуля расширения `%s'\n"
 
-#: g10/gpg.c:1268
+#: g10/gpg.c:1273
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr ""
 "ВНИМАНИЕ: небезопасный владелец каталога содержащего домашний каталог `%s'\n"
 
-#: g10/gpg.c:1271
+#: g10/gpg.c:1276
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr ""
 "ВНИМАНИЕ: небезопасный владелец каталога содержащего файл конфигурации `%s'\n"
 
-#: g10/gpg.c:1274
+#: g10/gpg.c:1279
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr ""
 "ВНИМАНИЕ: небезопасный владелец каталога содержащего модуль расширения `%s'\n"
 
-#: g10/gpg.c:1280
+#: g10/gpg.c:1285
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "ВНИМАНИЕ: небезопасные права доступа к каталогу содержащему домашний каталог "
 "`%s'\n"
 
-#: g10/gpg.c:1283
+#: g10/gpg.c:1288
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
@@ -1303,466 +1303,476 @@ msgstr ""
 "ВНИМАНИЕ: небезопасные права доступа к каталогу содержащему файл "
 "конфигурации `%s'\n"
 
-#: g10/gpg.c:1286
+#: g10/gpg.c:1291
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "ВНИМАНИЕ: небезопасные права доступа к каталогу содержащему файл модуля "
 "расширения `%s'\n"
 
-#: g10/gpg.c:1427
+#: g10/gpg.c:1432
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "неизвестный параметр в файле конфигурации `%s'\n"
 
-#: g10/gpg.c:1521
+#: g10/gpg.c:1526
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1523
+#: g10/gpg.c:1528
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1525
+#: g10/gpg.c:1530
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Нет соответствующей подписи в связке секретных\n"
 
-#: g10/gpg.c:1527
+#: g10/gpg.c:1532
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1536
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1538
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "заданный URL предпочитаемого сервера ключей неправилен\n"
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1540
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1542
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1544
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1546
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "переключение между просмотром открытых и закрытых ключей"
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1548
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Нет соответствующей подписи в связке секретных\n"
 
-#: g10/gpg.c:1874
+#: g10/gpg.c:1879
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "ЗАМЕЧАНИЕ: старый файл конфигурации по умолчанию `%s' проигнорирован\n"
 
-#: g10/gpg.c:1916
+#: g10/gpg.c:1921
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "ЗАМЕЧАНИЕ: файл конфигурации `%s' не обнаружен\n"
 
-#: g10/gpg.c:1920
+#: g10/gpg.c:1925
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "файл конфигурации `%s': %s\n"
 
-#: g10/gpg.c:1927
+#: g10/gpg.c:1932
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "параметры конфигурации взяты из файла `%s'\n"
 
-#: g10/gpg.c:2142 g10/gpg.c:2716 g10/gpg.c:2735
+#: g10/gpg.c:2147 g10/gpg.c:2747 g10/gpg.c:2766
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "ЗАМЕЧАНИЕ: %s не предназначен для нормального применения!\n"
 
-#: g10/gpg.c:2158
+#: g10/gpg.c:2163
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "расширение шифра `%s' не загружено вследствие небезопасных прав доступа\n"
 
-#: g10/gpg.c:2312 g10/gpg.c:2324
+#: g10/gpg.c:2317 g10/gpg.c:2329
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' недопустимый срок действия подписи\n"
 
-#: g10/gpg.c:2400
+#: g10/gpg.c:2405
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' недопустимая таблица символов\n"
 
-#: g10/gpg.c:2422 g10/keyedit.c:3997
+#: g10/gpg.c:2429 g10/keyedit.c:3997
 msgid "could not parse keyserver URL\n"
 msgstr "не могу проанализировать URL сервера ключей\n"
 
 # test it
-#: g10/gpg.c:2428
+#: g10/gpg.c:2441
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: недопустимые параметры для сервера ключей\n"
 
 # test it
-#: g10/gpg.c:2431
+#: g10/gpg.c:2444
 msgid "invalid keyserver options\n"
 msgstr "недопустимые параметры для сервера ключей\n"
 
-#: g10/gpg.c:2438
+#: g10/gpg.c:2451
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: недопустимые параметры импорта\n"
 
-#: g10/gpg.c:2441
+#: g10/gpg.c:2454
 msgid "invalid import options\n"
 msgstr "недопустимые параметры импорта\n"
 
-#: g10/gpg.c:2448
+#: g10/gpg.c:2461
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: недопустимые параметры экспорта\n"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2464
 msgid "invalid export options\n"
 msgstr "недопустимые параметры экспорта\n"
 
-#: g10/gpg.c:2458
+#: g10/gpg.c:2471
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: недопустимый список параметров\n"
 
-#: g10/gpg.c:2461
+#: g10/gpg.c:2474
 msgid "invalid list options\n"
 msgstr "недопустимый список параметров\n"
 
-#: g10/gpg.c:2469
+#: g10/gpg.c:2482
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2471
+#: g10/gpg.c:2484
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2473
+#: g10/gpg.c:2486
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' недопустимый срок действия подписи\n"
 
-#: g10/gpg.c:2475
+#: g10/gpg.c:2488
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2479
+#: g10/gpg.c:2492
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2481
+#: g10/gpg.c:2494
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "заданный URL предпочитаемого сервера ключей неправилен\n"
 
-#: g10/gpg.c:2483
+#: g10/gpg.c:2496
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' недопустимый срок действия подписи\n"
 
-#: g10/gpg.c:2485
+#: g10/gpg.c:2498
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
 # test it
-#: g10/gpg.c:2492
+#: g10/gpg.c:2505
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: недопустимые параметры проверки \n"
 
 # test it
-#: g10/gpg.c:2495
+#: g10/gpg.c:2508
 msgid "invalid verify options\n"
 msgstr "недопустимые параметры проверки\n"
 
-#: g10/gpg.c:2502
+#: g10/gpg.c:2515
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "не могу определить путь запуска для %s\n"
 
-#: g10/gpg.c:2705
+# test it
+#: g10/gpg.c:2665
+#, fuzzy, c-format
+msgid "%s:%d: invalid auto-key-locate list\n"
+msgstr "%s:%d: недопустимые параметры проверки \n"
+
+#: g10/gpg.c:2668
+msgid "invalid auto-key-locate list\n"
+msgstr ""
+
+#: g10/gpg.c:2736
 msgid "WARNING: program may create a core file!\n"
 msgstr "ВНИМАНИЕ: возможно создание файла дампа памяти!\n"
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2740
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ВНИМАНИЕ: %s заместит %s\n"
 
-#: g10/gpg.c:2718
+#: g10/gpg.c:2749
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s не допускается использовать с %s!\n"
 
-#: g10/gpg.c:2721
+#: g10/gpg.c:2752
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s не имеет смысла совместно с %s!\n"
 
-#: g10/gpg.c:2728
+#: g10/gpg.c:2759
 #, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "ПРЕДУПРЕЖДАЮ: %s недоступен в данной версии\n"
 
-#: g10/gpg.c:2743
+#: g10/gpg.c:2774
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "не будет работать с небезопасной памятью из-за %s\n"
 
-#: g10/gpg.c:2757
+#: g10/gpg.c:2788
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "можно сделать только отделенную или прозрачную подпись в режиме --pgp2\n"
 
-#: g10/gpg.c:2763
+#: g10/gpg.c:2794
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "Вы не можете одновременно подписать и зашифровать в режиме --pgp2\n"
 
-#: g10/gpg.c:2769
+#: g10/gpg.c:2800
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "Вы должны использовать файлы (а не каналы (pipe)) в режиме --pgp2.\n"
 
-#: g10/gpg.c:2782
+#: g10/gpg.c:2813
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "для зашифрования сообщения в режиме --pgp2 требуется шифр IDEA\n"
 
-#: g10/gpg.c:2849 g10/gpg.c:2873
+#: g10/gpg.c:2880 g10/gpg.c:2904
 msgid "selected cipher algorithm is invalid\n"
 msgstr "выбран неверный алгоритм шифрования\n"
 
-#: g10/gpg.c:2855 g10/gpg.c:2879
+#: g10/gpg.c:2886 g10/gpg.c:2910
 msgid "selected digest algorithm is invalid\n"
 msgstr "выбрана неверная хэш-функция\n"
 
-#: g10/gpg.c:2861
+#: g10/gpg.c:2892
 msgid "selected compression algorithm is invalid\n"
 msgstr "выбран неверный алгоритм сжатия\n"
 
-#: g10/gpg.c:2867
+#: g10/gpg.c:2898
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "выбрана неверная хэш-функция для сертификации\n"
 
-#: g10/gpg.c:2882
+#: g10/gpg.c:2913
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed должен быть больше 0\n"
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2915
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed должен быть больше 1\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2917
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth должен быть в диапазоне от 1 до 255\n"
 
-#: g10/gpg.c:2888
+#: g10/gpg.c:2919
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "недопустимый default-cert-level; должен быть 0, 1, 2 или 3\n"
 
-#: g10/gpg.c:2890
+#: g10/gpg.c:2921
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "недопустимый min-cert-level; должен быть 0, 1, 2 или 3\n"
 
-#: g10/gpg.c:2893
+#: g10/gpg.c:2924
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "ЗАМЕЧАНИЕ: простой режим S2K (0) строго не рекомендуется\n"
 
-#: g10/gpg.c:2897
+#: g10/gpg.c:2928
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "недопустимый режим S2K; должно быть 0, 1 или 3\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2935
 msgid "invalid default preferences\n"
 msgstr "недопустимые предпочтения по умолчанию\n"
 
-#: g10/gpg.c:2913
+#: g10/gpg.c:2944
 msgid "invalid personal cipher preferences\n"
 msgstr "недопустимые персональные предпочтения шифра\n"
 
-#: g10/gpg.c:2917
+#: g10/gpg.c:2948
 msgid "invalid personal digest preferences\n"
 msgstr "недопустимые персональные предпочтения хэш-функции\n"
 
-#: g10/gpg.c:2921
+#: g10/gpg.c:2952
 msgid "invalid personal compress preferences\n"
 msgstr "недопустимые персональные предпочтения алгоритмов сжатия\n"
 
-#: g10/gpg.c:2954
+#: g10/gpg.c:2985
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s пока не работает совместно с %s!\n"
 
-#: g10/gpg.c:3001
+#: g10/gpg.c:3032
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "Вы не можете использовать шифрование `%s' в режиме %s\n"
 
-#: g10/gpg.c:3006
+#: g10/gpg.c:3037
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "Вы не можете использовать хэш-функцию `%s' в режиме %s\n"
 
-#: g10/gpg.c:3011
+#: g10/gpg.c:3042
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "Вы не можете использовать сжатие `%s' в режиме %s\n"
 
-#: g10/gpg.c:3107
+#: g10/gpg.c:3138
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "сбой инициализации таблицы доверий: %s\n"
 
-#: g10/gpg.c:3118
+#: g10/gpg.c:3149
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "ВНИМАНИЕ: получатели (-r) заданы без использования шифрования с открытым "
 "ключом\n"
 
-#: g10/gpg.c:3129
+#: g10/gpg.c:3160
 msgid "--store [filename]"
 msgstr "--store [filename]"
 
-#: g10/gpg.c:3136
+#: g10/gpg.c:3167
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filename]"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3169
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "симметричное шифрование `%s' не удалось: %s\n"
 
-#: g10/gpg.c:3148
+#: g10/gpg.c:3179
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filename]"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3192
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [имяфайла]"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3194
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "нельзя использовать --symmetric --encrypt совместно с --s2k-mode 0\n"
 
-#: g10/gpg.c:3166
+#: g10/gpg.c:3197
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "невозможно использовать --symmetric --encrypt в режиме %s\n"
 
-#: g10/gpg.c:3184
+#: g10/gpg.c:3215
 msgid "--sign [filename]"
 msgstr "--sign [filename]"
 
-#: g10/gpg.c:3197
+#: g10/gpg.c:3228
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filename]"
 
-#: g10/gpg.c:3212
+#: g10/gpg.c:3243
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [имяфайла]"
 
-#: g10/gpg.c:3214
+#: g10/gpg.c:3245
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 "нельзя использовать --symmetric --sign --encrypt совместно с --s2k-mode 0\n"
 
-#: g10/gpg.c:3217
+#: g10/gpg.c:3248
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "невозможно использовать --symmetric --sign --encrypt в режиме %s\n"
 
-#: g10/gpg.c:3237
+#: g10/gpg.c:3268
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [filename]"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3277
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filename]"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3302
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filename]"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3310
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3283
+#: g10/gpg.c:3314
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3335
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [commands]"
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3406
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [user-id] [keyring]"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3443
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "сбой при отправке на сервер ключей: %s\n"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3445
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "сбой при получении с сервера ключей: %s\n"
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3447
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "сбой при экспорте ключа: %s\n"
 
-#: g10/gpg.c:3427
+#: g10/gpg.c:3458
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "сбой при поиске на сервере ключей: %s\n"
 
-#: g10/gpg.c:3437
+#: g10/gpg.c:3468
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "сбой при обновлении с сервера ключей: %s\n"
 
-#: g10/gpg.c:3488
+#: g10/gpg.c:3519
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ошибка преобразования из ASCII формата: %s\n"
 
-#: g10/gpg.c:3496
+#: g10/gpg.c:3527
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "ошибка преобразования в ASCII формат: %s\n"
 
-#: g10/gpg.c:3583
+#: g10/gpg.c:3614
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "недопустимая хэш-функция `%s'\n"
 
-#: g10/gpg.c:3706
+#: g10/gpg.c:3737
 msgid "[filename]"
 msgstr "[filename]"
 
-#: g10/gpg.c:3710
+#: g10/gpg.c:3741
 msgid "Go ahead and type your message ...\n"
 msgstr "Набирайте Ваше сообщение ...\n"
 
-#: g10/gpg.c:4000
+#: g10/gpg.c:4031
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1770,27 +1780,27 @@ msgstr ""
 "имя примечания должно содержать только печатные символы или пробелы,и "
 "заканчиваться знаком '='\n"
 
-#: g10/gpg.c:4008
+#: g10/gpg.c:4039
 msgid "a user notation name must contain the '@' character\n"
 msgstr "имя примечания пользователя должно содержать '@' символ\n"
 
-#: g10/gpg.c:4013
+#: g10/gpg.c:4044
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "имя пользователя не должно содержать более одного символа '@'\n"
 
-#: g10/gpg.c:4024
+#: g10/gpg.c:4055
 msgid "a notation value must not use any control characters\n"
 msgstr "значение примечания не должно содержать управляющие символы\n"
 
-#: g10/gpg.c:4058
+#: g10/gpg.c:4089
 msgid "the given certification policy URL is invalid\n"
 msgstr "заданный URL политики сертификации неверен\n"
 
-#: g10/gpg.c:4060
+#: g10/gpg.c:4091
 msgid "the given signature policy URL is invalid\n"
 msgstr "заданный URL политики подписи неверен\n"
 
-#: g10/gpg.c:4093
+#: g10/gpg.c:4124
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "заданный URL предпочитаемого сервера ключей неправилен\n"
 
@@ -1798,33 +1808,34 @@ msgstr "заданный URL предпочитаемого сервера кл
 msgid "too many entries in pk cache - disabled\n"
 msgstr "слишком много входов в pk кэше - отключено\n"
 
-#: g10/getkey.c:188 g10/getkey.c:2845
+#: g10/getkey.c:188 g10/getkey.c:2876
 msgid "[User ID not found]"
 msgstr "[User ID не найден]"
 
-#: g10/getkey.c:931 g10/getkey.c:953 g10/getkey.c:976
+#: g10/getkey.c:933 g10/getkey.c:950 g10/getkey.c:970 g10/getkey.c:986
+#: g10/getkey.c:1001
 #, c-format
 msgid "Automatically retrieved `%s' via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1769
+#: g10/getkey.c:1800
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Дефектный ключ %s признан пригодным согласно параметра --allow-non-"
 "selfsigned-uid\n"
 
-#: g10/getkey.c:2323
+#: g10/getkey.c:2354
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "нет секретного подключа для открытого подключа %s - игнорируем\n"
 
-#: g10/getkey.c:2554
+#: g10/getkey.c:2585
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "использую подклключ %s вместо главного ключа %s\n"
 
-#: g10/getkey.c:2601
+#: g10/getkey.c:2632
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "ключ %s: секретный ключ без открытого ключа - пропущен\n"
@@ -3342,12 +3353,12 @@ msgid "(sensitive)"
 msgstr ""
 
 #: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
-#: g10/keylist.c:194 g10/keyserver.c:471
+#: g10/keylist.c:194 g10/keyserver.c:525
 #, c-format
 msgid "created: %s"
 msgstr "создан: %s"
 
-#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:967
+#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:960
 #, c-format
 msgid "revoked: %s"
 msgstr "отозван: %s"
@@ -3359,7 +3370,7 @@ msgstr "просрочен с: %s"
 
 #: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
 #: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:477 g10/mainproc.c:973
+#: g10/keylist.c:914 g10/keyserver.c:531 g10/mainproc.c:966
 #, c-format
 msgid "expires: %s"
 msgstr "годен до: %s"
@@ -3395,13 +3406,13 @@ msgstr ""
 "Учтите, что показанные степени достоверности могут быть неверными,\n"
 "пока Вы не перезапустите программу.\n"
 
-#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:481
-#: g10/mainproc.c:1734 g10/trustdb.c:1184 g10/trustdb.c:1704
+#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:535
+#: g10/mainproc.c:1783 g10/trustdb.c:1184 g10/trustdb.c:1704
 msgid "revoked"
 msgstr "отозван"
 
-#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:485
-#: g10/mainproc.c:1736 g10/trustdb.c:537 g10/trustdb.c:1706
+#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:539
+#: g10/mainproc.c:1785 g10/trustdb.c:537 g10/trustdb.c:1706
 msgid "expired"
 msgstr "просрочен с"
 
@@ -4220,385 +4231,382 @@ msgstr "%s: таблица ключей создана\n"
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:77
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:81
+#: g10/keyserver.c:79
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:83
+#: g10/keyserver.c:81
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:87
+#: g10/keyserver.c:85
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:89
-msgid "automatically retrieve keys from PKA records"
-msgstr ""
-
-#: g10/keyserver.c:91
-msgid "automatically retrieve keys from DNS"
-msgstr ""
-
-#: g10/keyserver.c:95
+#: g10/keyserver.c:87
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "Введите URL предпочтаемого сервера ключей: "
 
-#: g10/keyserver.c:139
+#: g10/keyserver.c:89
+msgid "honor the PKA record set on a key when retrieving keys"
+msgstr ""
+
+#: g10/keyserver.c:154
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "ВНИМАНИЕ: параметр сервера ключей `%s' не используется на данной платформе\n"
 
-#: g10/keyserver.c:483
+#: g10/keyserver.c:537
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:684
+#: g10/keyserver.c:738
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Введите число(а), N) Следующий или Q) Выход> "
 
 # test it
-#: g10/keyserver.c:767 g10/keyserver.c:1368
+#: g10/keyserver.c:821 g10/keyserver.c:1422
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "invalid keyserver protocol (us %d!=handler %d)\n"
 
-#: g10/keyserver.c:865
+#: g10/keyserver.c:919
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "ключ \"%s\" не найден на сервере ключей\n"
 
-#: g10/keyserver.c:867
+#: g10/keyserver.c:921
 msgid "key not found on keyserver\n"
 msgstr "ключ не найден на сервере ключей\n"
 
-#: g10/keyserver.c:1092
+#: g10/keyserver.c:1146
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "запрашиваю ключ %s с %s сервера %s\n"
 
-#: g10/keyserver.c:1096
+#: g10/keyserver.c:1150
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "получение ключа %s с %s\n"
 
-#: g10/keyserver.c:1120
+#: g10/keyserver.c:1174
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "поиск \"%s\" на %s сервере %s\n"
 
-#: g10/keyserver.c:1123
+#: g10/keyserver.c:1177
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "поиск \"%s\" на %s\n"
 
-#: g10/keyserver.c:1271
+#: g10/keyserver.c:1325
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "отправляю ключ %s на %s сервер %s\n"
 
-#: g10/keyserver.c:1275
+#: g10/keyserver.c:1329
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "отправка ключа %s на %s\n"
 
-#: g10/keyserver.c:1318
+#: g10/keyserver.c:1372
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "поиск \"%s\" на %s сервере %s\n"
 
-#: g10/keyserver.c:1321
+#: g10/keyserver.c:1375
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "поиск \"%s\" на %s\n"
 
 # test it
-#: g10/keyserver.c:1328 g10/keyserver.c:1424
+#: g10/keyserver.c:1382 g10/keyserver.c:1478
 msgid "no keyserver action!\n"
 msgstr ""
 
-#: g10/keyserver.c:1376
+#: g10/keyserver.c:1430
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "ВНИМАНИЕ: обработчик сервера ключей от другой версии GnuPG (%s)\n"
 
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1439
 msgid "keyserver did not send VERSION\n"
 msgstr "сервер ключей не прислал VERSION\n"
 
-#: g10/keyserver.c:1446
+#: g10/keyserver.c:1500
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "не заданы серверы ключей (используйте --keyserver)\n"
 
-#: g10/keyserver.c:1452
+#: g10/keyserver.c:1506
 msgid "external keyserver calls are not supported in this build\n"
 msgstr "Данная сборка не поддерживает внешние вызовы для сервера ключей.\n"
 
-#: g10/keyserver.c:1464
+#: g10/keyserver.c:1518
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "нет обработчика для схемы сервера ключей `%s'\n"
 
-#: g10/keyserver.c:1469
+#: g10/keyserver.c:1523
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "действие `%s' не поддерживается серверами ключей `%s'\n"
 
-#: g10/keyserver.c:1477
+#: g10/keyserver.c:1531
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "%s не поддерживает версию обработчика %d\n"
 
-#: g10/keyserver.c:1484
+#: g10/keyserver.c:1538
 msgid "keyserver timed out\n"
 msgstr "превышено время ожидания сервера ключей\n"
 
-#: g10/keyserver.c:1489
+#: g10/keyserver.c:1543
 msgid "keyserver internal error\n"
 msgstr "ошибка сервера ключей\n"
 
-#: g10/keyserver.c:1498
+#: g10/keyserver.c:1552
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "ошибка связи с сервером ключей: %s\n"
 
-#: g10/keyserver.c:1523 g10/keyserver.c:1557
+#: g10/keyserver.c:1577 g10/keyserver.c:1611
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" не идентификатор ключа: пропущен\n"
 
-#: g10/keyserver.c:1814
+#: g10/keyserver.c:1868
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "ВНИМАНИЕ: невозможно обновить ключ %s с %s: %s\n"
 
-#: g10/keyserver.c:1836
+#: g10/keyserver.c:1890
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "обновление 1 ключа из %s\n"
 
-#: g10/keyserver.c:1838
+#: g10/keyserver.c:1892
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "обновление %d ключей из %s\n"
 
-#: g10/keyserver.c:1903
+#: g10/keyserver.c:1957
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "ВНИМАНИЕ: невозможно обновить ключ %s с %s: %s\n"
 
-#: g10/keyserver.c:1909
+#: g10/keyserver.c:1963
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "ВНИМАНИЕ: невозможно обновить ключ %s с %s: %s\n"
 
-#: g10/mainproc.c:253
+#: g10/mainproc.c:240
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "странный размер зашифрованного сеансового ключа (%d)\n"
 
-#: g10/mainproc.c:304
+#: g10/mainproc.c:291
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "сеансовый ключ зашифрован %s \n"
 
-#: g10/mainproc.c:314
+#: g10/mainproc.c:301
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "пароль создан с незнакомой хеш-фкнкцией %d\n"
 
-#: g10/mainproc.c:395
+#: g10/mainproc.c:382
 #, c-format
 msgid "public key is %s\n"
 msgstr "открытый ключ %s\n"
 
-#: g10/mainproc.c:450
+#: g10/mainproc.c:439
 msgid "public key encrypted data: good DEK\n"
 msgstr "данные зашифрованы открытым ключом: правильный DEK\n"
 
-#: g10/mainproc.c:483
+#: g10/mainproc.c:472
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "зашифровано %u-битным ключом %s, с ID %s, созданным %s\n"
 
-#: g10/mainproc.c:487 g10/pkclist.c:219
+#: g10/mainproc.c:476 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:491
+#: g10/mainproc.c:480
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "зашифровано ключом %s с ID %s\n"
 
-#: g10/mainproc.c:505
+#: g10/mainproc.c:494
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "сбой расшифрования с открытым ключом: %s\n"
 
-#: g10/mainproc.c:519
+#: g10/mainproc.c:508
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "зашифровано с %lu паролями\n"
 
-#: g10/mainproc.c:521
+#: g10/mainproc.c:510
 msgid "encrypted with 1 passphrase\n"
 msgstr "зашифровано с 1 паролем\n"
 
-#: g10/mainproc.c:549 g10/mainproc.c:571
+#: g10/mainproc.c:541 g10/mainproc.c:563
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "принятие %s зашифрованных данных\n"
 
-#: g10/mainproc.c:557
+#: g10/mainproc.c:549
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "шифр IDEA недоступен, попробуйте использовать взамен %s\n"
 
-#: g10/mainproc.c:589
+#: g10/mainproc.c:581
 msgid "decryption okay\n"
 msgstr "Расшифровано\n"
 
-#: g10/mainproc.c:593
+#: g10/mainproc.c:585
 msgid "WARNING: message was not integrity protected\n"
 msgstr "ВНИМАНИЕ: целостность сообщения не защищена\n"
 
-#: g10/mainproc.c:606
+#: g10/mainproc.c:598
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "ВНИМАНИЕ: зашифрованное сообщение было изменено!\n"
 
-#: g10/mainproc.c:612
+#: g10/mainproc.c:604
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "сбой расшифрования: %s\n"
 
-#: g10/mainproc.c:631
+#: g10/mainproc.c:623
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "ЗАМЕТЬТЕ: отправитель требует \"только для просмотра Вами\"\n"
 
-#: g10/mainproc.c:633
+#: g10/mainproc.c:625
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "оригинальное имя файла='%.*s'\n"
 
-#: g10/mainproc.c:822
+#: g10/mainproc.c:815
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "самостоятельный сертификат отзыва: \"gpg --import\" для применения\n"
 
-#: g10/mainproc.c:1168
+#: g10/mainproc.c:1161
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Действительная подпись от \"%s\""
 
-#: g10/mainproc.c:1418
+#: g10/mainproc.c:1419
 msgid "signature verification suppressed\n"
 msgstr "проверка подписи подавлена\n"
 
-#: g10/mainproc.c:1460 g10/mainproc.c:1470
-msgid "can't handle these multiple signatures\n"
+#: g10/mainproc.c:1519
+#, fuzzy
+msgid "can't handle this ambiguous signature data\n"
 msgstr "не могу обработать эти множественные подписи\n"
 
-#: g10/mainproc.c:1480
+#: g10/mainproc.c:1530
 #, c-format
 msgid "Signature made %s\n"
 msgstr "Подпись сделана %s\n"
 
-#: g10/mainproc.c:1481
+#: g10/mainproc.c:1531
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               ключом %s с ID %s\n"
 
-#: g10/mainproc.c:1485
+#: g10/mainproc.c:1535
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Подпись создана %s ключом %s с ID %s\n"
 
-#: g10/mainproc.c:1505
+#: g10/mainproc.c:1555
 msgid "Key available at: "
 msgstr "Ключ доступен на:"
 
-#: g10/mainproc.c:1639 g10/mainproc.c:1687
+#: g10/mainproc.c:1688 g10/mainproc.c:1736
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "ПЛОХАЯ подпись от  \"%s\""
 
-#: g10/mainproc.c:1641 g10/mainproc.c:1689
+#: g10/mainproc.c:1690 g10/mainproc.c:1738
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Просроченная подпись от \"%s\""
 
-#: g10/mainproc.c:1643 g10/mainproc.c:1691
+#: g10/mainproc.c:1692 g10/mainproc.c:1740
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "Действительная подпись от \"%s\""
 
-#: g10/mainproc.c:1695
+#: g10/mainproc.c:1744
 msgid "[uncertain]"
 msgstr "[сомнительно]"
 
-#: g10/mainproc.c:1727
+#: g10/mainproc.c:1776
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                aka \"%s\""
 
-#: g10/mainproc.c:1824
+#: g10/mainproc.c:1873
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Подпись просрочена %s\n"
 
-#: g10/mainproc.c:1829
+#: g10/mainproc.c:1878
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Подпись действительна до %s\n"
 
-#: g10/mainproc.c:1832
+#: g10/mainproc.c:1881
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s подпись, хэш-функция %s\n"
 
-#: g10/mainproc.c:1833
+#: g10/mainproc.c:1882
 msgid "binary"
 msgstr "двоичный"
 
-#: g10/mainproc.c:1834
+#: g10/mainproc.c:1883
 msgid "textmode"
 msgstr "текстовый"
 
-#: g10/mainproc.c:1834 g10/trustdb.c:536
+#: g10/mainproc.c:1883 g10/trustdb.c:536
 msgid "unknown"
 msgstr "неизвестно"
 
-#: g10/mainproc.c:1854
+#: g10/mainproc.c:1903
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Не могу проверить подпись: %s\n"
 
-#: g10/mainproc.c:1922 g10/mainproc.c:1938 g10/mainproc.c:2024
+#: g10/mainproc.c:1972 g10/mainproc.c:1988 g10/mainproc.c:2074
 msgid "not a detached signature\n"
 msgstr "не отделенная подпись\n"
 
-#: g10/mainproc.c:1965
+#: g10/mainproc.c:2015
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "ВНИМАНИЕ: обнаружено множество подписей.  Только первая будет проверена.\n"
 
-#: g10/mainproc.c:1973
+#: g10/mainproc.c:2023
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "самостоятельная подпись класса 0x%02x\n"
 
-#: g10/mainproc.c:2030
+#: g10/mainproc.c:2080
 msgid "old style (PGP 2.x) signature\n"
 msgstr "старый (PGP 2.x) стиль подписи\n"
 
-#: g10/mainproc.c:2040
+#: g10/mainproc.c:2090
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "обнаружен недопустимый корневой пакет в proc_tree()\n"
 
@@ -5156,23 +5164,23 @@ msgstr "данные не сохранены; используйте \"--output\
 msgid "error creating `%s': %s\n"
 msgstr "ошибка создания `%s': %s\n"
 
-#: g10/plaintext.c:447
+#: g10/plaintext.c:453
 msgid "Detached signature.\n"
 msgstr "Отделенная подпись.\n"
 
-#: g10/plaintext.c:453
+#: g10/plaintext.c:459
 msgid "Please enter name of data file: "
 msgstr "Введите имя файла с данными: "
 
-#: g10/plaintext.c:485
+#: g10/plaintext.c:491
 msgid "reading stdin ...\n"
 msgstr "читаю stdin ...\n"
 
-#: g10/plaintext.c:519
+#: g10/plaintext.c:525
 msgid "no signed data\n"
 msgstr "не подписанные данные\n"
 
-#: g10/plaintext.c:533
+#: g10/plaintext.c:539
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "не могу открыть подписанные данные `%s'\n"
diff --git a/po/sk.po b/po/sk.po
index a6bbac515..3c0511e6e 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.5\n"
 "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2006-02-14 15:28+0100\n"
+"POT-Creation-Date: 2006-03-07 11:29+0100\n"
 "PO-Revision-Date: 2004-07-20 15:52+0200\n"
 "Last-Translator: Michal Majer <mmajer@econ.umb.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -39,9 +39,9 @@ msgstr "zapisujem tajn
 
 #: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:992 g10/gpg.c:3360 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:997 g10/gpg.c:3391 g10/import.c:193 g10/keygen.c:2274
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:476 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
+#: g10/plaintext.c:482 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
 #: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
@@ -75,7 +75,7 @@ msgstr "nem
 msgid "note: random_seed file not updated\n"
 msgstr "pozn�mka: s�bor random_seed nie je aktualizovan�\n"
 
-#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:991 g10/keygen.c:2753
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2753
 #: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
 #: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
 #, c-format
@@ -691,48 +691,48 @@ msgstr "zapisujem tajn
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Neplatn� pr�kaz (sk�ste \"help\")\n"
 
-#: g10/cardglue.c:435
+#: g10/cardglue.c:434
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:572
+#: g10/cardglue.c:573
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:580
+#: g10/cardglue.c:582
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:915
+#: g10/cardglue.c:917
 msgid "Enter New Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:916
+#: g10/cardglue.c:918
 msgid "Enter New PIN: "
 msgstr ""
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:919
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:920
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/cardglue.c:935
+#: g10/cardglue.c:937
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Opakujte heslo: "
 
-#: g10/cardglue.c:950
+#: g10/cardglue.c:952
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "heslo nie je zopakovan� spr�vne; sk�ste to znovu"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3720 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3751 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -742,13 +742,13 @@ msgstr "nemo
 msgid "--output doesn't work for this command\n"
 msgstr "--output pre tento pr�kaz nefunguje\n"
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1644
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1698
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "k��� `%s' nebol n�jden�: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1658
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1712
 #: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -861,12 +861,12 @@ msgstr ""
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s za�ifrovan� pre: %s\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:306
+#: g10/encr-data.c:67 g10/mainproc.c:293
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s za�ifrovan� d�ta\n"
 
-#: g10/encr-data.c:69 g10/mainproc.c:310
+#: g10/encr-data.c:69 g10/mainproc.c:297
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "za�ifrovan� nezn�mym algoritmom %d\n"
@@ -1009,7 +1009,7 @@ msgstr "VAROVANIE: tajn
 msgid "WARNING: nothing exported\n"
 msgstr "VAROVANIE: ni� nebolo vyexportovan�\n"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:373
 msgid ""
 "@Commands:\n"
 " "
@@ -1017,128 +1017,128 @@ msgstr ""
 "@Pr�kazy:\n"
 " "
 
-#: g10/gpg.c:374
+#: g10/gpg.c:375
 msgid "|[file]|make a signature"
 msgstr "|[s�bor]|vytvori� podpis"
 
-#: g10/gpg.c:375
+#: g10/gpg.c:376
 msgid "|[file]|make a clear text signature"
 msgstr "|[s�bor]|vytvori� podpis v �itate�nom dokumente"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:377
 msgid "make a detached signature"
 msgstr "vytvori� podpis oddelen� od dokumentu"
 
-#: g10/gpg.c:377
+#: g10/gpg.c:378
 msgid "encrypt data"
 msgstr "�ifrova� d�ta"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:380
 msgid "encryption only with symmetric cipher"
 msgstr "�ifrovanie len so symetrickou �ifrou"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:382
 msgid "decrypt data (default)"
 msgstr "de�ifrova� d�ta (implicitne)"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:384
 msgid "verify a signature"
 msgstr "verifikova� podpis"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:386
 msgid "list keys"
 msgstr "vyp�sa� zoznam k���ov"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "list keys and signatures"
 msgstr "vyp�sa� zoznam k���ov a podpisov"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:389
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "skontrolova� podpisy k���ov"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:390
 msgid "list keys and fingerprints"
 msgstr "vyp�sa� zoznam k���ov a fingerprintov"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:391
 msgid "list secret keys"
 msgstr "vyp�sa� zoznam tajn�ch k���ov"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:392
 msgid "generate a new key pair"
 msgstr "vytvori� nov� p�r k���ov"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:393
 msgid "remove keys from the public keyring"
 msgstr "odstr�ni� k��� zo s�boru verejn�ch k���ov"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:395
 msgid "remove keys from the secret keyring"
 msgstr "odstr�ni� k��� zo s�boru tajn�ch k���ov"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:396
 msgid "sign a key"
 msgstr "podp�sa� k���"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:397
 msgid "sign a key locally"
 msgstr "podp�sa� k��� lok�lne"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:398
 msgid "sign or edit a key"
 msgstr "podp�sa� alebo modifikova� k���"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:399
 msgid "generate a revocation certificate"
 msgstr "vytvori� revoka�n� certifik�t"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:401
 msgid "export keys"
 msgstr "exportova� k���e"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:402
 msgid "export keys to a key server"
 msgstr "exportova� k���e na server k���ov"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:403
 msgid "import keys from a key server"
 msgstr "importova� k���e zo servera k���ov"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:405
 msgid "search for keys on a key server"
 msgstr "vyh�ada� k���e na serveri k���ov"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:407
 msgid "update all keys from a keyserver"
 msgstr "aktualizova� v�etky k���e zo servera k���ov"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:411
 msgid "import/merge keys"
 msgstr "importova�/zl��i� k���e"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:414
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:414
+#: g10/gpg.c:415
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:415
+#: g10/gpg.c:416
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:423
+#: g10/gpg.c:424
 msgid "update the trust database"
 msgstr "aktualizova� datab�zu d�very"
 
-#: g10/gpg.c:430
+#: g10/gpg.c:431
 msgid "|algo [files]|print message digests"
 msgstr "|algo [s�bory]|vyp�� hash"
 
-#: g10/gpg.c:434 g10/gpgv.c:71
+#: g10/gpg.c:435 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1148,55 +1148,55 @@ msgstr ""
 "Mo�nosti:\n"
 " "
 
-#: g10/gpg.c:436
+#: g10/gpg.c:437
 msgid "create ascii armored output"
 msgstr "vytvor v�stup zak�dovan� pomocou ASCII"
 
-#: g10/gpg.c:438
+#: g10/gpg.c:439
 msgid "|NAME|encrypt for NAME"
 msgstr "|MENO|�ifrova� pre MENO"
 
-#: g10/gpg.c:449
+#: g10/gpg.c:450
 msgid "use this user-id to sign or decrypt"
 msgstr ""
 "pou�i� toto id u��vate�a na podp�sanie\n"
 " alebo de�ifrovanie"
 
-#: g10/gpg.c:450
+#: g10/gpg.c:451
 msgid "|N|set compress level N (0 disables)"
 msgstr ""
 "|N|nastavi� �rove� komprim�cie N (0 - �iadna\n"
 " komprim�cia)"
 
-#: g10/gpg.c:455
+#: g10/gpg.c:456
 msgid "use canonical text mode"
 msgstr "pou�i� k�nonick� textov� m�d"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:470
 msgid "use as output file"
 msgstr "pou�i� ako v�stupn� s�bor"
 
-#: g10/gpg.c:471 g10/gpgv.c:73
+#: g10/gpg.c:472 g10/gpgv.c:73
 msgid "verbose"
 msgstr "s dodato�n�mi inform�ciami"
 
-#: g10/gpg.c:482
+#: g10/gpg.c:483
 msgid "do not make any changes"
 msgstr "nevykona� �iadne zmeny"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:484
 msgid "prompt before overwriting"
 msgstr "vy�iada� potvrdenie pred prep�san�m"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:525
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
-#: g10/gpg.c:553
+#: g10/gpg.c:554
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1205,7 +1205,7 @@ msgstr ""
 "(Pou�ite manu�lov� str�nky pre kompletn� zoznam v�etk�ch pr�kazov a "
 "mo�nost�)\n"
 
-#: g10/gpg.c:556
+#: g10/gpg.c:557
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1225,17 +1225,17 @@ msgstr ""
 " --list-keys [men�]        vyp�sa� k���e\n"
 " --fingerprint [men�]      vyp�sa� fingerprinty\n"
 
-#: g10/gpg.c:746 g10/gpgv.c:98
+#: g10/gpg.c:751 g10/gpgv.c:98
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr ""
 "Chyby ozn�mte, pros�m, na adresu <gnupg-bugs@gnu.org>.\n"
 "Pripomienky k prekladu <sk-i18n@lists.linux.sk>.\n"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:768
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
 
-#: g10/gpg.c:766
+#: g10/gpg.c:771
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1245,7 +1245,7 @@ msgstr ""
 "podp�sa�, overi�, �ifrova� alebo de�ifrova�\n"
 "implicitn� oper�cie z�visia od vstupn�ch d�t\n"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:782
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1253,561 +1253,570 @@ msgstr ""
 "\n"
 "Podporovan� algoritmy:\n"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:785
 msgid "Pubkey: "
 msgstr "Verejn� k���e: "
 
-#: g10/gpg.c:786 g10/keyedit.c:2266
+#: g10/gpg.c:791 g10/keyedit.c:2266
 msgid "Cipher: "
 msgstr "�ifry: "
 
-#: g10/gpg.c:792
+#: g10/gpg.c:797
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:798 g10/keyedit.c:2312
+#: g10/gpg.c:803 g10/keyedit.c:2312
 msgid "Compression: "
 msgstr "Kompresia: "
 
-#: g10/gpg.c:881
+#: g10/gpg.c:886
 msgid "usage: gpg [options] "
 msgstr "pou�itie: gpg [mo�nosti] "
 
-#: g10/gpg.c:1029
+#: g10/gpg.c:1034
 msgid "conflicting commands\n"
 msgstr "konfliktn� pr�kazy\n"
 
-#: g10/gpg.c:1047
+#: g10/gpg.c:1052
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "no = podpis n�jden� v defin�cii skupiny \"%s\"\n"
 
-#: g10/gpg.c:1244
+#: g10/gpg.c:1249
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "VAROVANIE: vlastn�ctvo pre %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1247
+#: g10/gpg.c:1252
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "VAROVANIE: vlastn�ctvo pre %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1250
+#: g10/gpg.c:1255
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "VAROVANIE: vlastn�ctvo pre %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1256
+#: g10/gpg.c:1261
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "VAROVANIE: pr�stupov� pr�va pre %s nie s� nastaven� bezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1259
+#: g10/gpg.c:1264
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "VAROVANIE: pr�stupov� pr�va pre %s nie s� nastaven� bezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1262
+#: g10/gpg.c:1267
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "VAROVANIE: pr�stupov� pr�va pre %s nie s� nastaven� bezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1268
+#: g10/gpg.c:1273
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "VAROVANIE: vlastn�ctvo adres�ra %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1271
+#: g10/gpg.c:1276
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "VAROVANIE: vlastn�ctvo adres�ra %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1274
+#: g10/gpg.c:1279
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "VAROVANIE: vlastn�ctvo adres�ra %s nastaven� nebezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1280
+#: g10/gpg.c:1285
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr ""
 "VAROVANIE: pr�stupov� pr�va adres�ra %s nie s� nastaven� bezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1283
+#: g10/gpg.c:1288
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr ""
 "VAROVANIE: pr�stupov� pr�va adres�ra %s nie s� nastaven� bezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1286
+#: g10/gpg.c:1291
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr ""
 "VAROVANIE: pr�stupov� pr�va adres�ra %s nie s� nastaven� bezpe�ne \"%s\"\n"
 
-#: g10/gpg.c:1427
+#: g10/gpg.c:1432
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "nezn�ma polo�ka konfigur�cie \"%s\"\n"
 
-#: g10/gpg.c:1521
+#: g10/gpg.c:1526
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1523
+#: g10/gpg.c:1528
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1525
+#: g10/gpg.c:1530
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "V s�bore tajn�ch k���ov ch�ba zodpovedaj�ci podpis\n"
 
-#: g10/gpg.c:1527
+#: g10/gpg.c:1532
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1536
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1538
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1540
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1542
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1544
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1546
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "uk� v ktorom s�bore k���ov je vyp�san� k���"
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1548
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "V s�bore tajn�ch k���ov ch�ba zodpovedaj�ci podpis\n"
 
-#: g10/gpg.c:1874
+#: g10/gpg.c:1879
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "POZN�MKA: star� implicitn� s�bor s mo�nos�ami `%s ignorovan�'\n"
 
-#: g10/gpg.c:1916
+#: g10/gpg.c:1921
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "POZN�MKA: neexistuje implicitn� s�bor s mo�nos�ami `%s'\n"
 
-#: g10/gpg.c:1920
+#: g10/gpg.c:1925
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "s�bor s mo�nos�ami `%s': %s\n"
 
-#: g10/gpg.c:1927
+#: g10/gpg.c:1932
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "��tam mo�nosti z `%s'\n"
 
-#: g10/gpg.c:2142 g10/gpg.c:2716 g10/gpg.c:2735
+#: g10/gpg.c:2147 g10/gpg.c:2747 g10/gpg.c:2766
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "POZN�MKA: %s nie je pre norm�lne pou�itie!\n"
 
-#: g10/gpg.c:2158
+#: g10/gpg.c:2163
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr ""
 "�ifra \"%s\" nebola nahran�, preto�e pr�stupov� pr�va nie s� nastaven� "
 "bezpe�ne\n"
 
-#: g10/gpg.c:2312 g10/gpg.c:2324
+#: g10/gpg.c:2317 g10/gpg.c:2329
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2400
+#: g10/gpg.c:2405
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2422 g10/keyedit.c:3997
+#: g10/gpg.c:2429 g10/keyedit.c:3997
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "nemo�no pou�i� URI servera k���ov - chyba anal�zy URI\n"
 
-#: g10/gpg.c:2428
+#: g10/gpg.c:2441
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2431
+#: g10/gpg.c:2444
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2438
+#: g10/gpg.c:2451
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: neplatn� parameter pre import\n"
 
-#: g10/gpg.c:2441
+#: g10/gpg.c:2454
 msgid "invalid import options\n"
 msgstr "neplatn� parameter pre import\n"
 
-#: g10/gpg.c:2448
+#: g10/gpg.c:2461
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2464
 msgid "invalid export options\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2458
+#: g10/gpg.c:2471
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: neplatn� parameter pre import\n"
 
-#: g10/gpg.c:2461
+#: g10/gpg.c:2474
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "neplatn� parameter pre import\n"
 
-#: g10/gpg.c:2469
+#: g10/gpg.c:2482
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2471
+#: g10/gpg.c:2484
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2473
+#: g10/gpg.c:2486
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2475
+#: g10/gpg.c:2488
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2479
+#: g10/gpg.c:2492
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2481
+#: g10/gpg.c:2494
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
 
-#: g10/gpg.c:2483
+#: g10/gpg.c:2496
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2485
+#: g10/gpg.c:2498
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2505
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2495
+#: g10/gpg.c:2508
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2502
+#: g10/gpg.c:2515
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nemo�no nastavi� exec-path na %s\n"
 
-#: g10/gpg.c:2705
+#: g10/gpg.c:2665
+#, fuzzy, c-format
+msgid "%s:%d: invalid auto-key-locate list\n"
+msgstr "%s:%d: neplatn� parameter pre export\n"
+
+#: g10/gpg.c:2668
+msgid "invalid auto-key-locate list\n"
+msgstr ""
+
+#: g10/gpg.c:2736
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROVANIE: program m��e vytvori� s�bor core!\n"
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2740
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROVANIE: %s prep��e %s\n"
 
-#: g10/gpg.c:2718
+#: g10/gpg.c:2749
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nie je dovolen� pou��va� %s s %s!\n"
 
-#: g10/gpg.c:2721
+#: g10/gpg.c:2752
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ned�va s %s zmysel!\n"
 
-#: g10/gpg.c:2728
+#: g10/gpg.c:2759
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "gpg-agent nie je v tomto seden� dostupn�\n"
 
-#: g10/gpg.c:2743
+#: g10/gpg.c:2774
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/gpg.c:2757
+#: g10/gpg.c:2788
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "v m�de --pgp2 m��ete vytv�ra� len oddelen� podpisy alebo podpisy �itate�n� "
 "ako text\n"
 
-#: g10/gpg.c:2763
+#: g10/gpg.c:2794
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "v m�de --pgp2 nemo�no s��asne �ifrova� a podpisova�\n"
 
-#: g10/gpg.c:2769
+#: g10/gpg.c:2800
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "v m�de --pgp2 mus�te pou�i� s�bor (nie r�ru).\n"
 
-#: g10/gpg.c:2782
+#: g10/gpg.c:2813
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "�ifrovanie spr�v v m�de --pgp2 vy�aduje algoritmus IDEA\n"
 
-#: g10/gpg.c:2849 g10/gpg.c:2873
+#: g10/gpg.c:2880 g10/gpg.c:2904
 msgid "selected cipher algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:2855 g10/gpg.c:2879
+#: g10/gpg.c:2886 g10/gpg.c:2910
 msgid "selected digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:2861
+#: g10/gpg.c:2892
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:2867
+#: g10/gpg.c:2898
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:2882
+#: g10/gpg.c:2913
 msgid "completes-needed must be greater than 0\n"
 msgstr "polo�ka completes-needed mus� by� v��ia ako 0\n"
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2915
 msgid "marginals-needed must be greater than 1\n"
 msgstr "polo�ka marginals-needed mus� by� v��ia ako 1\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2917
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "polo�ka max-cert-depth mus� by� v rozmedz� od 1 do 255\n"
 
-#: g10/gpg.c:2888
+#: g10/gpg.c:2919
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "neplatn� implicitn� �rove� certifik�cie; mus� by� 0, 1, 2 alebo 3\n"
 
-#: g10/gpg.c:2890
+#: g10/gpg.c:2921
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "neplatn� minim�lna �rove� certifik�cie; mus� by� 0, 1, 2 alebo 3\n"
 
-#: g10/gpg.c:2893
+#: g10/gpg.c:2924
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "POZN�MKA: jednoduch� m�d S2K (0) je d�razne nedoporu�ovan�\n"
 
-#: g10/gpg.c:2897
+#: g10/gpg.c:2928
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "neplatn� m�d S2K; mus� by� 0, 1 alebo 3\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2935
 msgid "invalid default preferences\n"
 msgstr "neplatn� defaultn� predvo�by\n"
 
-#: g10/gpg.c:2913
+#: g10/gpg.c:2944
 msgid "invalid personal cipher preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre �ifrovanie\n"
 
-#: g10/gpg.c:2917
+#: g10/gpg.c:2948
 msgid "invalid personal digest preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre hashovanie\n"
 
-#: g10/gpg.c:2921
+#: g10/gpg.c:2952
 msgid "invalid personal compress preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre kompresiu\n"
 
-#: g10/gpg.c:2954
+#: g10/gpg.c:2985
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s e�te nepracuje s %s\n"
 
-#: g10/gpg.c:3001
+#: g10/gpg.c:3032
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "nem��ete pou�i� �ifrovac� algoritmus \"%s\" v m�de %s\n"
 
-#: g10/gpg.c:3006
+#: g10/gpg.c:3037
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "nem��ete pou�i� hashovac� algoritmus \"%s\" v m�de %s\n"
 
-#: g10/gpg.c:3011
+#: g10/gpg.c:3042
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "nem��ete pou�i� kompresn� algoritmus \"%s\" v m�de %s\n"
 
-#: g10/gpg.c:3107
+#: g10/gpg.c:3138
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "nem��em inicializova� datab�zu d�very: %s\n"
 
-#: g10/gpg.c:3118
+#: g10/gpg.c:3149
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "VAROVANIE: dan� adres�t (-r) bez pou�itia �ifrovania s verejn�m k���om\n"
 
-#: g10/gpg.c:3129
+#: g10/gpg.c:3160
 msgid "--store [filename]"
 msgstr "--store [meno s�boru]"
 
-#: g10/gpg.c:3136
+#: g10/gpg.c:3167
 msgid "--symmetric [filename]"
 msgstr "--symmetric [meno s�boru]"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3169
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "de�ifrovanie zlyhalo: %s\n"
 
-#: g10/gpg.c:3148
+#: g10/gpg.c:3179
 msgid "--encrypt [filename]"
 msgstr "--encrypt [meno s�boru]"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3192
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [meno s�boru]"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3194
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3166
+#: g10/gpg.c:3197
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 "pou�itie %s nie je v m�de %s dovolen�\n"
 "\n"
 
-#: g10/gpg.c:3184
+#: g10/gpg.c:3215
 msgid "--sign [filename]"
 msgstr "--sign [meno s�boru]"
 
-#: g10/gpg.c:3197
+#: g10/gpg.c:3228
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [meno s�boru]"
 
-#: g10/gpg.c:3212
+#: g10/gpg.c:3243
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [meno s�boru]"
 
-#: g10/gpg.c:3214
+#: g10/gpg.c:3245
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3217
+#: g10/gpg.c:3248
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 "pou�itie %s nie je v m�de %s dovolen�\n"
 "\n"
 
-#: g10/gpg.c:3237
+#: g10/gpg.c:3268
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [meno s�boru]"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3277
 msgid "--clearsign [filename]"
 msgstr "--clearsign [meno s�boru]"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3302
 msgid "--decrypt [filename]"
 msgstr "--decrypt [meno s�boru]"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3310
 msgid "--sign-key user-id"
 msgstr "--sign-key id u��vate�a"
 
-#: g10/gpg.c:3283
+#: g10/gpg.c:3314
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id u��vate�a"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3335
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id u��vate�a [pr�kazy]"
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3406
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [id u��vate�a] [s�bor s k���mi (keyring)]"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3443
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "nepodarilo posla� k��� na server: %s\n"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3445
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "nepodarilo sa prija� k��� zo servera: %s\n"
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3447
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "nepodaril sa export k���a: %s\n"
 
-#: g10/gpg.c:3427
+#: g10/gpg.c:3458
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "nepodarilo sa n�js� server: %s\n"
 
-#: g10/gpg.c:3437
+#: g10/gpg.c:3468
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "aktualiz�cia servera zlyhala: %s\n"
 
-#: g10/gpg.c:3488
+#: g10/gpg.c:3519
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dek�dovanie z ASCII form�tu zlyhalo: %s\n"
 
-#: g10/gpg.c:3496
+#: g10/gpg.c:3527
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "k�dovanie do ASCII form�tu zlyhalo: %s\n"
 
-#: g10/gpg.c:3583
+#: g10/gpg.c:3614
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "neplatn� hashovac� algoritmus `%s'\n"
 
-#: g10/gpg.c:3706
+#: g10/gpg.c:3737
 msgid "[filename]"
 msgstr "[meno s�boru]"
 
-#: g10/gpg.c:3710
+#: g10/gpg.c:3741
 msgid "Go ahead and type your message ...\n"
 msgstr "Za�nite p�sa� svoju spr�vu ...\n"
 
-#: g10/gpg.c:4000
+#: g10/gpg.c:4031
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1815,28 +1824,28 @@ msgstr ""
 "meno m��e obsahova� len p�smen�, ��slice, bodky, pod�iarn�ky alebo medzery a "
 "kon�i� s '='\n"
 
-#: g10/gpg.c:4008
+#: g10/gpg.c:4039
 msgid "a user notation name must contain the '@' character\n"
 msgstr "hodnota mus� obsahova� znak '@'\n"
 
-#: g10/gpg.c:4013
+#: g10/gpg.c:4044
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "hodnota mus� obsahova� znak '@'\n"
 
-#: g10/gpg.c:4024
+#: g10/gpg.c:4055
 msgid "a notation value must not use any control characters\n"
 msgstr "hodnota nesmie obsahova� �iadne kontroln� znaky\n"
 
-#: g10/gpg.c:4058
+#: g10/gpg.c:4089
 msgid "the given certification policy URL is invalid\n"
 msgstr "zadan� URL pre certifika�n� politiku je neplatn�\n"
 
-#: g10/gpg.c:4060
+#: g10/gpg.c:4091
 msgid "the given signature policy URL is invalid\n"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
 
-#: g10/gpg.c:4093
+#: g10/gpg.c:4124
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
@@ -1845,34 +1854,35 @@ msgstr "zadan
 msgid "too many entries in pk cache - disabled\n"
 msgstr "pr�li� ve�a polo�iek v bufferi verejn�ch k���ov - vypnut�\n"
 
-#: g10/getkey.c:188 g10/getkey.c:2845
+#: g10/getkey.c:188 g10/getkey.c:2876
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[User id not found]"
 
-#: g10/getkey.c:931 g10/getkey.c:953 g10/getkey.c:976
+#: g10/getkey.c:933 g10/getkey.c:950 g10/getkey.c:970 g10/getkey.c:986
+#: g10/getkey.c:1001
 #, c-format
 msgid "Automatically retrieved `%s' via %s\n"
 msgstr ""
 
 # c-format
-#: g10/getkey.c:1769
+#: g10/getkey.c:1800
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Neplatn� k��� %08lX zmenen� na platn� pomocou --always-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2323
+#: g10/getkey.c:2354
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "existuje tajn� k��� pre tento verejn� k��� %08lX!\n"
 
-#: g10/getkey.c:2554
+#: g10/getkey.c:2585
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "pou��vam sekund�rny k��� %08lX namiesto prim�rneho k���a %08lX\n"
 
-#: g10/getkey.c:2601
+#: g10/getkey.c:2632
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "k��� %08lX: tajn� k��� bez verejn�ho k���a - presko�en�\n"
@@ -3450,12 +3460,12 @@ msgid "(sensitive)"
 msgstr "(citliv� inform�cia)"
 
 #: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
-#: g10/keylist.c:194 g10/keyserver.c:471
+#: g10/keylist.c:194 g10/keyserver.c:525
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s: nem��em vytvori�: %s\n"
 
-#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:967
+#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:960
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revokovan�]"
@@ -3467,7 +3477,7 @@ msgstr " [platnos
 
 #: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
 #: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:477 g10/mainproc.c:973
+#: g10/keylist.c:914 g10/keyserver.c:531 g10/mainproc.c:966
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [platnos� skon��: %s]"
@@ -3503,14 +3513,14 @@ msgstr ""
 "Pros�m nezab�dajte, �e zobrazovan� �daje o platnosti k���ov nemusia\n"
 "by� spr�vne, pokia� znovu nespust�te program.\n"
 
-#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:481
-#: g10/mainproc.c:1734 g10/trustdb.c:1184 g10/trustdb.c:1704
+#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:535
+#: g10/mainproc.c:1783 g10/trustdb.c:1184 g10/trustdb.c:1704
 #, fuzzy
 msgid "revoked"
 msgstr "[revokovan�]"
 
-#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:485
-#: g10/mainproc.c:1736 g10/trustdb.c:537 g10/trustdb.c:1706
+#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:539
+#: g10/mainproc.c:1785 g10/trustdb.c:537 g10/trustdb.c:1706
 #, fuzzy
 msgid "expired"
 msgstr "expire"
@@ -4349,395 +4359,392 @@ msgstr "%s: s
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:77
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:81
+#: g10/keyserver.c:79
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:83
+#: g10/keyserver.c:81
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:87
+#: g10/keyserver.c:85
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:89
-msgid "automatically retrieve keys from PKA records"
-msgstr ""
-
-#: g10/keyserver.c:91
-msgid "automatically retrieve keys from DNS"
-msgstr ""
-
-#: g10/keyserver.c:95
+#: g10/keyserver.c:87
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
 
-#: g10/keyserver.c:139
+#: g10/keyserver.c:89
+msgid "honor the PKA record set on a key when retrieving keys"
+msgstr ""
+
+#: g10/keyserver.c:154
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "VAROVANIE: nastavenie v `%s' e�te nie je akt�vne\n"
 
-#: g10/keyserver.c:483
+#: g10/keyserver.c:537
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:684
+#: g10/keyserver.c:738
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:767 g10/keyserver.c:1368
+#: g10/keyserver.c:821 g10/keyserver.c:1422
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/keyserver.c:865
+#: g10/keyserver.c:919
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "k��� `%s' nebol n�jden�: %s\n"
 
-#: g10/keyserver.c:867
+#: g10/keyserver.c:921
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "k��� `%s' nebol n�jden�: %s\n"
 
-#: g10/keyserver.c:1092
+#: g10/keyserver.c:1146
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "po�adujem k��� %08lX z %s\n"
 
-#: g10/keyserver.c:1096
+#: g10/keyserver.c:1150
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "po�adujem k��� %08lX z %s\n"
 
-#: g10/keyserver.c:1120
+#: g10/keyserver.c:1174
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "vyh�ad�vam \"%s\" na HKP serveri %s\n"
 
-#: g10/keyserver.c:1123
+#: g10/keyserver.c:1177
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "vyh�ad�vam \"%s\" na HKP serveri %s\n"
 
-#: g10/keyserver.c:1271
+#: g10/keyserver.c:1325
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "vyh�ad�vam \"%s\" na HKP serveri %s\n"
 
-#: g10/keyserver.c:1275
+#: g10/keyserver.c:1329
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "podp�san� Va��m k���om %08lX v %s\n"
 
-#: g10/keyserver.c:1318
+#: g10/keyserver.c:1372
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "vyh�ad�vam \"%s\" na HKP serveri %s\n"
 
-#: g10/keyserver.c:1321
+#: g10/keyserver.c:1375
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "vyh�ad�vam \"%s\" na HKP serveri %s\n"
 
-#: g10/keyserver.c:1328 g10/keyserver.c:1424
+#: g10/keyserver.c:1382 g10/keyserver.c:1478
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/keyserver.c:1376
+#: g10/keyserver.c:1430
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1439
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1446
+#: g10/keyserver.c:1500
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1452
+#: g10/keyserver.c:1506
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1464
+#: g10/keyserver.c:1518
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1469
+#: g10/keyserver.c:1523
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1477
+#: g10/keyserver.c:1531
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1484
+#: g10/keyserver.c:1538
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "chyba servera k���ov"
 
-#: g10/keyserver.c:1489
+#: g10/keyserver.c:1543
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "chyba servera k���ov"
 
-#: g10/keyserver.c:1498
+#: g10/keyserver.c:1552
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "nepodarilo sa prija� k��� zo servera: %s\n"
 
-#: g10/keyserver.c:1523 g10/keyserver.c:1557
+#: g10/keyserver.c:1577 g10/keyserver.c:1611
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1814
+#: g10/keyserver.c:1868
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "VAROVANIE: nem��em vymaza� do�asn� s�bor (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1836
+#: g10/keyserver.c:1890
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "po�adujem k��� %08lX z %s\n"
 
-#: g10/keyserver.c:1838
+#: g10/keyserver.c:1892
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "po�adujem k��� %08lX z %s\n"
 
-#: g10/keyserver.c:1903
+#: g10/keyserver.c:1957
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "VAROVANIE: nem��em vymaza� do�asn� s�bor (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1909
+#: g10/keyserver.c:1963
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "VAROVANIE: nem��em vymaza� do�asn� s�bor (%s) `%s': %s\n"
 
-#: g10/mainproc.c:253
+#: g10/mainproc.c:240
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "zvl�tna ve�kos� �ifrovacieho k���a pre sedenie (%d)\n"
 
-#: g10/mainproc.c:304
+#: g10/mainproc.c:291
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s k��� �ifrovan�ho sedenia\n"
 
-#: g10/mainproc.c:314
+#: g10/mainproc.c:301
 #, fuzzy, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "za�ifrovan� nezn�mym algoritmom %d\n"
 
-#: g10/mainproc.c:395
+#: g10/mainproc.c:382
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "verejn� k��� je %08lX\n"
 
-#: g10/mainproc.c:450
+#: g10/mainproc.c:439
 msgid "public key encrypted data: good DEK\n"
 msgstr "d�ta za�ifrovan� verejn�m k���om: spr�vny DEK\n"
 
-#: g10/mainproc.c:483
+#: g10/mainproc.c:472
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "za�ifrovan� %u-bitov�m %s k���om, ID %08lX, vytvoren�m %s\n"
 
-#: g10/mainproc.c:487 g10/pkclist.c:219
+#: g10/mainproc.c:476 g10/pkclist.c:219
 #, fuzzy, c-format
 msgid "      \"%s\"\n"
 msgstr "                alias \""
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen mu� "ID" rein :-(
 # [kw]
-#: g10/mainproc.c:491
+#: g10/mainproc.c:480
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "za�ifrovan� %s k���om, ID %08lX\n"
 
-#: g10/mainproc.c:505
+#: g10/mainproc.c:494
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "de�ifrovanie verejn�m k���om zlyhalo: %s\n"
 
-#: g10/mainproc.c:519
+#: g10/mainproc.c:508
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "za�ifrovan� s %lu heslami\n"
 
-#: g10/mainproc.c:521
+#: g10/mainproc.c:510
 msgid "encrypted with 1 passphrase\n"
 msgstr "za�ifrovan� jedn�m heslom\n"
 
-#: g10/mainproc.c:549 g10/mainproc.c:571
+#: g10/mainproc.c:541 g10/mainproc.c:563
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "predpoklad�m %s �ifrovan�ch d�t\n"
 
-#: g10/mainproc.c:557
+#: g10/mainproc.c:549
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "algoritmus IDEA nie je dostupn�; optimisticky sa ho pok�sime nahradi� "
 "algoritmom %s\n"
 
-#: g10/mainproc.c:589
+#: g10/mainproc.c:581
 msgid "decryption okay\n"
 msgstr "de�ifrovanie o.k.\n"
 
-#: g10/mainproc.c:593
+#: g10/mainproc.c:585
 msgid "WARNING: message was not integrity protected\n"
 msgstr "VAROVANIE: spr�va nem� ochranu integrity\n"
 
-#: g10/mainproc.c:606
+#: g10/mainproc.c:598
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VAROVANIE: so za�ifrovanou spr�vou bolo manipulovan�!\n"
 
-#: g10/mainproc.c:612
+#: g10/mainproc.c:604
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "de�ifrovanie zlyhalo: %s\n"
 
-#: g10/mainproc.c:631
+#: g10/mainproc.c:623
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "POZN�MKA: odosielate� po�adoval (\"for-your-eyes-only\")\n"
 
-#: g10/mainproc.c:633
+#: g10/mainproc.c:625
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "p�vodn� meno s�boru='%.*s'\n"
 
-#: g10/mainproc.c:822
+#: g10/mainproc.c:815
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "samostatn� revoka�n� certifik�t -  pou�ite \"gpg --import\", ak ho chcete "
 "vyu�i�\n"
 
-#: g10/mainproc.c:1168
+#: g10/mainproc.c:1161
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Dobr� podpis od \""
 
-#: g10/mainproc.c:1418
+#: g10/mainproc.c:1419
 msgid "signature verification suppressed\n"
 msgstr "verifik�cia podpisu potla�en�\n"
 
-#: g10/mainproc.c:1460 g10/mainproc.c:1470
-msgid "can't handle these multiple signatures\n"
+#: g10/mainproc.c:1519
+#, fuzzy
+msgid "can't handle this ambiguous signature data\n"
 msgstr "neviem pracova� s t�mito n�sobn�mi podpismi\n"
 
-#: g10/mainproc.c:1480
+#: g10/mainproc.c:1530
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Platnos� podpisu vypr�ala %s\n"
 
-#: g10/mainproc.c:1481
+#: g10/mainproc.c:1531
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "                alias \""
 
 # Scripte scannen lt. dl1bke auf "ID (0-9A-F)+" deswegen mu� "ID" rein :-(
-#: g10/mainproc.c:1485
+#: g10/mainproc.c:1535
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Podpis vytvoren� %.*s pomocou %s k���a ID %08lX\n"
 
-#: g10/mainproc.c:1505
+#: g10/mainproc.c:1555
 msgid "Key available at: "
 msgstr "K��� k dispoz�cii na: "
 
-#: g10/mainproc.c:1639 g10/mainproc.c:1687
+#: g10/mainproc.c:1688 g10/mainproc.c:1736
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "ZL� podpis od \""
 
-#: g10/mainproc.c:1641 g10/mainproc.c:1689
+#: g10/mainproc.c:1690 g10/mainproc.c:1738
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Podpis s vypr�anou platnos�ou od \""
 
-#: g10/mainproc.c:1643 g10/mainproc.c:1691
+#: g10/mainproc.c:1692 g10/mainproc.c:1740
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Dobr� podpis od \""
 
-#: g10/mainproc.c:1695
+#: g10/mainproc.c:1744
 msgid "[uncertain]"
 msgstr "[neist�]  "
 
-#: g10/mainproc.c:1727
+#: g10/mainproc.c:1776
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "                alias \""
 
-#: g10/mainproc.c:1824
+#: g10/mainproc.c:1873
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Platnos� podpisu vypr�ala %s\n"
 
-#: g10/mainproc.c:1829
+#: g10/mainproc.c:1878
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Platnos� podpisu vypr�� %s\n"
 
-#: g10/mainproc.c:1832
+#: g10/mainproc.c:1881
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s podpis, hashovac� algoritmus %s\n"
 
-#: g10/mainproc.c:1833
+#: g10/mainproc.c:1882
 msgid "binary"
 msgstr "bin�rne"
 
-#: g10/mainproc.c:1834
+#: g10/mainproc.c:1883
 msgid "textmode"
 msgstr "textov� m�d"
 
-#: g10/mainproc.c:1834 g10/trustdb.c:536
+#: g10/mainproc.c:1883 g10/trustdb.c:536
 msgid "unknown"
 msgstr "nezn�me"
 
-#: g10/mainproc.c:1854
+#: g10/mainproc.c:1903
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Nem��em overi� podpis: %s\n"
 
-#: g10/mainproc.c:1922 g10/mainproc.c:1938 g10/mainproc.c:2024
+#: g10/mainproc.c:1972 g10/mainproc.c:1988 g10/mainproc.c:2074
 msgid "not a detached signature\n"
 msgstr "toto nie je podpis oddelen� od dokumentu\n"
 
-#: g10/mainproc.c:1965
+#: g10/mainproc.c:2015
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "VAROVANIE: N�jden� viacn�sobne podpisy. Skontrolovan� bude len prv�.\n"
 
-#: g10/mainproc.c:1973
+#: g10/mainproc.c:2023
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "samostatn� podpis triedy 0x%02x\n"
 
-#: g10/mainproc.c:2030
+#: g10/mainproc.c:2080
 msgid "old style (PGP 2.x) signature\n"
 msgstr "podpis star�ho typu (PGP 2.x)\n"
 
-#: g10/mainproc.c:2040
+#: g10/mainproc.c:2090
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "n�jden� neplatn� kore�ov� paket v proc_tree()\n"
 
@@ -5303,23 +5310,23 @@ msgstr "d
 msgid "error creating `%s': %s\n"
 msgstr "chyba pri vytv�ran� `%s': %s\n"
 
-#: g10/plaintext.c:447
+#: g10/plaintext.c:453
 msgid "Detached signature.\n"
 msgstr "Podpis oddelen� od dokumentu.\n"
 
-#: g10/plaintext.c:453
+#: g10/plaintext.c:459
 msgid "Please enter name of data file: "
 msgstr "Pros�m, vlo�te n�zov d�tov�ho s�boru: "
 
-#: g10/plaintext.c:485
+#: g10/plaintext.c:491
 msgid "reading stdin ...\n"
 msgstr "��tam �tandardn� vstup (stdin) ...\n"
 
-#: g10/plaintext.c:519
+#: g10/plaintext.c:525
 msgid "no signed data\n"
 msgstr "ch�baj� podp�san� d�ta\n"
 
-#: g10/plaintext.c:533
+#: g10/plaintext.c:539
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "nem��em otvori� podp�san� d�ta '%s'\n"
diff --git a/po/sv.po b/po/sv.po
index 0b0870cfb..33f21ec8c 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -23,7 +23,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.6\n"
 "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2006-02-14 15:28+0100\n"
+"POT-Creation-Date: 2006-03-07 11:29+0100\n"
 "PO-Revision-Date: 2004-12-01 17:49+0100\n"
 "Last-Translator: Per Tunedal <info@clipanish.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -58,9 +58,9 @@ msgstr "skriver hemlig nyckel till \"%s\"\n"
 
 #: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:992 g10/gpg.c:3360 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:997 g10/gpg.c:3391 g10/import.c:193 g10/keygen.c:2274
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:476 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
+#: g10/plaintext.c:482 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
 #: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
@@ -94,7 +94,7 @@ msgstr "kan inte läsa \"%s\": %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "Obs: random_seed uppdaterades inte\n"
 
-#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:991 g10/keygen.c:2753
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2753
 #: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
 #: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
 #, c-format
@@ -715,49 +715,49 @@ msgstr ""
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Felaktigt kommando (försök med \"help\")\n"
 
-#: g10/cardglue.c:435
+#: g10/cardglue.c:434
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:572
+#: g10/cardglue.c:573
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
 "   %.*s\n"
 msgstr ""
 
-#: g10/cardglue.c:580
+#: g10/cardglue.c:582
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr ""
 
-#: g10/cardglue.c:915
+#: g10/cardglue.c:917
 msgid "Enter New Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:916
+#: g10/cardglue.c:918
 msgid "Enter New PIN: "
 msgstr ""
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:919
 msgid "Enter Admin PIN: "
 msgstr ""
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:920
 msgid "Enter PIN: "
 msgstr ""
 
-#: g10/cardglue.c:935
+#: g10/cardglue.c:937
 #, fuzzy
 msgid "Repeat this PIN: "
 msgstr "Repetera lösenmeningen: "
 
-#: g10/cardglue.c:950
+#: g10/cardglue.c:952
 #, fuzzy
 msgid "PIN not correctly repeated; try again"
 msgstr "lösenmeningen upprepades inte korrekt; försök igen."
 
 # se förra kommentaren
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3720 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3751 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -767,13 +767,13 @@ msgstr "kan inte öppna \"%s\"\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output kan inte användas för detta kommando\n"
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1644
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1698
 #: g10/revoke.c:228
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "hittade inte nyckeln  `%s': %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1658
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1712
 #: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -890,12 +890,12 @@ msgstr "du kan inte använda %s när du är i %s läge\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s krypterad för: \"%s\"\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:306
+#: g10/encr-data.c:67 g10/mainproc.c:293
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s krypterad data\n"
 
-#: g10/encr-data.c:69 g10/mainproc.c:310
+#: g10/encr-data.c:69 g10/mainproc.c:297
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "krypterad med en okänd algoritm %d\n"
@@ -1043,7 +1043,7 @@ msgstr "VARNING: hemliga nyckeln %08lX har ingen enkel SK-kontrollsumma\n"
 msgid "WARNING: nothing exported\n"
 msgstr "VARNING: exporterade ingenting\n"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:373
 msgid ""
 "@Commands:\n"
 " "
@@ -1051,130 +1051,130 @@ msgstr ""
 "@Kommandon:\n"
 " "
 
-#: g10/gpg.c:374
+#: g10/gpg.c:375
 msgid "|[file]|make a signature"
 msgstr "|[fil]|skapa en signatur"
 
-#: g10/gpg.c:375
+#: g10/gpg.c:376
 msgid "|[file]|make a clear text signature"
 msgstr "|[fil]|skapa en klartext-signatur"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:377
 msgid "make a detached signature"
 msgstr "skapa signatur i en separat fil"
 
-#: g10/gpg.c:377
+#: g10/gpg.c:378
 msgid "encrypt data"
 msgstr "kryptera data"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:380
 msgid "encryption only with symmetric cipher"
 msgstr "endast symmetrisk kryptering"
 
 # gnupg dekrypterar data om inget kommando anges dvs. kommandot "decrypt" behöver inte användas.
-#: g10/gpg.c:381
+#: g10/gpg.c:382
 msgid "decrypt data (default)"
 msgstr "dekryptera data (standard)"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:384
 msgid "verify a signature"
 msgstr "verifiera en signatur"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:386
 msgid "list keys"
 msgstr "visa en lista på nycklar"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "list keys and signatures"
 msgstr "visa en lista på nycklar och signaturer"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:389
 #, fuzzy
 msgid "list and check key signatures"
 msgstr "verifiera nyckelsignaturer"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:390
 msgid "list keys and fingerprints"
 msgstr "visa en lista på nycklar och fingeravtryck"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:391
 msgid "list secret keys"
 msgstr "visa en lista på hemliga nycklar"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:392
 msgid "generate a new key pair"
 msgstr "generera ett nytt nyckelpar"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:393
 msgid "remove keys from the public keyring"
 msgstr "ta bort nycklar från den öppna nyckelringen"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:395
 msgid "remove keys from the secret keyring"
 msgstr "ta bort nycklar från den hemliga nyckelringen"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:396
 msgid "sign a key"
 msgstr "signera en nyckel"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:397
 msgid "sign a key locally"
 msgstr "signera en nyckel lokalt"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:398
 msgid "sign or edit a key"
 msgstr "signera eller redigera en nyckel"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:399
 msgid "generate a revocation certificate"
 msgstr "generera ett spärrcertifikat"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:401
 msgid "export keys"
 msgstr "exportera nycklar"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:402
 msgid "export keys to a key server"
 msgstr "exportera nycklar till en nyckelserver"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:403
 msgid "import keys from a key server"
 msgstr "importera nycklar från en nyckelserver"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:405
 msgid "search for keys on a key server"
 msgstr "sök efter nycklar hos en nyckelserver"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:407
 msgid "update all keys from a keyserver"
 msgstr "uppdatera alla nycklar nycklar från en nyckelserver"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:411
 msgid "import/merge keys"
 msgstr "importera/slå ihop nycklar"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:414
 msgid "print the card status"
 msgstr ""
 
-#: g10/gpg.c:414
+#: g10/gpg.c:415
 msgid "change data on a card"
 msgstr ""
 
-#: g10/gpg.c:415
+#: g10/gpg.c:416
 msgid "change a card's PIN"
 msgstr ""
 
-#: g10/gpg.c:423
+#: g10/gpg.c:424
 msgid "update the trust database"
 msgstr "uppdatera tillitsdatabasen"
 
-#: g10/gpg.c:430
+#: g10/gpg.c:431
 msgid "|algo [files]|print message digests"
 msgstr "|algo [filer]|skriv ut kontrollsummor"
 
 # Här bruksanvisning för kommandoraden. Resultatet har jag översatt med "inställningar", eftersom flaggorna även kan förekomma i en inställningsfil.
-#: g10/gpg.c:434 g10/gpgv.c:71
+#: g10/gpg.c:435 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1184,53 +1184,53 @@ msgstr ""
 "Flaggor:\n"
 " "
 
-#: g10/gpg.c:436
+#: g10/gpg.c:437
 msgid "create ascii armored output"
 msgstr "skapa utdata med ett ascii-skal"
 
-#: g10/gpg.c:438
+#: g10/gpg.c:439
 msgid "|NAME|encrypt for NAME"
 msgstr "|NAMN|kryptera för NAMN"
 
-#: g10/gpg.c:449
+#: g10/gpg.c:450
 msgid "use this user-id to sign or decrypt"
 msgstr "använd denna användaridentitet för att signera eller dekryptera"
 
-#: g10/gpg.c:450
+#: g10/gpg.c:451
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|sätt kompressionsnivån till N (0 för att stänga av kompression)"
 
-#: g10/gpg.c:455
+#: g10/gpg.c:456
 msgid "use canonical text mode"
 msgstr "använd \"ursprunglig text\"-läget"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:470
 msgid "use as output file"
 msgstr "använd som fil för utdata"
 
-#: g10/gpg.c:471 g10/gpgv.c:73
+#: g10/gpg.c:472 g10/gpgv.c:73
 msgid "verbose"
 msgstr "utförlig"
 
-#: g10/gpg.c:482
+#: g10/gpg.c:483
 msgid "do not make any changes"
 msgstr "gör inga ändringar"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:484
 msgid "prompt before overwriting"
 msgstr "Fråga före ersättning"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:525
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "generate PGP 2.x compatible messages"
 msgstr ""
 
 # inställningar istället för flaggor?
 # Nej, här är det bruksanvisningen för kommandoraden.
-#: g10/gpg.c:553
+#: g10/gpg.c:554
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1238,7 +1238,7 @@ msgstr ""
 "@\n"
 "(Se manualsidan för en komplett lista på alla kommandon och flaggor)\n"
 
-#: g10/gpg.c:556
+#: g10/gpg.c:557
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1258,18 +1258,18 @@ msgstr ""
 "--list-keys [namn]          visa nycklar\n"
 "--fingerprint [namn]        visa fingeravtryck\n"
 
-#: g10/gpg.c:746 g10/gpgv.c:98
+#: g10/gpg.c:751 g10/gpgv.c:98
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr ""
 "Rapportera gärna fel till <gnupg-bugs@gnu.org>.\n"
 "Rapportera gärna fel eller synpunkter på översättningen till <sv@li.org>.\n"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:768
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Användning: gpg [flaggor] [filer] (-h för hjälp)"
 
 # Om inget kommando anges (decrypt/encrypt etc) väljs åtgärd efter indata.
-#: g10/gpg.c:766
+#: g10/gpg.c:771
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1279,7 +1279,7 @@ msgstr ""
 "signera, kontrollera, kryptera eller dekryptera\n"
 "vilken operation som utförs beror på programmets indata\n"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:782
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1287,566 +1287,575 @@ msgstr ""
 "\n"
 "Stödda algoritmer:\n"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:785
 msgid "Pubkey: "
 msgstr "öppen nyckel: "
 
-#: g10/gpg.c:786 g10/keyedit.c:2266
+#: g10/gpg.c:791 g10/keyedit.c:2266
 msgid "Cipher: "
 msgstr "Chiffer: "
 
-#: g10/gpg.c:792
+#: g10/gpg.c:797
 msgid "Hash: "
 msgstr "Kontrollsumma: "
 
-#: g10/gpg.c:798 g10/keyedit.c:2312
+#: g10/gpg.c:803 g10/keyedit.c:2312
 msgid "Compression: "
 msgstr "Komprimering: "
 
-#: g10/gpg.c:881
+#: g10/gpg.c:886
 msgid "usage: gpg [options] "
 msgstr "användning: gpg [flaggor] "
 
-#: g10/gpg.c:1029
+#: g10/gpg.c:1034
 msgid "conflicting commands\n"
 msgstr "motstridiga kommandon\n"
 
 # Vad betyder detta?
-#: g10/gpg.c:1047
+#: g10/gpg.c:1052
 #, fuzzy, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "no = signatur hittad i gruppdefinitionen \"%s\"\n"
 
-#: g10/gpg.c:1244
+#: g10/gpg.c:1249
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "VARNING: %s osäker ägare till %s\n"
 
-#: g10/gpg.c:1247
+#: g10/gpg.c:1252
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "VARNING: %s osäker ägare till %s\n"
 
-#: g10/gpg.c:1250
+#: g10/gpg.c:1255
 #, fuzzy, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "VARNING: %s osäker ägare till %s\n"
 
-#: g10/gpg.c:1256
+#: g10/gpg.c:1261
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "WARNING: osäkra befogenheter för %s \"%s\"\n"
 
-#: g10/gpg.c:1259
+#: g10/gpg.c:1264
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "WARNING: osäkra befogenheter för %s \"%s\"\n"
 
-#: g10/gpg.c:1262
+#: g10/gpg.c:1267
 #, fuzzy, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "WARNING: osäkra befogenheter för %s \"%s\"\n"
 
-#: g10/gpg.c:1268
+#: g10/gpg.c:1273
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "VARNING:  osäkert att infoga katalogägarskap till %s \"%s\"\n"
 
-#: g10/gpg.c:1271
+#: g10/gpg.c:1276
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "VARNING:  osäkert att infoga katalogägarskap till %s \"%s\"\n"
 
-#: g10/gpg.c:1274
+#: g10/gpg.c:1279
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "VARNING:  osäkert att infoga katalogägarskap till %s \"%s\"\n"
 
-#: g10/gpg.c:1280
+#: g10/gpg.c:1285
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "VARNING:  osäkert att infoga katalogägarskap till %s \"%s\"\n"
 
-#: g10/gpg.c:1283
+#: g10/gpg.c:1288
 #, fuzzy, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "VARNING:  osäkert att infoga katalogägarskap till %s \"%s\"\n"
 
-#: g10/gpg.c:1286
+#: g10/gpg.c:1291
 #, fuzzy, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "VARNING:  osäkert att infoga katalogägarskap till %s \"%s\"\n"
 
-#: g10/gpg.c:1427
+#: g10/gpg.c:1432
 #, fuzzy, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "okänt configurationspost \"%s\"\n"
 
-#: g10/gpg.c:1521
+#: g10/gpg.c:1526
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1523
+#: g10/gpg.c:1528
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1525
+#: g10/gpg.c:1530
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Det finns ingen motsvarande signatur i den hemliga nyckelringen\n"
 
-#: g10/gpg.c:1527
+#: g10/gpg.c:1532
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1536
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1538
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "den angivna URL som beskriver signaturpolicy är felaktig\n"
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1540
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1542
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1544
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1546
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "visa vilken nyckelring den listade nyckeln hör till"
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1548
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Det finns ingen motsvarande signatur i den hemliga nyckelringen\n"
 
-#: g10/gpg.c:1874
+#: g10/gpg.c:1879
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "OBS: den gamla inställningsfilen \"%s\" används inte\n"
 
-#: g10/gpg.c:1916
+#: g10/gpg.c:1921
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "OBS: inställningsfilen \"%s\" saknas\n"
 
-#: g10/gpg.c:1920
+#: g10/gpg.c:1925
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "inställningsfil \"%s\": %s\n"
 
-#: g10/gpg.c:1927
+#: g10/gpg.c:1932
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "läser inställningar från \"%s\"\n"
 
-#: g10/gpg.c:2142 g10/gpg.c:2716 g10/gpg.c:2735
+#: g10/gpg.c:2147 g10/gpg.c:2747 g10/gpg.c:2766
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "OBS: %s är inte för normal användning!\n"
 
-#: g10/gpg.c:2158
+#: g10/gpg.c:2163
 #, fuzzy, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "chiffertillägget \"%s\" laddades inte pga osäkra behörigheter\n"
 
-#: g10/gpg.c:2312 g10/gpg.c:2324
+#: g10/gpg.c:2317 g10/gpg.c:2329
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s är ingen giltig teckentabell\n"
 
-#: g10/gpg.c:2400
+#: g10/gpg.c:2405
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s är ingen giltig teckentabell\n"
 
-#: g10/gpg.c:2422 g10/keyedit.c:3997
+#: g10/gpg.c:2429 g10/keyedit.c:3997
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "kunde inte tolka nyckelserver-URI\n"
 
-#: g10/gpg.c:2428
+#: g10/gpg.c:2441
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s: felaktiga exportinställningar %d\n"
 
-#: g10/gpg.c:2431
+#: g10/gpg.c:2444
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "felaktiga exportinställningar\n"
 
-#: g10/gpg.c:2438
+#: g10/gpg.c:2451
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s: felaktiga importinställningar %d\n"
 
-#: g10/gpg.c:2441
+#: g10/gpg.c:2454
 msgid "invalid import options\n"
 msgstr "felaktiga importinställningar\n"
 
-#: g10/gpg.c:2448
+#: g10/gpg.c:2461
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s: felaktiga exportinställningar %d\n"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2464
 msgid "invalid export options\n"
 msgstr "felaktiga exportinställningar\n"
 
-#: g10/gpg.c:2458
+#: g10/gpg.c:2471
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s: felaktiga importinställningar %d\n"
 
-#: g10/gpg.c:2461
+#: g10/gpg.c:2474
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "felaktiga importinställningar\n"
 
-#: g10/gpg.c:2469
+#: g10/gpg.c:2482
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2471
+#: g10/gpg.c:2484
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2473
+#: g10/gpg.c:2486
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s är ingen giltig teckentabell\n"
 
-#: g10/gpg.c:2475
+#: g10/gpg.c:2488
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2479
+#: g10/gpg.c:2492
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2481
+#: g10/gpg.c:2494
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "den angivna URL som beskriver signaturpolicy är felaktig\n"
 
-#: g10/gpg.c:2483
+#: g10/gpg.c:2496
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s är ingen giltig teckentabell\n"
 
-#: g10/gpg.c:2485
+#: g10/gpg.c:2498
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2505
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s: felaktiga exportinställningar %d\n"
 
-#: g10/gpg.c:2495
+#: g10/gpg.c:2508
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "felaktiga exportinställningar\n"
 
-#: g10/gpg.c:2502
+#: g10/gpg.c:2515
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "kunde inte sätta exec-sökvägen till %s\n"
 
+#: g10/gpg.c:2665
+#, fuzzy, c-format
+msgid "%s:%d: invalid auto-key-locate list\n"
+msgstr "%s: felaktiga exportinställningar %d\n"
+
+#: g10/gpg.c:2668
+msgid "invalid auto-key-locate list\n"
+msgstr ""
+
 # Programmet skapar en avbildning (image) av minnet för att lättare kunna spåra fel.
-#: g10/gpg.c:2705
+#: g10/gpg.c:2736
 msgid "WARNING: program may create a core file!\n"
 msgstr "VARNING: programmet kan komma att skapa en minnesutskrift!\n"
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2740
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VARNING: %s gäller istället för %s\n"
 
-#: g10/gpg.c:2718
+#: g10/gpg.c:2749
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s är inte tillåten tillsammans med %s!\n"
 
-#: g10/gpg.c:2721
+#: g10/gpg.c:2752
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "det är ingen poäng att använda %s tillsammans med %s!\n"
 
-#: g10/gpg.c:2728
+#: g10/gpg.c:2759
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "kunde inte få tillgång till GPG-Agent i denna session\n"
 
-#: g10/gpg.c:2743
+#: g10/gpg.c:2774
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "skriver hemlig nyckel till \"%s\"\n"
 
-#: g10/gpg.c:2757
+#: g10/gpg.c:2788
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "du kan bara göra signaturer i en separat fil eller klartextsignaturer\n"
 "i --pgp2-läge\n"
 
-#: g10/gpg.c:2763
+#: g10/gpg.c:2794
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "du kan inte signera och kryptera samtidigt i --pgp2-läge\n"
 
-#: g10/gpg.c:2769
+#: g10/gpg.c:2800
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "du måste använda filer (och inte rör) i --pgp2-läge\n"
 
 # IDEA-algoritmen är patenterat i flera länder och finns därför inte med i GnuPG som standard.
-#: g10/gpg.c:2782
+#: g10/gpg.c:2813
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "för att kryptera meddelanden i --pgp2-läge krävs IDEA-insticksprogrammet\n"
 
-#: g10/gpg.c:2849 g10/gpg.c:2873
+#: g10/gpg.c:2880 g10/gpg.c:2904
 msgid "selected cipher algorithm is invalid\n"
 msgstr "den valda krypteringsalgoritmen är felaktig\n"
 
-#: g10/gpg.c:2855 g10/gpg.c:2879
+#: g10/gpg.c:2886 g10/gpg.c:2910
 msgid "selected digest algorithm is invalid\n"
 msgstr "den valda kontrollsummealgoritmen är felaktig\n"
 
-#: g10/gpg.c:2861
+#: g10/gpg.c:2892
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "den valda krypteringsalgoritmen är felaktig\n"
 
-#: g10/gpg.c:2867
+#: g10/gpg.c:2898
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "den valda kontrollsummealgoritmen är felaktig\n"
 
 # antalet betrodda signaturer som behövs (1-3) för att du ska lita på en nyckel du inte själv verifierat.
-#: g10/gpg.c:2882
+#: g10/gpg.c:2913
 msgid "completes-needed must be greater than 0\n"
 msgstr "variabeln \"completes-needed\" måste ha ett värde som är större än 0\n"
 
 # antalet delvis betrodda signaturer som behövs (1-3) för att du ska lita på en nyckel du inte själv verifierat.
-#: g10/gpg.c:2884
+#: g10/gpg.c:2915
 msgid "marginals-needed must be greater than 1\n"
 msgstr "variabeln \"marginals-needed\" måste vara större än 1\n"
 
 # Hur djupt GnuPG ska leta i Web-of-trust.
-#: g10/gpg.c:2886
+#: g10/gpg.c:2917
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "variabeln \"max-cert-depth\" måste ha ett värde mellan 1 och 255\n"
 
 # Det är nivån för hurväl du har kontrollerat att nyckeln tillhör innehavaren.
-#: g10/gpg.c:2888
+#: g10/gpg.c:2919
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 "felaktigt standardvärde för certifieringsnivån; måste vara 0, 1, 2 eller 3\n"
 
 # Det är nivån för hurväl du har kontrollerat att nyckeln tillhör innehavaren.
-#: g10/gpg.c:2890
+#: g10/gpg.c:2921
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr ""
 "felaktigt minimivärde för certifieringsnivån; måste vara 0, 1, 2 eller 3\n"
 
 # S2K har med krypteringen av hemliga nyckeln att göra
-#: g10/gpg.c:2893
+#: g10/gpg.c:2924
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "OBS: enkelt S2K-läge (0) rekommenderas inte\n"
 
-#: g10/gpg.c:2897
+#: g10/gpg.c:2928
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "felaktigt S2K-läge; måste vara 0, 1 eller 3\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2935
 msgid "invalid default preferences\n"
 msgstr "felaktiga standardinställningar\n"
 
 # Du kan ange de algoritmer du föredrar i prioritetsordning. Då avgör inte enbart standard (symmetrisk kryptering) eller mottagarens preferenser (kryptering till öppen nyckel).
-#: g10/gpg.c:2913
+#: g10/gpg.c:2944
 msgid "invalid personal cipher preferences\n"
 msgstr "felaktig inställning av vilka krypteringsalgoritmer du föredrar\n"
 
-#: g10/gpg.c:2917
+#: g10/gpg.c:2948
 msgid "invalid personal digest preferences\n"
 msgstr "felaktig inställning av vilka checksummealgoritmer du föredrar\n"
 
-#: g10/gpg.c:2921
+#: g10/gpg.c:2952
 msgid "invalid personal compress preferences\n"
 msgstr "felaktig inställning av vilka kompressionsalgoritmer du föredrar\n"
 
-#: g10/gpg.c:2954
+#: g10/gpg.c:2985
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s fungerar ännu inte med  %s\n"
 
-#: g10/gpg.c:3001
+#: g10/gpg.c:3032
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "du kan inte använda chifferalgoritmen \"%s\" när du är i %s läge\n"
 
-#: g10/gpg.c:3006
+#: g10/gpg.c:3037
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "du kan inte använda sammandragsalgoritmen \"%s\" när du är i %s läge\n"
 
-#: g10/gpg.c:3011
+#: g10/gpg.c:3042
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "du kan inte använda komprimeringsalgoritmen \"%s\" när du är i %s läge\n"
 
-#: g10/gpg.c:3107
+#: g10/gpg.c:3138
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
 
-#: g10/gpg.c:3118
+#: g10/gpg.c:3149
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "VARNING: Du har valt mottagare (-r) trots att symmetrisk kryptering valts\n"
 
-#: g10/gpg.c:3129
+#: g10/gpg.c:3160
 msgid "--store [filename]"
 msgstr "--store [filnamn]"
 
-#: g10/gpg.c:3136
+#: g10/gpg.c:3167
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnamn]"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3169
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "dekrypteringen misslyckades: %s\n"
 
-#: g10/gpg.c:3148
+#: g10/gpg.c:3179
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnamn]"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3192
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [filnamn]"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3194
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3166
+#: g10/gpg.c:3197
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "du kan inte använda %s när du är i %s läge\n"
 
-#: g10/gpg.c:3184
+#: g10/gpg.c:3215
 msgid "--sign [filename]"
 msgstr "--sign [filnamn]"
 
-#: g10/gpg.c:3197
+#: g10/gpg.c:3228
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnamn]"
 
-#: g10/gpg.c:3212
+#: g10/gpg.c:3243
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnamn]"
 
-#: g10/gpg.c:3214
+#: g10/gpg.c:3245
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3217
+#: g10/gpg.c:3248
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "du kan inte använda %s när du är i %s läge\n"
 
-#: g10/gpg.c:3237
+#: g10/gpg.c:3268
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [filnamn]"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3277
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnamn]"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3302
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnamn]"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3310
 msgid "--sign-key user-id"
 msgstr "--sign-key användaridentitet"
 
-#: g10/gpg.c:3283
+#: g10/gpg.c:3314
 msgid "--lsign-key user-id"
 msgstr "--lsign-key användaridentitet"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3335
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key användaridentitet [kommandon]"
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3406
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [användaridentitet] [nyckelring]"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3443
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Sändning till nyckelservern misslyckades: %s\n"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3445
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Hämtning från nyckelservern misslyckades: %s\n"
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3447
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Export av nyckeln misslyckades: %s\n"
 
-#: g10/gpg.c:3427
+#: g10/gpg.c:3458
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Sökning på nyckelservern misslyckades: %s\n"
 
-#: g10/gpg.c:3437
+#: g10/gpg.c:3468
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Uppdatering av  nyckeln från en nyckelserver misslyckades: %s\n"
 
-#: g10/gpg.c:3488
+#: g10/gpg.c:3519
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "misslyckades med att ta bort ASCII-skalet: %s\n"
 
-#: g10/gpg.c:3496
+#: g10/gpg.c:3527
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "misslyckades med att skapa ASCII-skal: %s\n"
 
-#: g10/gpg.c:3583
+#: g10/gpg.c:3614
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "felaktig kontrollsummealgoritm `%s'\n"
 
-#: g10/gpg.c:3706
+#: g10/gpg.c:3737
 msgid "[filename]"
 msgstr "[filnamn]"
 
-#: g10/gpg.c:3710
+#: g10/gpg.c:3741
 msgid "Go ahead and type your message ...\n"
 msgstr "Skriv ditt meddelande här ...\n"
 
-#: g10/gpg.c:4000
+#: g10/gpg.c:4031
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1857,31 +1866,31 @@ msgstr ""
 # user notation name??
 # Werner:
 # That is an OpenPGP notation name not registered with IANA.
-#: g10/gpg.c:4008
+#: g10/gpg.c:4039
 msgid "a user notation name must contain the '@' character\n"
 msgstr "ett användarnoteringsnamn måste innehålla '@'-tecknet\n"
 
 # user notation name??
 # Werner:
 # That is an OpenPGP notation name not registered with IANA.
-#: g10/gpg.c:4013
+#: g10/gpg.c:4044
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "ett användarnoteringsnamn måste innehålla '@'-tecknet\n"
 
-#: g10/gpg.c:4024
+#: g10/gpg.c:4055
 msgid "a notation value must not use any control characters\n"
 msgstr "ett notationsvärde får inte inehålla några kontrolltecken\n"
 
-#: g10/gpg.c:4058
+#: g10/gpg.c:4089
 msgid "the given certification policy URL is invalid\n"
 msgstr "den angivna URL som beskriver certifikationspolicy är felaktig\n"
 
-#: g10/gpg.c:4060
+#: g10/gpg.c:4091
 msgid "the given signature policy URL is invalid\n"
 msgstr "den angivna URL som beskriver signaturpolicy är felaktig\n"
 
-#: g10/gpg.c:4093
+#: g10/gpg.c:4124
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den angivna URL som beskriver signaturpolicy är felaktig\n"
@@ -1890,34 +1899,35 @@ msgstr "den angivna URL som beskriver signaturpolicy är felaktig\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "för många poster i pk-cachen - avstängd\n"
 
-#: g10/getkey.c:188 g10/getkey.c:2845
+#: g10/getkey.c:188 g10/getkey.c:2876
 #, fuzzy
 msgid "[User ID not found]"
 msgstr "[Hittade inte användaridentiteten]"
 
-#: g10/getkey.c:931 g10/getkey.c:953 g10/getkey.c:976
+#: g10/getkey.c:933 g10/getkey.c:950 g10/getkey.c:970 g10/getkey.c:986
+#: g10/getkey.c:1001
 #, c-format
 msgid "Automatically retrieved `%s' via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1769
+#: g10/getkey.c:1800
 #, fuzzy, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Ogiltig nyckel %08lX  tvingat giltig med --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2323
+#: g10/getkey.c:2354
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 "det finns ingen hemlig undernyckel tillhörande den öppna undernyckeln %08lX "
 "- hoppar över\n"
 
-#: g10/getkey.c:2554
+#: g10/getkey.c:2585
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "använder undernyckeln %08lX istället för huvudnyckeln %08lX\n"
 
-#: g10/getkey.c:2601
+#: g10/getkey.c:2632
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "nyckel %08lX: hemlig nyckel utan öppen nyckel - hoppade över den\n"
@@ -3532,12 +3542,12 @@ msgid "(sensitive)"
 msgstr " (känsligt)"
 
 #: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
-#: g10/keylist.c:194 g10/keyserver.c:471
+#: g10/keylist.c:194 g10/keyserver.c:525
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "kan inte skapa %s: %s\n"
 
-#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:967
+#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:960
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[spärrad]"
@@ -3549,7 +3559,7 @@ msgstr "[går ut: %s]"
 
 #: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
 #: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:477 g10/mainproc.c:973
+#: g10/keylist.c:914 g10/keyserver.c:531 g10/mainproc.c:966
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "[går ut: %s]"
@@ -3585,14 +3595,14 @@ msgstr ""
 "Obs! Den visade nyckelgiltigheten kan vara felaktig\n"
 "om du inte startar om programmet.\n"
 
-#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:481
-#: g10/mainproc.c:1734 g10/trustdb.c:1184 g10/trustdb.c:1704
+#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:535
+#: g10/mainproc.c:1783 g10/trustdb.c:1184 g10/trustdb.c:1704
 #, fuzzy
 msgid "revoked"
 msgstr "[spärrad]"
 
-#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:485
-#: g10/mainproc.c:1736 g10/trustdb.c:537 g10/trustdb.c:1706
+#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:539
+#: g10/mainproc.c:1785 g10/trustdb.c:537 g10/trustdb.c:1706
 #, fuzzy
 msgid "expired"
 msgstr "expire"
@@ -4449,399 +4459,396 @@ msgstr "%s: nyckelring skapad\n"
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:77
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:81
+#: g10/keyserver.c:79
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:83
+#: g10/keyserver.c:81
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:87
+#: g10/keyserver.c:85
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:89
-msgid "automatically retrieve keys from PKA records"
-msgstr ""
-
-#: g10/keyserver.c:91
-msgid "automatically retrieve keys from DNS"
-msgstr ""
-
-#: g10/keyserver.c:95
+#: g10/keyserver.c:87
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "den angivna URL som beskriver signaturpolicy är felaktig\n"
 
-#: g10/keyserver.c:139
+#: g10/keyserver.c:89
+msgid "honor the PKA record set on a key when retrieving keys"
+msgstr ""
+
+#: g10/keyserver.c:154
 #, fuzzy, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr ""
 "VARNING: inställningar i `%s' är ännu inte aktiva under denna körning\n"
 
-#: g10/keyserver.c:483
+#: g10/keyserver.c:537
 #, fuzzy
 msgid "disabled"
 msgstr "disable"
 
-#: g10/keyserver.c:684
+#: g10/keyserver.c:738
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:767 g10/keyserver.c:1368
+#: g10/keyserver.c:821 g10/keyserver.c:1422
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr ""
 
-#: g10/keyserver.c:865
+#: g10/keyserver.c:919
 #, fuzzy, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "hittade inte nyckeln  `%s': %s\n"
 
-#: g10/keyserver.c:867
+#: g10/keyserver.c:921
 #, fuzzy
 msgid "key not found on keyserver\n"
 msgstr "hittade inte nyckeln  `%s': %s\n"
 
-#: g10/keyserver.c:1092
+#: g10/keyserver.c:1146
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "begär nyckel %08lX från %s\n"
 
-#: g10/keyserver.c:1096
+#: g10/keyserver.c:1150
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "begär nyckel %08lX från %s\n"
 
-#: g10/keyserver.c:1120
+#: g10/keyserver.c:1174
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "söker \"%s\" från HKP-server %s\n"
 
-#: g10/keyserver.c:1123
+#: g10/keyserver.c:1177
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "söker \"%s\" från HKP-server %s\n"
 
-#: g10/keyserver.c:1271
+#: g10/keyserver.c:1325
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "söker \"%s\" från HKP-server %s\n"
 
-#: g10/keyserver.c:1275
+#: g10/keyserver.c:1329
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr "begär nyckel %08lX från %s\n"
 
-#: g10/keyserver.c:1318
+#: g10/keyserver.c:1372
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "söker \"%s\" från HKP-server %s\n"
 
-#: g10/keyserver.c:1321
+#: g10/keyserver.c:1375
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "söker \"%s\" från HKP-server %s\n"
 
-#: g10/keyserver.c:1328 g10/keyserver.c:1424
+#: g10/keyserver.c:1382 g10/keyserver.c:1478
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "nyckelserverfel"
 
-#: g10/keyserver.c:1376
+#: g10/keyserver.c:1430
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1439
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1446
+#: g10/keyserver.c:1500
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1452
+#: g10/keyserver.c:1506
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1464
+#: g10/keyserver.c:1518
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1469
+#: g10/keyserver.c:1523
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1477
+#: g10/keyserver.c:1531
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1484
+#: g10/keyserver.c:1538
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "nyckelserverfel"
 
-#: g10/keyserver.c:1489
+#: g10/keyserver.c:1543
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "nyckelserverfel"
 
-#: g10/keyserver.c:1498
+#: g10/keyserver.c:1552
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "Hämtning från nyckelservern misslyckades: %s\n"
 
-#: g10/keyserver.c:1523 g10/keyserver.c:1557
+#: g10/keyserver.c:1577 g10/keyserver.c:1611
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1814
+#: g10/keyserver.c:1868
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "VARNING: kan inte ta bort tempfil (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1836
+#: g10/keyserver.c:1890
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "begär nyckel %08lX från %s\n"
 
-#: g10/keyserver.c:1838
+#: g10/keyserver.c:1892
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "begär nyckel %08lX från %s\n"
 
-#: g10/keyserver.c:1903
+#: g10/keyserver.c:1957
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "VARNING: kan inte ta bort tempfil (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1909
+#: g10/keyserver.c:1963
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "VARNING: kan inte ta bort tempfil (%s) `%s': %s\n"
 
-#: g10/mainproc.c:253
+#: g10/mainproc.c:240
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "egendomlig storlek på en krypterad sessionsnyckel (%d)\n"
 
-#: g10/mainproc.c:304
+#: g10/mainproc.c:291
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s  krypterad sessionsnyckel\n"
 
-#: g10/mainproc.c:314
+#: g10/mainproc.c:301
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "lösenmening skapad  med okänd sammandragsalgoritm %d\n"
 
-#: g10/mainproc.c:395
+#: g10/mainproc.c:382
 #, fuzzy, c-format
 msgid "public key is %s\n"
 msgstr "den öppna nyckeln är %08lX\n"
 
 # Men jag ändrade så det blev närmare originalet. Per
-#: g10/mainproc.c:450
+#: g10/mainproc.c:439
 msgid "public key encrypted data: good DEK\n"
 msgstr "Data krypterat till öppen nyckel: Giltig DEK\n"
 
-#: g10/mainproc.c:483
+#: g10/mainproc.c:472
 #, fuzzy, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "krypterad med %u-bitars %s-nyckel, ID %08lX, skapad %s\n"
 
-#: g10/mainproc.c:487 g10/pkclist.c:219
+#: g10/mainproc.c:476 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr ""
 
-#: g10/mainproc.c:491
+#: g10/mainproc.c:480
 #, fuzzy, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "krypterad med %s-nyckel, ID %08lX\n"
 
 # Motsatsen till kryptering med symmetrisk nyckel.
-#: g10/mainproc.c:505
+#: g10/mainproc.c:494
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "öppen nyckel-dekryptering misslyckades: %s\n"
 
-#: g10/mainproc.c:519
+#: g10/mainproc.c:508
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "krypterad med %lu lösenmeningar\n"
 
-#: g10/mainproc.c:521
+#: g10/mainproc.c:510
 msgid "encrypted with 1 passphrase\n"
 msgstr "krypterad med with 1 lösenmening\n"
 
-#: g10/mainproc.c:549 g10/mainproc.c:571
+#: g10/mainproc.c:541 g10/mainproc.c:563
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "antar att %s krypterade data\n"
 
-#: g10/mainproc.c:557
+#: g10/mainproc.c:549
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "IDEA-kryptering inte installerad. Optimistiskt försök att använda %s "
 "istället\n"
 
-#: g10/mainproc.c:589
+#: g10/mainproc.c:581
 msgid "decryption okay\n"
 msgstr "dekrypteringen lyckades\n"
 
 # Äldre krypteringalgoritmer skapar ingen mdc dvs. "minisignatur" som skyddar mot att delar av den krypterade texten byts ut/tas bort. Alla nya 128-bitars algoritmer använder mdc: AES, AES192, AES256, BLOWFISH.
-#: g10/mainproc.c:593
+#: g10/mainproc.c:585
 msgid "WARNING: message was not integrity protected\n"
 msgstr "VARNING: detta meddelande var inte integritetsskyddat\n"
 
 # Meddelandet innebär alltså att kontrollen av mdc visade att meddelandet förändrats/manipulerats sedan det krypterades. Block kan ha tagits bort eller bytts ut.
-#: g10/mainproc.c:606
+#: g10/mainproc.c:598
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "VARNING: det krypterade meddelandet har ändrats!\n"
 
-#: g10/mainproc.c:612
+#: g10/mainproc.c:604
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "dekrypteringen misslyckades: %s\n"
 
-#: g10/mainproc.c:631
+#: g10/mainproc.c:623
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "OBS: avsändaren begärde \"endast-för-dina-ögon\"\n"
 
-#: g10/mainproc.c:633
+#: g10/mainproc.c:625
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "ursprungligt filnamn=\"%.*s\"\n"
 
-#: g10/mainproc.c:822
+#: g10/mainproc.c:815
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "fristående spärrcertifikat - använd \"gpg --import\" för\n"
 "att applicera\n"
 
-#: g10/mainproc.c:1168
+#: g10/mainproc.c:1161
 #, fuzzy
 msgid "no signature found\n"
 msgstr "Korrekt signatur från \""
 
-#: g10/mainproc.c:1418
+#: g10/mainproc.c:1419
 msgid "signature verification suppressed\n"
 msgstr "signaturen verifierades inte\n"
 
-#: g10/mainproc.c:1460 g10/mainproc.c:1470
-msgid "can't handle these multiple signatures\n"
+#: g10/mainproc.c:1519
+#, fuzzy
+msgid "can't handle this ambiguous signature data\n"
 msgstr "kan inte hantera dessa multipla signaturer\n"
 
-#: g10/mainproc.c:1480
+#: g10/mainproc.c:1530
 #, fuzzy, c-format
 msgid "Signature made %s\n"
 msgstr "Giltighetstiden för signaturen har upphört %s\n"
 
-#: g10/mainproc.c:1481
+#: g10/mainproc.c:1531
 #, fuzzy, c-format
 msgid "               using %s key %s\n"
 msgstr "      även känd som \""
 
-#: g10/mainproc.c:1485
+#: g10/mainproc.c:1535
 #, fuzzy, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Signerades %.*s med hjälp av %s-nyckeln med ID %08lX\n"
 
-#: g10/mainproc.c:1505
+#: g10/mainproc.c:1555
 msgid "Key available at: "
 msgstr "Nyckeln tillgänglig hos: "
 
-#: g10/mainproc.c:1639 g10/mainproc.c:1687
+#: g10/mainproc.c:1688 g10/mainproc.c:1736
 #, fuzzy, c-format
 msgid "BAD signature from \"%s\""
 msgstr "FELAKTIG signatur från \""
 
-#: g10/mainproc.c:1641 g10/mainproc.c:1689
+#: g10/mainproc.c:1690 g10/mainproc.c:1738
 #, fuzzy, c-format
 msgid "Expired signature from \"%s\""
 msgstr "Giltighetstiden har upphört för signatur från \""
 
-#: g10/mainproc.c:1643 g10/mainproc.c:1691
+#: g10/mainproc.c:1692 g10/mainproc.c:1740
 #, fuzzy, c-format
 msgid "Good signature from \"%s\""
 msgstr "Korrekt signatur från \""
 
 # Visas vid ogiltig signatur:
 # Eftersom signaturen är ogiltig kan man inte vara säker på att angivet namn och nyckel-id är riktigt.
-#: g10/mainproc.c:1695
+#: g10/mainproc.c:1744
 msgid "[uncertain]"
 msgstr "[osäkert]"
 
-#: g10/mainproc.c:1727
+#: g10/mainproc.c:1776
 #, fuzzy, c-format
 msgid "                aka \"%s\""
 msgstr "      även känd som \""
 
-#: g10/mainproc.c:1824
+#: g10/mainproc.c:1873
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Giltighetstiden för signaturen har upphört %s\n"
 
-#: g10/mainproc.c:1829
+#: g10/mainproc.c:1878
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Giltighetstiden för signaturen går ut %s\n"
 
-#: g10/mainproc.c:1832
+#: g10/mainproc.c:1881
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s signatur, sammandragsalgoritm %s\n"
 
-#: g10/mainproc.c:1833
+#: g10/mainproc.c:1882
 msgid "binary"
 msgstr "binär"
 
-#: g10/mainproc.c:1834
+#: g10/mainproc.c:1883
 msgid "textmode"
 msgstr "textläge"
 
-#: g10/mainproc.c:1834 g10/trustdb.c:536
+#: g10/mainproc.c:1883 g10/trustdb.c:536
 msgid "unknown"
 msgstr "okänd"
 
-#: g10/mainproc.c:1854
+#: g10/mainproc.c:1903
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "Kan inte verifiera signaturen: %s\n"
 
-#: g10/mainproc.c:1922 g10/mainproc.c:1938 g10/mainproc.c:2024
+#: g10/mainproc.c:1972 g10/mainproc.c:1988 g10/mainproc.c:2074
 msgid "not a detached signature\n"
 msgstr "detta är inte någon signatur i en separat fil\n"
 
-#: g10/mainproc.c:1965
+#: g10/mainproc.c:2015
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr ""
 "VARNING: multipla signaturer upptäckta. Endast den första kommer att "
 "kontrolleras.\n"
 
-#: g10/mainproc.c:1973
+#: g10/mainproc.c:2023
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "fristående signatur av klassen 0x%02x\n"
 
-#: g10/mainproc.c:2030
+#: g10/mainproc.c:2080
 msgid "old style (PGP 2.x) signature\n"
 msgstr "signatur av den gamla (PGP 2.x) typen\n"
 
-#: g10/mainproc.c:2040
+#: g10/mainproc.c:2090
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "felaktigt rotpaket hittades i proc_tree()\n"
 
@@ -5415,24 +5422,24 @@ msgstr "data sparades inte, använd flaggan \"--output\" för att spara det\n"
 msgid "error creating `%s': %s\n"
 msgstr "Fel vid skapande av `%s': %s\n"
 
-#: g10/plaintext.c:447
+#: g10/plaintext.c:453
 msgid "Detached signature.\n"
 msgstr "Signatur i en separat fil.\n"
 
-#: g10/plaintext.c:453
+#: g10/plaintext.c:459
 msgid "Please enter name of data file: "
 msgstr "Ange namnet på datafilen: "
 
-#: g10/plaintext.c:485
+#: g10/plaintext.c:491
 msgid "reading stdin ...\n"
 msgstr "läser från standard in ...\n"
 
-#: g10/plaintext.c:519
+#: g10/plaintext.c:525
 msgid "no signed data\n"
 msgstr "ingen signerad data\n"
 
 # se förra kommentaren
-#: g10/plaintext.c:533
+#: g10/plaintext.c:539
 #, fuzzy, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "kan inte öppna \"%s\"\n"
diff --git a/po/tr.po b/po/tr.po
index aa7411291..f59d95897 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.1\n"
 "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2006-02-14 15:28+0100\n"
+"POT-Creation-Date: 2006-03-07 11:29+0100\n"
 "PO-Revision-Date: 2005-03-16 07:30+0300\n"
 "Last-Translator: Nilgün Belma Bugüner <nilgun@superonline.com>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
@@ -41,9 +41,9 @@ msgstr "gizli anahtarı `%s'e yazıyor\n"
 
 #: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:992 g10/gpg.c:3360 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:997 g10/gpg.c:3391 g10/import.c:193 g10/keygen.c:2274
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:476 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
+#: g10/plaintext.c:482 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
 #: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
@@ -77,7 +77,7 @@ msgstr "\"%s\" okunamıyor: %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "bilgi: \"random_seed\" dosyası güncel değil\n"
 
-#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:991 g10/keygen.c:2753
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2753
 #: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
 #: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
 #, c-format
@@ -662,12 +662,12 @@ msgstr "Yönetici komutlarına izin verilmez\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Komut geçersiz (\"help\" komutunu deneyin)\n"
 
-#: g10/cardglue.c:435
+#: g10/cardglue.c:434
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr ""
 "Lüthen kartı yerleştirdikten sonra ya <enter> ya da iptal için 'c' tuşlayın: "
 
-#: g10/cardglue.c:572
+#: g10/cardglue.c:573
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
@@ -677,35 +677,35 @@ msgstr ""
 "   %.*s\n"
 "olan kartı yerleştirin.\n"
 
-#: g10/cardglue.c:580
+#: g10/cardglue.c:582
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr "Hazır olunca <enter> ya da iptal etmek için 'c' tuşlayın: "
 
-#: g10/cardglue.c:915
+#: g10/cardglue.c:917
 msgid "Enter New Admin PIN: "
 msgstr "Yeni Yönetici PIN'ini girin: "
 
-#: g10/cardglue.c:916
+#: g10/cardglue.c:918
 msgid "Enter New PIN: "
 msgstr "Yeni PIN'i girin: "
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:919
 msgid "Enter Admin PIN: "
 msgstr "Yönetici PIN'ini girin: "
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:920
 msgid "Enter PIN: "
 msgstr "PIN'i girin: "
 
-#: g10/cardglue.c:935
+#: g10/cardglue.c:937
 msgid "Repeat this PIN: "
 msgstr "Bu PIN'i tekrarlayın: "
 
-#: g10/cardglue.c:950
+#: g10/cardglue.c:952
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN doğru tekrarlanmadı; tekrar deneyin"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3720 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3751 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -715,13 +715,13 @@ msgstr "`%s' açılamadı\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output seçeneği bu komutla çalışmaz\n"
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1644
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1698
 #: g10/revoke.c:228
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "anahtar \"%s\" yok: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1658
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1712
 #: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -834,12 +834,12 @@ msgstr "%2$s kipindeyken %1$s kullanılamayabilir.\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s \"%s\" için şifrelendi\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:306
+#: g10/encr-data.c:67 g10/mainproc.c:293
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s şifreli veri\n"
 
-#: g10/encr-data.c:69 g10/mainproc.c:310
+#: g10/encr-data.c:69 g10/mainproc.c:297
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "bilinmeyen algoritma %d ile şifrelenmiş\n"
@@ -977,7 +977,7 @@ msgstr "UYARI: gizli anahtar %s basit bir SK sağlamasına sahip değil\n"
 msgid "WARNING: nothing exported\n"
 msgstr "UYARI: hiçbir şey dışarı aktarılmadı\n"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:373
 msgid ""
 "@Commands:\n"
 " "
@@ -985,127 +985,127 @@ msgstr ""
 "@Komutlar:\n"
 " "
 
-#: g10/gpg.c:374
+#: g10/gpg.c:375
 msgid "|[file]|make a signature"
 msgstr "|[dosya]|bir imza yapar"
 
-#: g10/gpg.c:375
+#: g10/gpg.c:376
 msgid "|[file]|make a clear text signature"
 msgstr "|[dosya]|açıkça okunabilen bir imza yapar"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:377
 msgid "make a detached signature"
 msgstr "bağımsız bir imza yapar"
 
-#: g10/gpg.c:377
+#: g10/gpg.c:378
 msgid "encrypt data"
 msgstr "veriyi şifreler"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:380
 msgid "encryption only with symmetric cipher"
 msgstr "sadece simetrik şifre ile şifreler"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:382
 msgid "decrypt data (default)"
 msgstr "veri şifresini açar (öntanımlı)"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:384
 msgid "verify a signature"
 msgstr "bir imzayı doğrular"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:386
 msgid "list keys"
 msgstr "anahtarları listeler"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "list keys and signatures"
 msgstr "anahtarları ve imzaları listeler"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:389
 msgid "list and check key signatures"
 msgstr "anahtar imzalarını listeler ve sınar"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:390
 msgid "list keys and fingerprints"
 msgstr "anahtarları ve parmak izlerini listeler"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:391
 msgid "list secret keys"
 msgstr "gizli anahtarları listeler"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:392
 msgid "generate a new key pair"
 msgstr "yeni bir anahtar çifti üretir"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:393
 msgid "remove keys from the public keyring"
 msgstr "anahtarları genel anahtar zincirinden siler"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:395
 msgid "remove keys from the secret keyring"
 msgstr "anahtarları gizli anahtar zincirinden siler"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:396
 msgid "sign a key"
 msgstr "bir anahtarı imzalar"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:397
 msgid "sign a key locally"
 msgstr "bir anahtarı yerel olarak imzalar"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:398
 msgid "sign or edit a key"
 msgstr "bir anahtarı düzenler ve imzalar"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:399
 msgid "generate a revocation certificate"
 msgstr "bir yürürlükten kaldırma sertifikası üretir"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:401
 msgid "export keys"
 msgstr "anahtarları gönderir"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:402
 msgid "export keys to a key server"
 msgstr "anahtarları bir anahtar sunucusuna gönderir"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:403
 msgid "import keys from a key server"
 msgstr "anahtarları bir anahtar sunucusundan indirir"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:405
 msgid "search for keys on a key server"
 msgstr "bir anahtar sunucusunda anahtarları arar"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:407
 msgid "update all keys from a keyserver"
 msgstr "anahtarları bir anahtar sunucusundan günceller"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:411
 msgid "import/merge keys"
 msgstr "anahtarları indirir/katıştırır"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:414
 msgid "print the card status"
 msgstr "kart durumunu basar"
 
-#: g10/gpg.c:414
+#: g10/gpg.c:415
 msgid "change data on a card"
 msgstr "kart üzerindeki veriyi değiştirir"
 
-#: g10/gpg.c:415
+#: g10/gpg.c:416
 msgid "change a card's PIN"
 msgstr "bir kartın PIN'ini değiştirir"
 
-#: g10/gpg.c:423
+#: g10/gpg.c:424
 msgid "update the trust database"
 msgstr "güvence veritabanını günceller"
 
-#: g10/gpg.c:430
+#: g10/gpg.c:431
 msgid "|algo [files]|print message digests"
 msgstr "|algo [dosyalar]|ileti özümlemelerini gösterir"
 
-#: g10/gpg.c:434 g10/gpgv.c:71
+#: g10/gpg.c:435 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1115,51 +1115,51 @@ msgstr ""
 "Seçenekler:\n"
 " "
 
-#: g10/gpg.c:436
+#: g10/gpg.c:437
 msgid "create ascii armored output"
 msgstr "ascii zırhlı çıktı oluşturur"
 
-#: g10/gpg.c:438
+#: g10/gpg.c:439
 msgid "|NAME|encrypt for NAME"
 msgstr "|İSİM|İSİM için şifreleme yapar"
 
-#: g10/gpg.c:449
+#: g10/gpg.c:450
 msgid "use this user-id to sign or decrypt"
 msgstr "imzalamak ya da şifre çözmek için bu kullanıcı kimliği kullanılır"
 
-#: g10/gpg.c:450
+#: g10/gpg.c:451
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|sıkıştırma seviyesi N olarak ayarlanır (0 ise sıkıştırma yapılmaz)"
 
-#: g10/gpg.c:455
+#: g10/gpg.c:456
 msgid "use canonical text mode"
 msgstr "kurallı metin kipini kullanır"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:470
 msgid "use as output file"
 msgstr "çıktı dosyası olarak kullanılır"
 
-#: g10/gpg.c:471 g10/gpgv.c:73
+#: g10/gpg.c:472 g10/gpgv.c:73
 msgid "verbose"
 msgstr "çok detaylı"
 
-#: g10/gpg.c:482
+#: g10/gpg.c:483
 msgid "do not make any changes"
 msgstr "hiçbir değişiklik yapmaz"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:484
 msgid "prompt before overwriting"
 msgstr "üzerine yazmadan önce sorar"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:525
 msgid "use strict OpenPGP behavior"
 msgstr "kesin OpenPGP davranışı etkin olur"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "generate PGP 2.x compatible messages"
 msgstr "PGP 2.x uyumlu iletiler üretilir"
 
-#: g10/gpg.c:553
+#: g10/gpg.c:554
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1167,7 +1167,7 @@ msgstr ""
 "@\n"
 "(Tüm komut ve seçeneklerin komple listesi için man sayfalarına bakın)\n"
 
-#: g10/gpg.c:556
+#: g10/gpg.c:557
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1187,17 +1187,17 @@ msgstr ""
 " --list-keys [isimler]      anahtarları listeler\n"
 " --fingerprint [isimler]    parmak izlerini gösterir\n"
 
-#: g10/gpg.c:746 g10/gpgv.c:98
+#: g10/gpg.c:751 g10/gpgv.c:98
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr ""
 "Yazılım hatalarını lütfen <gnupg-bugs@gnu.org> adresine,\n"
 "çeviri hatalarını ise <gnu-tr@belgeler.org> adresine bildiriniz.\n"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:768
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "Kullanımı: gpg [seçenekler] [dosyalar] (yardım için -h)"
 
-#: g10/gpg.c:766
+#: g10/gpg.c:771
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1207,7 +1207,7 @@ msgstr ""
 "imzalama, kontrol, şifreleme veya çözme\n"
 "öntanımlı işlem girilen veriye bağımlıdır\n"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:782
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1215,542 +1215,551 @@ msgstr ""
 "\n"
 "Desteklenen algoritmalar:\n"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:785
 msgid "Pubkey: "
 msgstr "GenAnah: "
 
-#: g10/gpg.c:786 g10/keyedit.c:2266
+#: g10/gpg.c:791 g10/keyedit.c:2266
 msgid "Cipher: "
 msgstr "Şifre: "
 
-#: g10/gpg.c:792
+#: g10/gpg.c:797
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:798 g10/keyedit.c:2312
+#: g10/gpg.c:803 g10/keyedit.c:2312
 msgid "Compression: "
 msgstr "Sıkıştırma: "
 
-#: g10/gpg.c:881
+#: g10/gpg.c:886
 msgid "usage: gpg [options] "
 msgstr "kullanımı: gpg [seçenekler] "
 
-#: g10/gpg.c:1029
+#: g10/gpg.c:1034
 msgid "conflicting commands\n"
 msgstr "çelişen komutlar\n"
 
-#: g10/gpg.c:1047
+#: g10/gpg.c:1052
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "grup tanımı '%s' içinde = işareti yok\n"
 
-#: g10/gpg.c:1244
+#: g10/gpg.c:1249
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "UYARI: '%s' evdizininde güvensiz iyelik\n"
 
-#: g10/gpg.c:1247
+#: g10/gpg.c:1252
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "UYARI: '%s' yapılandırma dosyasında güvensiz iyelik\n"
 
-#: g10/gpg.c:1250
+#: g10/gpg.c:1255
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "UYARI: '%s' eklentisinde güvensiz iyelik\n"
 
-#: g10/gpg.c:1256
+#: g10/gpg.c:1261
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "UYARI: UYARI: '%s' evdizininde güvensiz izinler\n"
 
-#: g10/gpg.c:1259
+#: g10/gpg.c:1264
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "UYARI: '%s' yapılandırma dosyasında güvensiz izinler\n"
 
-#: g10/gpg.c:1262
+#: g10/gpg.c:1267
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "UYARI: '%s' eklentisinde güvensiz izinler\n"
 
-#: g10/gpg.c:1268
+#: g10/gpg.c:1273
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "UYARI: '%s' evdizinindeki ilgili dizinin iyeliği güvensiz\n"
 
-#: g10/gpg.c:1271
+#: g10/gpg.c:1276
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "UYARI: '%s' yapılandırma dosyasını içeren dizinin iyeliği güvensiz\n"
 
-#: g10/gpg.c:1274
+#: g10/gpg.c:1279
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "UYARI: '%s' eklentisini içeren dizinin iyeliği güvensiz\n"
 
-#: g10/gpg.c:1280
+#: g10/gpg.c:1285
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "UYARI: '%s' evdizinindeki ilgili dizinin izinleri güvensiz\n"
 
-#: g10/gpg.c:1283
+#: g10/gpg.c:1288
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "UYARI: '%s' yapılandırma dosyasını içeren dizinin izinleri güvensiz\n"
 
-#: g10/gpg.c:1286
+#: g10/gpg.c:1291
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "UYARI: '%s' eklentisini içeren dizinin izinleri güvensiz\n"
 
-#: g10/gpg.c:1427
+#: g10/gpg.c:1432
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "yapılandırma öğesi '%s' bilinmiyor\n"
 
-#: g10/gpg.c:1521
+#: g10/gpg.c:1526
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1523
+#: g10/gpg.c:1528
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1525
+#: g10/gpg.c:1530
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Gizli anahtar demetinde uygun/benzer imza yok\n"
 
-#: g10/gpg.c:1527
+#: g10/gpg.c:1532
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1536
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1538
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "belirtilen anahtar sunucusu adresi geçersiz\n"
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1540
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1542
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1544
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1546
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "listedeki bir anahtarın hangi anahtar zincirinde olduğunu gösterir"
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1548
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Gizli anahtar demetinde uygun/benzer imza yok\n"
 
-#: g10/gpg.c:1874
+#: g10/gpg.c:1879
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "BİLGİ: eski öntanımlı seçenekler dosyası `%s' yoksayıldı\n"
 
-#: g10/gpg.c:1916
+#: g10/gpg.c:1921
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "BİLGİ: \"%s\" öntanımlı seçenek dosyası yok\n"
 
-#: g10/gpg.c:1920
+#: g10/gpg.c:1925
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "seçenek dosyası \"%s\": %s\n"
 
-#: g10/gpg.c:1927
+#: g10/gpg.c:1932
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "\"%s\"den seçenekler okunuyor\n"
 
-#: g10/gpg.c:2142 g10/gpg.c:2716 g10/gpg.c:2735
+#: g10/gpg.c:2147 g10/gpg.c:2747 g10/gpg.c:2766
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "BİLGİ: %s normal kullanım için değil!\n"
 
-#: g10/gpg.c:2158
+#: g10/gpg.c:2163
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "şifre eklentisi '%s' güvensiz izinlerden dolayı yüklenmedi\n"
 
-#: g10/gpg.c:2312 g10/gpg.c:2324
+#: g10/gpg.c:2317 g10/gpg.c:2329
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "'%s' geçerli bir karakter kümesi değil\n"
 
-#: g10/gpg.c:2400
+#: g10/gpg.c:2405
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "'%s' geçerli bir karakter kümesi değil\n"
 
-#: g10/gpg.c:2422 g10/keyedit.c:3997
+#: g10/gpg.c:2429 g10/keyedit.c:3997
 msgid "could not parse keyserver URL\n"
 msgstr "anahtar sunucusunun adresi çözümlenemedi\n"
 
-#: g10/gpg.c:2428
+#: g10/gpg.c:2441
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: anahtar sunucusu seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2431
+#: g10/gpg.c:2444
 msgid "invalid keyserver options\n"
 msgstr "anahtar sunucusu seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2438
+#: g10/gpg.c:2451
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: geçersiz içselleştirme seçenekleri\n"
 
-#: g10/gpg.c:2441
+#: g10/gpg.c:2454
 msgid "invalid import options\n"
 msgstr "içselleştirme seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2448
+#: g10/gpg.c:2461
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d geçersiz dışsallaştırma seçenekleri\n"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2464
 msgid "invalid export options\n"
 msgstr "dışsallaştırma seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2458
+#: g10/gpg.c:2471
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: liste seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2461
+#: g10/gpg.c:2474
 msgid "invalid list options\n"
 msgstr "liste seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2469
+#: g10/gpg.c:2482
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2471
+#: g10/gpg.c:2484
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2473
+#: g10/gpg.c:2486
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "'%s' geçerli bir karakter kümesi değil\n"
 
-#: g10/gpg.c:2475
+#: g10/gpg.c:2488
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2479
+#: g10/gpg.c:2492
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2481
+#: g10/gpg.c:2494
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "belirtilen anahtar sunucusu adresi geçersiz\n"
 
-#: g10/gpg.c:2483
+#: g10/gpg.c:2496
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "'%s' geçerli bir karakter kümesi değil\n"
 
-#: g10/gpg.c:2485
+#: g10/gpg.c:2498
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2505
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d doğrulama seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2495
+#: g10/gpg.c:2508
 msgid "invalid verify options\n"
 msgstr "doğrulama seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2502
+#: g10/gpg.c:2515
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "çalıştırılabilirlerin patikası %s yapılamıyor\n"
 
-#: g10/gpg.c:2705
+#: g10/gpg.c:2665
+#, fuzzy, c-format
+msgid "%s:%d: invalid auto-key-locate list\n"
+msgstr "%s:%d doğrulama seçenekleri geçersiz\n"
+
+#: g10/gpg.c:2668
+msgid "invalid auto-key-locate list\n"
+msgstr ""
+
+#: g10/gpg.c:2736
 msgid "WARNING: program may create a core file!\n"
 msgstr "UYARI: program bir \"core\" dosyası oluşturabilir!\n"
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2740
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "UYARI: %s %s'i aşıyor\n"
 
-#: g10/gpg.c:2718
+#: g10/gpg.c:2749
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ile %s birlikte kullanılmaz!\n"
 
-#: g10/gpg.c:2721
+#: g10/gpg.c:2752
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s, %s ile etkisiz olur!\n"
 
-#: g10/gpg.c:2728
+#: g10/gpg.c:2759
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "gpg-agent bu oturumda kullanılamaz\n"
 
-#: g10/gpg.c:2743
+#: g10/gpg.c:2774
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "%s olmasından dolayı güvensiz bellekle çalıştırılmayacak\n"
 
-#: g10/gpg.c:2757
+#: g10/gpg.c:2788
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "--pgp2 kipindeyken sadece ayrık veya sade imzalar yapabilirsiniz\n"
 
-#: g10/gpg.c:2763
+#: g10/gpg.c:2794
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2 kipinde aynı anda hem imzalama hem de şifreleme yapamazsınız\n"
 
-#: g10/gpg.c:2769
+#: g10/gpg.c:2800
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "--pgp2 ile çalışırken veri yolu yerine dosyaları kullanmalısınız.\n"
 
-#: g10/gpg.c:2782
+#: g10/gpg.c:2813
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "--pgp2 kipinde ileti şifrelemesi IDEA şifresi gerektirir\n"
 
-#: g10/gpg.c:2849 g10/gpg.c:2873
+#: g10/gpg.c:2880 g10/gpg.c:2904
 msgid "selected cipher algorithm is invalid\n"
 msgstr "seçilen şifre algoritması geçersiz\n"
 
-#: g10/gpg.c:2855 g10/gpg.c:2879
+#: g10/gpg.c:2886 g10/gpg.c:2910
 msgid "selected digest algorithm is invalid\n"
 msgstr "seçilen özümleme algoritması geçersiz\n"
 
-#: g10/gpg.c:2861
+#: g10/gpg.c:2892
 msgid "selected compression algorithm is invalid\n"
 msgstr "seçilen şifre algoritması geçersiz\n"
 
-#: g10/gpg.c:2867
+#: g10/gpg.c:2898
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "seçilen sertifikalama özümleme algoritması geçersiz\n"
 
-#: g10/gpg.c:2882
+#: g10/gpg.c:2913
 msgid "completes-needed must be greater than 0\n"
 msgstr "\"completes-needed\" 0 dan büyük olmalı\n"
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2915
 msgid "marginals-needed must be greater than 1\n"
 msgstr "\"marginals-needed\" 1 den büyük olmalı\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2917
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "\"max-cert-depth\" 1 ile 255 arasında olmalı\n"
 
-#: g10/gpg.c:2888
+#: g10/gpg.c:2919
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "öntanımlı sertifika seviyesi geçersiz; 0, 1, 2, ya da 3 olabilir\n"
 
-#: g10/gpg.c:2890
+#: g10/gpg.c:2921
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "asgari sertifika seviyesi geçersiz; 1, 2, ya da 3 olabilir\n"
 
-#: g10/gpg.c:2893
+#: g10/gpg.c:2924
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "BİLGİ: basit S2K kipi (0) kesinlikle tavsiye edilmez\n"
 
-#: g10/gpg.c:2897
+#: g10/gpg.c:2928
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "S2K kipi geçersiz; 0, 1 veya 3 olmalı\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2935
 msgid "invalid default preferences\n"
 msgstr "öntanımlı tercihler geçersiz\n"
 
-#: g10/gpg.c:2913
+#: g10/gpg.c:2944
 msgid "invalid personal cipher preferences\n"
 msgstr "kişisel şifre tercihleri geçersiz\n"
 
-#: g10/gpg.c:2917
+#: g10/gpg.c:2948
 msgid "invalid personal digest preferences\n"
 msgstr "kişisel özümleme tercihleri geçersiz\n"
 
-#: g10/gpg.c:2921
+#: g10/gpg.c:2952
 msgid "invalid personal compress preferences\n"
 msgstr "kişisel sıkıştırma tercihleri geçersiz\n"
 
-#: g10/gpg.c:2954
+#: g10/gpg.c:2985
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s, %s ile henüz çalışmıyor\n"
 
-#: g10/gpg.c:3001
+#: g10/gpg.c:3032
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "%2$s kipindeyken '%1$s' şifreleme algoritması kullanılamaz\n"
 
-#: g10/gpg.c:3006
+#: g10/gpg.c:3037
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "%2$s kipindeyken '%1$s' özümleme algoritması kullanılamaz\n"
 
-#: g10/gpg.c:3011
+#: g10/gpg.c:3042
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "%2$s kipindeyken '%1$s' sıkıştırma algoritması kullanılamaz\n"
 
-#: g10/gpg.c:3107
+#: g10/gpg.c:3138
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "\"TrustDB\" güvence veritabanı başlangıç aşamasında başarısız: %s\n"
 
-#: g10/gpg.c:3118
+#: g10/gpg.c:3149
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "UYARI: alıcılar (-r) genel anahtar şifrelemesi kullanılmadan belirtilmiş\n"
 
-#: g10/gpg.c:3129
+#: g10/gpg.c:3160
 msgid "--store [filename]"
 msgstr "--store [dosyaismi]"
 
-#: g10/gpg.c:3136
+#: g10/gpg.c:3167
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosyaismi]"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3169
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "`%s' için simetrik şifreleme başarısız: %s\n"
 
-#: g10/gpg.c:3148
+#: g10/gpg.c:3179
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosyaismi]"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3192
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [dosyaismi]"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3194
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "--s2k-mode 0 ile  --symmetric --encrypt kullanamazsınız\n"
 
-#: g10/gpg.c:3166
+#: g10/gpg.c:3197
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "%s kipindeyken  --symmetric --encrypt kullanamazsınız\n"
 
-#: g10/gpg.c:3184
+#: g10/gpg.c:3215
 msgid "--sign [filename]"
 msgstr "--sign [dosyaismi]"
 
-#: g10/gpg.c:3197
+#: g10/gpg.c:3228
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosyaismi]"
 
-#: g10/gpg.c:3212
+#: g10/gpg.c:3243
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [dosyaismi]"
 
-#: g10/gpg.c:3214
+#: g10/gpg.c:3245
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "--s2k-mode 0 ile --symmetric --sign --encrypt kullanamazsınız\n"
 
-#: g10/gpg.c:3217
+#: g10/gpg.c:3248
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "%s kipindeyken --symmetric --sign --encrypt kullanamazsınız.\n"
 
-#: g10/gpg.c:3237
+#: g10/gpg.c:3268
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [DOSYA]"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3277
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosyaismi]"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3302
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosyaismi]"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3310
 msgid "--sign-key user-id"
 msgstr "--sign-key kullanıcı-kimliği"
 
-#: g10/gpg.c:3283
+#: g10/gpg.c:3314
 msgid "--lsign-key user-id"
 msgstr "--lsign-key kullanıcı-kimliği"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3335
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key kullanıcı-kimliği [komutlar]"
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3406
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [kullanıcı-kimliği] [anahtar-zinciri]"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3443
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "anahtar sunucusuna gönderim başarısızlığa uğradı: %s\n"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3445
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "anahtar sunucusundan alım başarısızlığa uğradı: %s\n"
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3447
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "anahtar ihracı başarısızlığa uğradı: %s\n"
 
-#: g10/gpg.c:3427
+#: g10/gpg.c:3458
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "anahtar sunucusunda arama başarısız: %s\n"
 
-#: g10/gpg.c:3437
+#: g10/gpg.c:3468
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "anahtar sunucusunda tazeleme başarısız: %s\n"
 
-#: g10/gpg.c:3488
+#: g10/gpg.c:3519
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zırhın kaldırılması başarısız: %s\n"
 
-#: g10/gpg.c:3496
+#: g10/gpg.c:3527
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "zırhlama başarısız: %s\n"
 
-#: g10/gpg.c:3583
+#: g10/gpg.c:3614
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "`%s' hash algoritması geçersiz\n"
 
-#: g10/gpg.c:3706
+#: g10/gpg.c:3737
 msgid "[filename]"
 msgstr "[dosyaismi]"
 
-#: g10/gpg.c:3710
+#: g10/gpg.c:3741
 msgid "Go ahead and type your message ...\n"
 msgstr "İletinizi yazın ...\n"
 
-#: g10/gpg.c:4000
+#: g10/gpg.c:4031
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
@@ -1758,28 +1767,28 @@ msgstr ""
 "bir niteleme ismi sadece harfler, rakamlar ve altçizgiler içerebilir ve "
 "sonuna bir '=' gelir.\n"
 
-#: g10/gpg.c:4008
+#: g10/gpg.c:4039
 msgid "a user notation name must contain the '@' character\n"
 msgstr "bir kullanıcı niteleme ismi '@' karakteri içermeli\n"
 
-#: g10/gpg.c:4013
+#: g10/gpg.c:4044
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "bir kullanıcı niteleme ismi '@' karakteri içermeli\n"
 
-#: g10/gpg.c:4024
+#: g10/gpg.c:4055
 msgid "a notation value must not use any control characters\n"
 msgstr "bir niteleme değerinde kontrol karakterleri kullanılamaz\n"
 
-#: g10/gpg.c:4058
+#: g10/gpg.c:4089
 msgid "the given certification policy URL is invalid\n"
 msgstr "belirtilen sertifika güvence adresi geçersiz\n"
 
-#: g10/gpg.c:4060
+#: g10/gpg.c:4091
 msgid "the given signature policy URL is invalid\n"
 msgstr "belirtilen imza güvence adresi geçersiz\n"
 
-#: g10/gpg.c:4093
+#: g10/gpg.c:4124
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "belirtilen anahtar sunucusu adresi geçersiz\n"
 
@@ -1787,33 +1796,34 @@ msgstr "belirtilen anahtar sunucusu adresi geçersiz\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "pk belleğinde çok fazla girdi - iptal edildi\n"
 
-#: g10/getkey.c:188 g10/getkey.c:2845
+#: g10/getkey.c:188 g10/getkey.c:2876
 msgid "[User ID not found]"
 msgstr "[Kullanıcı kimliği yok]"
 
-#: g10/getkey.c:931 g10/getkey.c:953 g10/getkey.c:976
+#: g10/getkey.c:933 g10/getkey.c:950 g10/getkey.c:970 g10/getkey.c:986
+#: g10/getkey.c:1001
 #, c-format
 msgid "Automatically retrieved `%s' via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1769
+#: g10/getkey.c:1800
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Geçersiz %s anahtarı --allow-non-selfsigned-uid kullanılarak geçerli oldu\n"
 
-#: g10/getkey.c:2323
+#: g10/getkey.c:2354
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 "yardımcı genel anahtar %s için gizli yardımcı anahtar yok - yoksayılıyor\n"
 
-#: g10/getkey.c:2554
+#: g10/getkey.c:2585
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "yardımcı anahtar %s, asıl anahtar %s yerine kullanılıyor\n"
 
-#: g10/getkey.c:2601
+#: g10/getkey.c:2632
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "anahtar %s: genel anahtarsız gizli anahtar - atlandı\n"
@@ -3354,12 +3364,12 @@ msgid "(sensitive)"
 msgstr "(duyarlı)"
 
 #: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
-#: g10/keylist.c:194 g10/keyserver.c:471
+#: g10/keylist.c:194 g10/keyserver.c:525
 #, c-format
 msgid "created: %s"
 msgstr "oluşturuldu: %s"
 
-#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:967
+#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:960
 #, c-format
 msgid "revoked: %s"
 msgstr "yürürlükten kaldırıldı: %s"
@@ -3371,7 +3381,7 @@ msgstr "son kullanma tarihi: %s"
 
 #: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
 #: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:477 g10/mainproc.c:973
+#: g10/keylist.c:914 g10/keyserver.c:531 g10/mainproc.c:966
 #, c-format
 msgid "expires: %s"
 msgstr "son kullanma tarihi: %s"
@@ -3407,13 +3417,13 @@ msgstr ""
 "Gösterilen anahtarın, uygulamayı yeniden başlatıncaya kadar, gerekli\n"
 "doğrulukta olmayacağını lütfen gözönüne alınız.\n"
 
-#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:481
-#: g10/mainproc.c:1734 g10/trustdb.c:1184 g10/trustdb.c:1704
+#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:535
+#: g10/mainproc.c:1783 g10/trustdb.c:1184 g10/trustdb.c:1704
 msgid "revoked"
 msgstr "yürürlükten kaldırıldı"
 
-#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:485
-#: g10/mainproc.c:1736 g10/trustdb.c:537 g10/trustdb.c:1706
+#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:539
+#: g10/mainproc.c:1785 g10/trustdb.c:537 g10/trustdb.c:1706
 msgid "expired"
 msgstr "zamanaşımına uğradı"
 
@@ -4251,385 +4261,382 @@ msgstr "%s: anahtar zinciri oluşturuldu\n"
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:77
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:81
+#: g10/keyserver.c:79
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:83
+#: g10/keyserver.c:81
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:87
+#: g10/keyserver.c:85
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:89
-msgid "automatically retrieve keys from PKA records"
-msgstr ""
-
-#: g10/keyserver.c:91
-msgid "automatically retrieve keys from DNS"
-msgstr ""
-
-#: g10/keyserver.c:95
+#: g10/keyserver.c:87
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "Tercih ettiğiniz sunucunun adresini girin: "
 
-#: g10/keyserver.c:139
+#: g10/keyserver.c:89
+msgid "honor the PKA record set on a key when retrieving keys"
+msgstr ""
+
+#: g10/keyserver.c:154
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "UYARI: anahtar sunucusu seçeneği `%s' bu platformda kullanımda değil\n"
 
-#: g10/keyserver.c:483
+#: g10/keyserver.c:537
 msgid "disabled"
 msgstr "iptal edildi"
 
-#: g10/keyserver.c:684
+#: g10/keyserver.c:738
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Sayıyı/sayıları girin veya S)onraki ya da Ç)ık >"
 
-#: g10/keyserver.c:767 g10/keyserver.c:1368
+#: g10/keyserver.c:821 g10/keyserver.c:1422
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "anahtar sunucu protokolü geçersiz (bizimki %d!=eylemci %d)\n"
 
-#: g10/keyserver.c:865
+#: g10/keyserver.c:919
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "anahtar \"%s\" anahtar sunucusunda yok\n"
 
-#: g10/keyserver.c:867
+#: g10/keyserver.c:921
 msgid "key not found on keyserver\n"
 msgstr "anahtar, anahtar sunucusunda yok\n"
 
-#: g10/keyserver.c:1092
+#: g10/keyserver.c:1146
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "%1$s anahtarı %3$s sunucusunun %2$s adresinden isteniyor\n"
 
-#: g10/keyserver.c:1096
+#: g10/keyserver.c:1150
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "%s anahtarı %s adresinden isteniyor\n"
 
-#: g10/keyserver.c:1120
+#: g10/keyserver.c:1174
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "%3$s sunucusunun %2$s adresinde \"%1$s\" aranıyor\n"
 
-#: g10/keyserver.c:1123
+#: g10/keyserver.c:1177
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "%2$s adresinde \"%1$s\" aranıyor\n"
 
-#: g10/keyserver.c:1271
+#: g10/keyserver.c:1325
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "anahtar %1$s, %3$s sunucusunun %2$s adresine gönderiliyor\n"
 
-#: g10/keyserver.c:1275
+#: g10/keyserver.c:1329
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "%s anahtarı %s adresine gönderiliyor\n"
 
-#: g10/keyserver.c:1318
+#: g10/keyserver.c:1372
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "%3$s sunucusunun %2$s adresinde \"%1$s\" aranıyor\n"
 
-#: g10/keyserver.c:1321
+#: g10/keyserver.c:1375
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "%2$s adresinde \"%1$s\" aranıyor\n"
 
-#: g10/keyserver.c:1328 g10/keyserver.c:1424
+#: g10/keyserver.c:1382 g10/keyserver.c:1478
 msgid "no keyserver action!\n"
 msgstr "bir anahtar sunucusu eylemi yok!\n"
 
-#: g10/keyserver.c:1376
+#: g10/keyserver.c:1430
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "UYARI: GnuPG'nin başka bir sürümünün anahtar sunucusu eylemcisi (%s)\n"
 
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1439
 msgid "keyserver did not send VERSION\n"
 msgstr "anahtar sunucusu VERSION göndermiyor\n"
 
-#: g10/keyserver.c:1446
+#: g10/keyserver.c:1500
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "bilinen bir anahtar sunucusu yok (--keyserver seçeneğini kullanın)\n"
 
-#: g10/keyserver.c:1452
+#: g10/keyserver.c:1506
 msgid "external keyserver calls are not supported in this build\n"
 msgstr "harici anahtar sunucusu çağrıları bu kurulumda desteklenmiyor\n"
 
-#: g10/keyserver.c:1464
+#: g10/keyserver.c:1518
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "`%s' anahtar sunucusu şeması için eylemci yok\n"
 
-#: g10/keyserver.c:1469
+#: g10/keyserver.c:1523
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "`%s' eylemi `%s' anahtar sunucusu şeması ile desteklenmiyor\n"
 
-#: g10/keyserver.c:1477
+#: g10/keyserver.c:1531
 #, fuzzy, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "gpgkeys_%s  %d sürümü eylemciyi desteklemiyor\n"
 
-#: g10/keyserver.c:1484
+#: g10/keyserver.c:1538
 msgid "keyserver timed out\n"
 msgstr "anahtar sunucusu zamanaşımına uğradı\n"
 
-#: g10/keyserver.c:1489
+#: g10/keyserver.c:1543
 msgid "keyserver internal error\n"
 msgstr "anahtar sunucusu iç hatası\n"
 
-#: g10/keyserver.c:1498
+#: g10/keyserver.c:1552
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "anahtar sunucusuyla iletişim hatası: %s\n"
 
-#: g10/keyserver.c:1523 g10/keyserver.c:1557
+#: g10/keyserver.c:1577 g10/keyserver.c:1611
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" bir anahtar kimliği değil: atlanıyor\n"
 
-#: g10/keyserver.c:1814
+#: g10/keyserver.c:1868
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "UYARI: %s anahtarı %s üzerinden tazelenemiyor: %s\n"
 
-#: g10/keyserver.c:1836
+#: g10/keyserver.c:1890
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "1 anahtar %s adresinden tazeleniyor\n"
 
-#: g10/keyserver.c:1838
+#: g10/keyserver.c:1892
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "%d anahtar %s adresinden tazeleniyor\n"
 
-#: g10/keyserver.c:1903
+#: g10/keyserver.c:1957
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "UYARI: %s anahtarı %s üzerinden tazelenemiyor: %s\n"
 
-#: g10/keyserver.c:1909
+#: g10/keyserver.c:1963
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "UYARI: %s anahtarı %s üzerinden tazelenemiyor: %s\n"
 
-#: g10/mainproc.c:253
+#: g10/mainproc.c:240
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "bir şifreli oturum anahtarı (%d) için tuhaf uzunluk\n"
 
-#: g10/mainproc.c:304
+#: g10/mainproc.c:291
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s şifreli oturum anahtarı\n"
 
-#: g10/mainproc.c:314
+#: g10/mainproc.c:301
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "bilinmeyen özümleme algoritması ile üretilmiş anahtar parolası %d\n"
 
-#: g10/mainproc.c:395
+#: g10/mainproc.c:382
 #, c-format
 msgid "public key is %s\n"
 msgstr "genel anahtar: %s\n"
 
-#: g10/mainproc.c:450
+#: g10/mainproc.c:439
 msgid "public key encrypted data: good DEK\n"
 msgstr "genel anahtarla şifreli veri: doğru DEK\n"
 
-#: g10/mainproc.c:483
+#: g10/mainproc.c:472
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr ""
 "%u bitlik %s anahtarı ve %s kullanıcı kimliği ile şifrelendi, %s tarihinde "
 "oluşturuldu\n"
 
-#: g10/mainproc.c:487 g10/pkclist.c:219
+#: g10/mainproc.c:476 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:491
+#: g10/mainproc.c:480
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "%s anahtarı ve %s kullanıcı kimliği ile şifrelenmiş\n"
 
-#: g10/mainproc.c:505
+#: g10/mainproc.c:494
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "genel anahtar şifre çözümü başarısız: %s\n"
 
-#: g10/mainproc.c:519
+#: g10/mainproc.c:508
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "%lu anahtar parolası ile şifrelenmiş\n"
 
-#: g10/mainproc.c:521
+#: g10/mainproc.c:510
 msgid "encrypted with 1 passphrase\n"
 msgstr "1 anahtar parolası ile şifrelenmiş\n"
 
-#: g10/mainproc.c:549 g10/mainproc.c:571
+#: g10/mainproc.c:541 g10/mainproc.c:563
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "%s şifreli veri varsayılıyor\n"
 
-#: g10/mainproc.c:557
+#: g10/mainproc.c:549
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr ""
 "IDEA şifre kullanışsız, iyimserlikle yerine %s kullanılmaya çalışılıyor\n"
 
-#: g10/mainproc.c:589
+#: g10/mainproc.c:581
 msgid "decryption okay\n"
 msgstr "Şifre çözme tamam\n"
 
-#: g10/mainproc.c:593
+#: g10/mainproc.c:585
 msgid "WARNING: message was not integrity protected\n"
 msgstr "UYARI: ileti bütünlük korumalı değildi\n"
 
-#: g10/mainproc.c:606
+#: g10/mainproc.c:598
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "UYARI: şifreli ileti tahrip edilmiş!\n"
 
-#: g10/mainproc.c:612
+#: g10/mainproc.c:604
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "şifre çözme başarısız: %s\n"
 
-#: g10/mainproc.c:631
+#: g10/mainproc.c:623
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "BİLGİ: gönderen \"yalnız-gözleriniz-için\" ricasında bulundu\n"
 
-#: g10/mainproc.c:633
+#: g10/mainproc.c:625
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "özgün dosya adı = '%.*s'\n"
 
-#: g10/mainproc.c:822
+#: g10/mainproc.c:815
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr ""
 "tek başına yürürlükten kaldırma - uygulamak için \"gpg --import\" kullanın\n"
 
-#: g10/mainproc.c:1168
+#: g10/mainproc.c:1161
 #, fuzzy
 msgid "no signature found\n"
 msgstr "\"%s\" deki imza iyi"
 
-#: g10/mainproc.c:1418
+#: g10/mainproc.c:1419
 msgid "signature verification suppressed\n"
 msgstr "imza doğrulama engellendi\n"
 
-#: g10/mainproc.c:1460 g10/mainproc.c:1470
-msgid "can't handle these multiple signatures\n"
+#: g10/mainproc.c:1519
+#, fuzzy
+msgid "can't handle this ambiguous signature data\n"
 msgstr "bu çoklu imzalar elde edilemiyor\n"
 
-#: g10/mainproc.c:1480
+#: g10/mainproc.c:1530
 #, c-format
 msgid "Signature made %s\n"
 msgstr "İmza %s de\n"
 
-#: g10/mainproc.c:1481
+#: g10/mainproc.c:1531
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               %s kullanılarak anahtar %s ile yapılmış\n"
 
-#: g10/mainproc.c:1485
+#: g10/mainproc.c:1535
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "%s imzası, %s anahtarı ve %s kullanıcı kimliği ile yapılmış\n"
 
-#: g10/mainproc.c:1505
+#: g10/mainproc.c:1555
 msgid "Key available at: "
 msgstr "Anahtar burada:"
 
-#: g10/mainproc.c:1639 g10/mainproc.c:1687
+#: g10/mainproc.c:1688 g10/mainproc.c:1736
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "\"%s\" deki imza KÖTÜ"
 
-#: g10/mainproc.c:1641 g10/mainproc.c:1689
+#: g10/mainproc.c:1690 g10/mainproc.c:1738
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "\"%s\" deki imza zamanaşımına uğramış"
 
-#: g10/mainproc.c:1643 g10/mainproc.c:1691
+#: g10/mainproc.c:1692 g10/mainproc.c:1740
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "\"%s\" deki imza iyi"
 
-#: g10/mainproc.c:1695
+#: g10/mainproc.c:1744
 msgid "[uncertain]"
 msgstr "[şüpheli]"
 
-#: g10/mainproc.c:1727
+#: g10/mainproc.c:1776
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                nam-ı diğer \"%s\""
 
-#: g10/mainproc.c:1824
+#: g10/mainproc.c:1873
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Bu imzanın geçerliliği %s de bitti.\n"
 
-#: g10/mainproc.c:1829
+#: g10/mainproc.c:1878
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Bu imzanın geçerliliği %s de bitecek.\n"
 
-#: g10/mainproc.c:1832
+#: g10/mainproc.c:1881
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s imzası, %s özümleme algoritması\n"
 
-#: g10/mainproc.c:1833
+#: g10/mainproc.c:1882
 msgid "binary"
 msgstr "ikili"
 
-#: g10/mainproc.c:1834
+#: g10/mainproc.c:1883
 msgid "textmode"
 msgstr "metinkipi"
 
-#: g10/mainproc.c:1834 g10/trustdb.c:536
+#: g10/mainproc.c:1883 g10/trustdb.c:536
 msgid "unknown"
 msgstr "bilinmeyen"
 
-#: g10/mainproc.c:1854
+#: g10/mainproc.c:1903
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "İmza kontrol edilemedi: %s\n"
 
-#: g10/mainproc.c:1922 g10/mainproc.c:1938 g10/mainproc.c:2024
+#: g10/mainproc.c:1972 g10/mainproc.c:1988 g10/mainproc.c:2074
 msgid "not a detached signature\n"
 msgstr "bir bağımsız imza değil\n"
 
-#: g10/mainproc.c:1965
+#: g10/mainproc.c:2015
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "UYARI: çoklu imzalar saptandı. Sadece ilki denetlenecek.\n"
 
-#: g10/mainproc.c:1973
+#: g10/mainproc.c:2023
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "0x%02x sınıfı tek başına imza\n"
 
-#: g10/mainproc.c:2030
+#: g10/mainproc.c:2080
 msgid "old style (PGP 2.x) signature\n"
 msgstr "eski stil (PGP 2.x) imza\n"
 
-#: g10/mainproc.c:2040
+#: g10/mainproc.c:2090
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "proc_tree() içinde geçersiz kök paket saptandı\n"
 
@@ -5185,23 +5192,23 @@ msgstr "veri kaydedilmedi; kaydetmek için \"--output\" seçeneğini kullanın\n
 msgid "error creating `%s': %s\n"
 msgstr "`%s' oluşturulurken hata: %s\n"
 
-#: g10/plaintext.c:447
+#: g10/plaintext.c:453
 msgid "Detached signature.\n"
 msgstr "Bağımsız imza.\n"
 
-#: g10/plaintext.c:453
+#: g10/plaintext.c:459
 msgid "Please enter name of data file: "
 msgstr "Lütfen veri dosyasının ismini girin: "
 
-#: g10/plaintext.c:485
+#: g10/plaintext.c:491
 msgid "reading stdin ...\n"
 msgstr "standart girdiden okuyor ...\n"
 
-#: g10/plaintext.c:519
+#: g10/plaintext.c:525
 msgid "no signed data\n"
 msgstr "imzalı veri yok\n"
 
-#: g10/plaintext.c:533
+#: g10/plaintext.c:539
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "imzalı veri '%s'  açılamadı\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 4bc14e930..656b87274 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.1\n"
 "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2006-02-14 15:28+0100\n"
+"POT-Creation-Date: 2006-03-07 11:29+0100\n"
 "PO-Revision-Date: 2005-03-17 22:24+0800\n"
 "Last-Translator: Meng Jie <zuxyhere@eastday.com>\n"
 "Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
@@ -45,9 +45,9 @@ msgstr "正在将私钥写至`%s'\n"
 
 #: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:992 g10/gpg.c:3360 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:997 g10/gpg.c:3391 g10/import.c:193 g10/keygen.c:2274
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:476 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
+#: g10/plaintext.c:482 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
 #: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
@@ -81,7 +81,7 @@ msgstr "无法读取‘%s’：%s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "注意：随机数种子文件未被更新\n"
 
-#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:991 g10/keygen.c:2753
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2753
 #: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
 #: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
 #, c-format
@@ -662,11 +662,11 @@ msgstr "不允许使用管理员命令\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "无效的指令(尝试“help”)\n"
 
-#: g10/cardglue.c:435
+#: g10/cardglue.c:434
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr "请插入卡并回车，或输入‘c’来取消："
 
-#: g10/cardglue.c:572
+#: g10/cardglue.c:573
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
@@ -675,35 +675,35 @@ msgstr ""
 "请取出当前的卡，并插入有下列序列号的卡：\n"
 "  %.*s\n"
 
-#: g10/cardglue.c:580
+#: g10/cardglue.c:582
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr "就绪后请回车，或输入‘c’取消"
 
-#: g10/cardglue.c:915
+#: g10/cardglue.c:917
 msgid "Enter New Admin PIN: "
 msgstr "输入新的管理员 PIN："
 
-#: g10/cardglue.c:916
+#: g10/cardglue.c:918
 msgid "Enter New PIN: "
 msgstr "输入新的 PIN："
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:919
 msgid "Enter Admin PIN: "
 msgstr "输入管理员 PIN："
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:920
 msgid "Enter PIN: "
 msgstr "输入 PIN："
 
-#: g10/cardglue.c:935
+#: g10/cardglue.c:937
 msgid "Repeat this PIN: "
 msgstr "再次输入此 PIN："
 
-#: g10/cardglue.c:950
+#: g10/cardglue.c:952
 msgid "PIN not correctly repeated; try again"
 msgstr "PIN 再次输入时与首次输入不符；请再试一次"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3720 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3751 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -713,13 +713,13 @@ msgstr "无法打开‘%s’\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output 在这个命令中不起作用\n"
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1644
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1698
 #: g10/revoke.c:228
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "密钥‘%s’找不到：%s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1658
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1712
 #: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -825,12 +825,12 @@ msgstr "您不该将 %s 用于 %s 模式中\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s 已经加密给：“%s”\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:306
+#: g10/encr-data.c:67 g10/mainproc.c:293
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s 加密过的数据\n"
 
-#: g10/encr-data.c:69 g10/mainproc.c:310
+#: g10/encr-data.c:69 g10/mainproc.c:297
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "以未知的算法 %d 加密\n"
@@ -966,7 +966,7 @@ msgstr "警告：私钥 %s 不存在简单 SK 检验和\n"
 msgid "WARNING: nothing exported\n"
 msgstr "警告：没有导出任何东西\n"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:373
 msgid ""
 "@Commands:\n"
 " "
@@ -974,127 +974,127 @@ msgstr ""
 "@指令：\n"
 " "
 
-#: g10/gpg.c:374
+#: g10/gpg.c:375
 msgid "|[file]|make a signature"
 msgstr "|[文件名]|生成一份签字"
 
-#: g10/gpg.c:375
+#: g10/gpg.c:376
 msgid "|[file]|make a clear text signature"
 msgstr "|[文件名]|生成一份明文签字"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:377
 msgid "make a detached signature"
 msgstr "生成一份分离的签字"
 
-#: g10/gpg.c:377
+#: g10/gpg.c:378
 msgid "encrypt data"
 msgstr "加密数据"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:380
 msgid "encryption only with symmetric cipher"
 msgstr "仅使用对称加密"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:382
 msgid "decrypt data (default)"
 msgstr "解密数据(默认)"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:384
 msgid "verify a signature"
 msgstr "验证签字"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:386
 msgid "list keys"
 msgstr "列出密钥"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "list keys and signatures"
 msgstr "列出密钥和签字"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:389
 msgid "list and check key signatures"
 msgstr "列出并检查密钥签字"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:390
 msgid "list keys and fingerprints"
 msgstr "列出密钥和指纹"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:391
 msgid "list secret keys"
 msgstr "列出私钥"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:392
 msgid "generate a new key pair"
 msgstr "生成一副新的密钥对"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:393
 msgid "remove keys from the public keyring"
 msgstr "从公钥钥匙环里删除密钥"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:395
 msgid "remove keys from the secret keyring"
 msgstr "从私钥钥匙环里删除密钥"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:396
 msgid "sign a key"
 msgstr "为某把密钥添加签字"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:397
 msgid "sign a key locally"
 msgstr "为某把密钥添加本地签字"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:398
 msgid "sign or edit a key"
 msgstr "编辑某把密钥或为其添加签字"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:399
 msgid "generate a revocation certificate"
 msgstr "生成一份吊销证书"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:401
 msgid "export keys"
 msgstr "导出密钥"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:402
 msgid "export keys to a key server"
 msgstr "把密钥导出到某个公钥服务器上"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:403
 msgid "import keys from a key server"
 msgstr "从公钥服务器上导入密钥"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:405
 msgid "search for keys on a key server"
 msgstr "在公钥服务器上搜寻密钥"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:407
 msgid "update all keys from a keyserver"
 msgstr "从公钥服务器更新所有的本地密钥"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:411
 msgid "import/merge keys"
 msgstr "导入/合并密钥"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:414
 msgid "print the card status"
 msgstr "打印卡状态"
 
-#: g10/gpg.c:414
+#: g10/gpg.c:415
 msgid "change data on a card"
 msgstr "更改卡上的数据"
 
-#: g10/gpg.c:415
+#: g10/gpg.c:416
 msgid "change a card's PIN"
 msgstr "更改卡的 PIN"
 
-#: g10/gpg.c:423
+#: g10/gpg.c:424
 msgid "update the trust database"
 msgstr "更新信任度数据库"
 
-#: g10/gpg.c:430
+#: g10/gpg.c:431
 msgid "|algo [files]|print message digests"
 msgstr "|算法 [文件]|使用指定的散列算法打印报文散列值"
 
-#: g10/gpg.c:434 g10/gpgv.c:71
+#: g10/gpg.c:435 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1104,51 +1104,51 @@ msgstr ""
 "选项：\n"
 " "
 
-#: g10/gpg.c:436
+#: g10/gpg.c:437
 msgid "create ascii armored output"
 msgstr "输出经 ASCII 封装"
 
-#: g10/gpg.c:438
+#: g10/gpg.c:439
 msgid "|NAME|encrypt for NAME"
 msgstr "|某甲|为收件者“某甲”加密"
 
-#: g10/gpg.c:449
+#: g10/gpg.c:450
 msgid "use this user-id to sign or decrypt"
 msgstr "使用这个用户标识来签字或解密"
 
-#: g10/gpg.c:450
+#: g10/gpg.c:451
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|设定压缩等级为 N (0 表示不压缩)"
 
-#: g10/gpg.c:455
+#: g10/gpg.c:456
 msgid "use canonical text mode"
 msgstr "使用标准的文本模式"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:470
 msgid "use as output file"
 msgstr "指定输出文件"
 
-#: g10/gpg.c:471 g10/gpgv.c:73
+#: g10/gpg.c:472 g10/gpgv.c:73
 msgid "verbose"
 msgstr "详细模式"
 
-#: g10/gpg.c:482
+#: g10/gpg.c:483
 msgid "do not make any changes"
 msgstr "不做任何改变"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:484
 msgid "prompt before overwriting"
 msgstr "覆盖前先询问"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:525
 msgid "use strict OpenPGP behavior"
 msgstr "行为严格遵循 OpenPGP 定义"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "generate PGP 2.x compatible messages"
 msgstr "生成与 PGP 2.x 兼容的报文"
 
-#: g10/gpg.c:553
+#: g10/gpg.c:554
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1156,7 +1156,7 @@ msgstr ""
 "@\n"
 "(请参考在线说明以获得所有命令和选项的完整清单)\n"
 
-#: g10/gpg.c:556
+#: g10/gpg.c:557
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1176,17 +1176,17 @@ msgstr ""
 " --list-keys [某甲]           显示密钥\n"
 " --fingerprint [某甲]         显示指纹\n"
 
-#: g10/gpg.c:746 g10/gpgv.c:98
+#: g10/gpg.c:751 g10/gpgv.c:98
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr ""
 "请向 <gnupg-bugs@gnu.org> 报告程序缺陷。\n"
 "请向 <zuxyhere@eastday.com> 反映简体中文翻译的问题。\n"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:768
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
 
-#: g10/gpg.c:766
+#: g10/gpg.c:771
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1196,7 +1196,7 @@ msgstr ""
 "签字、检查、加密或解密\n"
 "默认的操作依输入数据而定\n"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:782
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1204,568 +1204,577 @@ msgstr ""
 "\n"
 "支持的算法：\n"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:785
 msgid "Pubkey: "
 msgstr "公钥："
 
-#: g10/gpg.c:786 g10/keyedit.c:2266
+#: g10/gpg.c:791 g10/keyedit.c:2266
 msgid "Cipher: "
 msgstr "对称加密："
 
-#: g10/gpg.c:792
+#: g10/gpg.c:797
 msgid "Hash: "
 msgstr "散列："
 
-#: g10/gpg.c:798 g10/keyedit.c:2312
+#: g10/gpg.c:803 g10/keyedit.c:2312
 msgid "Compression: "
 msgstr "压缩："
 
-#: g10/gpg.c:881
+#: g10/gpg.c:886
 msgid "usage: gpg [options] "
 msgstr "用法：gpg [选项] "
 
-#: g10/gpg.c:1029
+#: g10/gpg.c:1034
 msgid "conflicting commands\n"
 msgstr "冲突的指令\n"
 
-#: g10/gpg.c:1047
+#: g10/gpg.c:1052
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "在‘%s’组定义里找不到等号(=)\n"
 
-#: g10/gpg.c:1244
+#: g10/gpg.c:1249
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "警告：用户目录‘%s’所有权不安全\n"
 
-#: g10/gpg.c:1247
+#: g10/gpg.c:1252
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "警告：配置文件‘%s’所有权不安全\n"
 
-#: g10/gpg.c:1250
+#: g10/gpg.c:1255
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "警告：扩展模块‘%s’所有权不安全\n"
 
-#: g10/gpg.c:1256
+#: g10/gpg.c:1261
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "警告：用户目录‘%s’权限不安全\n"
 
-#: g10/gpg.c:1259
+#: g10/gpg.c:1264
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "警告：配置文件‘%s’权限不安全\n"
 
-#: g10/gpg.c:1262
+#: g10/gpg.c:1267
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "警告：扩展模块‘%s’权限不安全\n"
 
-#: g10/gpg.c:1268
+#: g10/gpg.c:1273
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "警告：用户目录‘%s’的关闭目录所有权不安全\n"
 
-#: g10/gpg.c:1271
+#: g10/gpg.c:1276
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "警告：配置文件‘%s’的关闭目录所有权不安全\n"
 
-#: g10/gpg.c:1274
+#: g10/gpg.c:1279
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "警告：扩展模块‘%s’的关闭目录所有权不安全\n"
 
-#: g10/gpg.c:1280
+#: g10/gpg.c:1285
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "警告：用户目录‘%s’的关闭目录权限不安全\n"
 
-#: g10/gpg.c:1283
+#: g10/gpg.c:1288
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "警告：配置文件‘%s’的关闭目录权限不安全\n"
 
-#: g10/gpg.c:1286
+#: g10/gpg.c:1291
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "警告：扩展模块‘%s’的关闭目录权限不安全\n"
 
-#: g10/gpg.c:1427
+#: g10/gpg.c:1432
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "未知的配置项‘%s’\n"
 
-#: g10/gpg.c:1521
+#: g10/gpg.c:1526
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1523
+#: g10/gpg.c:1528
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1525
+#: g10/gpg.c:1530
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "在私钥环里没有相应的签字\n"
 
-#: g10/gpg.c:1527
+#: g10/gpg.c:1532
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1536
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1538
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "给定的首选公钥服务器 URL 无效\n"
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1540
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1542
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1544
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1546
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "在私钥和公钥清单间切换"
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1548
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "在私钥环里没有相应的签字\n"
 
-#: g10/gpg.c:1874
+#: g10/gpg.c:1879
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "注意：旧式的默认配置文件‘%s’已被忽略\n"
 
-#: g10/gpg.c:1916
+#: g10/gpg.c:1921
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "注意：没有默认配置文件‘%s’\n"
 
-#: g10/gpg.c:1920
+#: g10/gpg.c:1925
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "配置文件‘%s’：%s\n"
 
-#: g10/gpg.c:1927
+#: g10/gpg.c:1932
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "从‘%s’读取选项\n"
 
-#: g10/gpg.c:2142 g10/gpg.c:2716 g10/gpg.c:2735
+#: g10/gpg.c:2147 g10/gpg.c:2747 g10/gpg.c:2766
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "注意：一般情况下不会用到 %s！\n"
 
-#: g10/gpg.c:2158
+#: g10/gpg.c:2163
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "对称加算密法扩展模块‘%s’因为权限不安全而未被载入\n"
 
-#: g10/gpg.c:2312 g10/gpg.c:2324
+#: g10/gpg.c:2317 g10/gpg.c:2329
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "‘%s’不是一个有效的字符集\n"
 
-#: g10/gpg.c:2400
+#: g10/gpg.c:2405
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "‘%s’不是一个有效的字符集\n"
 
-#: g10/gpg.c:2422 g10/keyedit.c:3997
+#: g10/gpg.c:2429 g10/keyedit.c:3997
 msgid "could not parse keyserver URL\n"
 msgstr "无法解析公钥服务器 URL\n"
 
-#: g10/gpg.c:2428
+#: g10/gpg.c:2441
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s：%d：无效的公钥服务器选项\n"
 
-#: g10/gpg.c:2431
+#: g10/gpg.c:2444
 msgid "invalid keyserver options\n"
 msgstr "无效的公钥服务器选项\n"
 
-#: g10/gpg.c:2438
+#: g10/gpg.c:2451
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s：%d：无效的导入选项\n"
 
-#: g10/gpg.c:2441
+#: g10/gpg.c:2454
 msgid "invalid import options\n"
 msgstr "无效的导入选项\n"
 
-#: g10/gpg.c:2448
+#: g10/gpg.c:2461
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s：%d：无效的导出选项\n"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2464
 msgid "invalid export options\n"
 msgstr "无效的导出选项\n"
 
-#: g10/gpg.c:2458
+#: g10/gpg.c:2471
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s：%d：无效的列表选项\n"
 
-#: g10/gpg.c:2461
+#: g10/gpg.c:2474
 msgid "invalid list options\n"
 msgstr "无效的列表选项\n"
 
-#: g10/gpg.c:2469
+#: g10/gpg.c:2482
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2471
+#: g10/gpg.c:2484
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2473
+#: g10/gpg.c:2486
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "‘%s’不是一个有效的字符集\n"
 
-#: g10/gpg.c:2475
+#: g10/gpg.c:2488
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2479
+#: g10/gpg.c:2492
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2481
+#: g10/gpg.c:2494
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "给定的首选公钥服务器 URL 无效\n"
 
-#: g10/gpg.c:2483
+#: g10/gpg.c:2496
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "‘%s’不是一个有效的字符集\n"
 
-#: g10/gpg.c:2485
+#: g10/gpg.c:2498
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2505
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s：%d：无效的校验选项\n"
 
-#: g10/gpg.c:2495
+#: g10/gpg.c:2508
 msgid "invalid verify options\n"
 msgstr "无效的校验选项\n"
 
-#: g10/gpg.c:2502
+#: g10/gpg.c:2515
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "无法把运行路径设成 %s\n"
 
-#: g10/gpg.c:2705
+#: g10/gpg.c:2665
+#, fuzzy, c-format
+msgid "%s:%d: invalid auto-key-locate list\n"
+msgstr "%s：%d：无效的校验选项\n"
+
+#: g10/gpg.c:2668
+msgid "invalid auto-key-locate list\n"
+msgstr ""
+
+#: g10/gpg.c:2736
 msgid "WARNING: program may create a core file!\n"
 msgstr "警告：程序可能会创建核心内存转储！\n"
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2740
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "警告：%s 会使得 %s 失效\n"
 
-#: g10/gpg.c:2718
+#: g10/gpg.c:2749
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s 不可与 %s 并用\n"
 
-#: g10/gpg.c:2721
+#: g10/gpg.c:2752
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s 与 %s 并用无意义！\n"
 
-#: g10/gpg.c:2728
+#: g10/gpg.c:2759
 #, fuzzy, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "gpg-agent 在此次舍话中无法使用\n"
 
-#: g10/gpg.c:2743
+#: g10/gpg.c:2774
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "不会在内存不安全的情况下运行，原因是 %s\n"
 
-#: g10/gpg.c:2757
+#: g10/gpg.c:2788
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "您只有在 --pgp2 模式下才能做分离式或明文签字\n"
 
-#: g10/gpg.c:2763
+#: g10/gpg.c:2794
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "您在 --pgp2 模式下时，不能同时签字和加密\n"
 
-#: g10/gpg.c:2769
+#: g10/gpg.c:2800
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "启用 --pgp2 时您应该只使用文件，而非管道\n"
 
-#: g10/gpg.c:2782
+#: g10/gpg.c:2813
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "在 --pgp2 模式下加密报文需要 IDEA 算法\n"
 
-#: g10/gpg.c:2849 g10/gpg.c:2873
+#: g10/gpg.c:2880 g10/gpg.c:2904
 msgid "selected cipher algorithm is invalid\n"
 msgstr "所选的对称加密算法无效\n"
 
-#: g10/gpg.c:2855 g10/gpg.c:2879
+#: g10/gpg.c:2886 g10/gpg.c:2910
 msgid "selected digest algorithm is invalid\n"
 msgstr "所选的散列算法无效\n"
 
-#: g10/gpg.c:2861
+#: g10/gpg.c:2892
 msgid "selected compression algorithm is invalid\n"
 msgstr "所选的压缩算法无效\n"
 
-#: g10/gpg.c:2867
+#: g10/gpg.c:2898
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "所选的证书散列算法无效\n"
 
-#: g10/gpg.c:2882
+#: g10/gpg.c:2913
 msgid "completes-needed must be greater than 0\n"
 msgstr "需要的完全可信签字数一定要大于 0\n"
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2915
 msgid "marginals-needed must be greater than 1\n"
 msgstr "需要的勉强可信签字数一定要大于 1\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2917
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "最大验证深度一定要介于 1 和 255 之间\n"
 
-#: g10/gpg.c:2888
+#: g10/gpg.c:2919
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "无效的默认验证级别；一定要是 0，1，2 或 3\n"
 
-#: g10/gpg.c:2890
+#: g10/gpg.c:2921
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "无效的最小验证级别；一定要是 1，2 或 3\n"
 
-#: g10/gpg.c:2893
+#: g10/gpg.c:2924
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "注意：强烈不建议使用简单的 S2K 模式(0)\n"
 
-#: g10/gpg.c:2897
+#: g10/gpg.c:2928
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "无效的 S2K 模式；必须是 0，1 或 3\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2935
 msgid "invalid default preferences\n"
 msgstr "无效的默认首选项\n"
 
-#: g10/gpg.c:2913
+#: g10/gpg.c:2944
 msgid "invalid personal cipher preferences\n"
 msgstr "无效的个人对称加密算法首选项\n"
 
-#: g10/gpg.c:2917
+#: g10/gpg.c:2948
 msgid "invalid personal digest preferences\n"
 msgstr "无效的个人散列算法首选项\n"
 
-#: g10/gpg.c:2921
+#: g10/gpg.c:2952
 msgid "invalid personal compress preferences\n"
 msgstr "无效的个人压缩算法首选项\n"
 
-#: g10/gpg.c:2954
+#: g10/gpg.c:2985
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s 尚不能和 %s 并用\n"
 
-#: g10/gpg.c:3001
+#: g10/gpg.c:3032
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "您不能在 %s 模式下使用‘%s’对称加密算法\n"
 
-#: g10/gpg.c:3006
+#: g10/gpg.c:3037
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "您不能在 %s 模式下使用‘%s’散列算法\n"
 
-#: g10/gpg.c:3011
+#: g10/gpg.c:3042
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "您不能在 %s 模式下使用‘%s’压缩算法\n"
 
-#: g10/gpg.c:3107
+#: g10/gpg.c:3138
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "初始化信任度数据库失败：%s\n"
 
-#: g10/gpg.c:3118
+#: g10/gpg.c:3149
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "警告：给定了收件人(-r)但并未使用公钥加密\n"
 
-#: g10/gpg.c:3129
+#: g10/gpg.c:3160
 msgid "--store [filename]"
 msgstr "--store [文件名]"
 
-#: g10/gpg.c:3136
+#: g10/gpg.c:3167
 msgid "--symmetric [filename]"
 msgstr "--symmetric [文件名]"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3169
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "对称加密‘%s’失败：%s\n"
 
-#: g10/gpg.c:3148
+#: g10/gpg.c:3179
 msgid "--encrypt [filename]"
 msgstr "--encrypt [文件名]"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3192
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [文件名]"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3194
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "使用 --symmetric --encrypt 时不能使用 --s2k-mode 0\n"
 
-#: g10/gpg.c:3166
+#: g10/gpg.c:3197
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "您不能在 %s 模式下使用 --symmetric -encrypt\n"
 
-#: g10/gpg.c:3184
+#: g10/gpg.c:3215
 msgid "--sign [filename]"
 msgstr "--sign [文件名]"
 
-#: g10/gpg.c:3197
+#: g10/gpg.c:3228
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [文件名]"
 
-#: g10/gpg.c:3212
+#: g10/gpg.c:3243
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [文件名]"
 
-#: g10/gpg.c:3214
+#: g10/gpg.c:3245
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "使用 --symmetric --sign --encrypt 时不能使用 --s2k-mode 0\n"
 
-#: g10/gpg.c:3217
+#: g10/gpg.c:3248
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "您不能在 %s 模式下使用 --symmetric --sign -encrypt\n"
 
-#: g10/gpg.c:3237
+#: g10/gpg.c:3268
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [文件名]"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3277
 msgid "--clearsign [filename]"
 msgstr "--clearsign [文件名]"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3302
 msgid "--decrypt [filename]"
 msgstr "--decrypt [文件名]"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3310
 msgid "--sign-key user-id"
 msgstr "--sign-key 用户标识"
 
-#: g10/gpg.c:3283
+#: g10/gpg.c:3314
 msgid "--lsign-key user-id"
 msgstr "--lsign-key 用户标识"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3335
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key 用户标识 [指令]"
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3406
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [用户标识] [钥匙环]"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3443
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "上传至公钥服务器失败：%s\n"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3445
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "从公钥服务器接收失败：%s\n"
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3447
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "导出密钥失败：%s\n"
 
-#: g10/gpg.c:3427
+#: g10/gpg.c:3458
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "搜寻公钥服务器失败：%s\n"
 
-#: g10/gpg.c:3437
+#: g10/gpg.c:3468
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "从公钥服务器更新失败：%s\n"
 
-#: g10/gpg.c:3488
+#: g10/gpg.c:3519
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "解开 ASCII 封装失败：%s\n"
 
-#: g10/gpg.c:3496
+#: g10/gpg.c:3527
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "进行 ASCII 封装失败：%s\n"
 
-#: g10/gpg.c:3583
+#: g10/gpg.c:3614
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "无效的‘%s’散列算法\n"
 
-#: g10/gpg.c:3706
+#: g10/gpg.c:3737
 msgid "[filename]"
 msgstr "[文件名]"
 
-#: g10/gpg.c:3710
+#: g10/gpg.c:3741
 msgid "Go ahead and type your message ...\n"
 msgstr "请开始键入您的报文……\n"
 
-#: g10/gpg.c:4000
+#: g10/gpg.c:4031
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
 msgstr "标记名称必须只含有可打印的字符或空格，并以一个“=”来结尾\n"
 
-#: g10/gpg.c:4008
+#: g10/gpg.c:4039
 msgid "a user notation name must contain the '@' character\n"
 msgstr "用户标记名称一定要含有“@”字符\n"
 
-#: g10/gpg.c:4013
+#: g10/gpg.c:4044
 #, fuzzy
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "用户标记名称一定要含有“@”字符\n"
 
-#: g10/gpg.c:4024
+#: g10/gpg.c:4055
 msgid "a notation value must not use any control characters\n"
 msgstr "标记值一定不能使用任何的控制字符\n"
 
-#: g10/gpg.c:4058
+#: g10/gpg.c:4089
 msgid "the given certification policy URL is invalid\n"
 msgstr "给定的的验证策略 URL 无效\n"
 
-#: g10/gpg.c:4060
+#: g10/gpg.c:4091
 msgid "the given signature policy URL is invalid\n"
 msgstr "给定的签字策略 URL 无效\n"
 
-#: g10/gpg.c:4093
+#: g10/gpg.c:4124
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "给定的首选公钥服务器 URL 无效\n"
 
@@ -1773,31 +1782,32 @@ msgstr "给定的首选公钥服务器 URL 无效\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "pk 缓存里项目太多――已禁用\n"
 
-#: g10/getkey.c:188 g10/getkey.c:2845
+#: g10/getkey.c:188 g10/getkey.c:2876
 msgid "[User ID not found]"
 msgstr "[找不到用户标识]"
 
-#: g10/getkey.c:931 g10/getkey.c:953 g10/getkey.c:976
+#: g10/getkey.c:933 g10/getkey.c:950 g10/getkey.c:970 g10/getkey.c:986
+#: g10/getkey.c:1001
 #, c-format
 msgid "Automatically retrieved `%s' via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1769
+#: g10/getkey.c:1800
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "--allow-non-selfsigned-uid 使无效密钥 %s 生效\n"
 
-#: g10/getkey.c:2323
+#: g10/getkey.c:2354
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "公钥 %s 没有相对应的私钥――忽略\n"
 
-#: g10/getkey.c:2554
+#: g10/getkey.c:2585
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "使用子钥 %s 而非主钥 %s\n"
 
-#: g10/getkey.c:2601
+#: g10/getkey.c:2632
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "密钥 %s：无相应公钥的私钥――已跳过\n"
@@ -3274,12 +3284,12 @@ msgid "(sensitive)"
 msgstr " (敏感的)"
 
 #: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
-#: g10/keylist.c:194 g10/keyserver.c:471
+#: g10/keylist.c:194 g10/keyserver.c:525
 #, c-format
 msgid "created: %s"
 msgstr "创建于：%s"
 
-#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:967
+#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:960
 #, c-format
 msgid "revoked: %s"
 msgstr "已吊销：%s"
@@ -3291,7 +3301,7 @@ msgstr "已过期：%s"
 
 #: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
 #: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:477 g10/mainproc.c:973
+#: g10/keylist.c:914 g10/keyserver.c:531 g10/mainproc.c:966
 #, c-format
 msgid "expires: %s"
 msgstr "有效至：%s"
@@ -3325,13 +3335,13 @@ msgid ""
 "unless you restart the program.\n"
 msgstr "请注意，在您重启程序之前，显示的密钥有效性未必正确，\n"
 
-#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:481
-#: g10/mainproc.c:1734 g10/trustdb.c:1184 g10/trustdb.c:1704
+#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:535
+#: g10/mainproc.c:1783 g10/trustdb.c:1184 g10/trustdb.c:1704
 msgid "revoked"
 msgstr "已吊销"
 
-#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:485
-#: g10/mainproc.c:1736 g10/trustdb.c:537 g10/trustdb.c:1706
+#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:539
+#: g10/mainproc.c:1785 g10/trustdb.c:537 g10/trustdb.c:1706
 msgid "expired"
 msgstr "已过期"
 
@@ -4149,381 +4159,378 @@ msgstr "%s：钥匙环已建立\n"
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:77
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:81
+#: g10/keyserver.c:79
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:83
+#: g10/keyserver.c:81
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:87
+#: g10/keyserver.c:85
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:89
-msgid "automatically retrieve keys from PKA records"
-msgstr ""
-
-#: g10/keyserver.c:91
-msgid "automatically retrieve keys from DNS"
-msgstr ""
-
-#: g10/keyserver.c:95
+#: g10/keyserver.c:87
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "输入您首选的公钥服务器的 URL："
 
-#: g10/keyserver.c:139
+#: g10/keyserver.c:89
+msgid "honor the PKA record set on a key when retrieving keys"
+msgstr ""
+
+#: g10/keyserver.c:154
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "警告：公钥服务器选项‘%s’在此平台上没有被使用\n"
 
-#: g10/keyserver.c:483
+#: g10/keyserver.c:537
 msgid "disabled"
 msgstr "已禁用"
 
-#: g10/keyserver.c:684
+#: g10/keyserver.c:738
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "输入数字以选择，输入 N 翻页，输入 Q 退出 >"
 
-#: g10/keyserver.c:767 g10/keyserver.c:1368
+#: g10/keyserver.c:821 g10/keyserver.c:1422
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "无效的公钥服务器协议(us %d!=handler %d)\n"
 
-#: g10/keyserver.c:865
+#: g10/keyserver.c:919
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "在公钥服务器上找不到密钥“%s”\n"
 
-#: g10/keyserver.c:867
+#: g10/keyserver.c:921
 msgid "key not found on keyserver\n"
 msgstr "在公钥服务器上找不到密钥\n"
 
-#: g10/keyserver.c:1092
+#: g10/keyserver.c:1146
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "下载密钥‘%s’，从 %s 服务器 %s\n"
 
-#: g10/keyserver.c:1096
+#: g10/keyserver.c:1150
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "下载密钥 %s，从 %s\n"
 
-#: g10/keyserver.c:1120
+#: g10/keyserver.c:1174
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "搜索“%s”，在 %s 服务器 %s 上\n"
 
-#: g10/keyserver.c:1123
+#: g10/keyserver.c:1177
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "搜索“%s”，在 %s 上\n"
 
-#: g10/keyserver.c:1271
+#: g10/keyserver.c:1325
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "将密钥‘%s’上传到 %s 服务器 %s\n"
 
-#: g10/keyserver.c:1275
+#: g10/keyserver.c:1329
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "将密钥‘%s’上传到 %s\n"
 
-#: g10/keyserver.c:1318
+#: g10/keyserver.c:1372
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "搜索“%s”，在 %s 服务器 %s 上\n"
 
-#: g10/keyserver.c:1321
+#: g10/keyserver.c:1375
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "搜索“%s”，在 %s 上\n"
 
-#: g10/keyserver.c:1328 g10/keyserver.c:1424
+#: g10/keyserver.c:1382 g10/keyserver.c:1478
 msgid "no keyserver action!\n"
 msgstr "公钥服务器无动作！\n"
 
-#: g10/keyserver.c:1376
+#: g10/keyserver.c:1430
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "警告：处理公钥服务器的程序来自不同版本的 GnuPG (%s)\n"
 
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1439
 msgid "keyserver did not send VERSION\n"
 msgstr "公钥服务器未发送 VERSION\n"
 
-#: g10/keyserver.c:1446
+#: g10/keyserver.c:1500
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "未给出公钥服务器(使用 --keyserver 选项)\n"
 
-#: g10/keyserver.c:1452
+#: g10/keyserver.c:1506
 msgid "external keyserver calls are not supported in this build\n"
 msgstr "这一编译版本不支持外部调用公钥服务器\n"
 
-#: g10/keyserver.c:1464
+#: g10/keyserver.c:1518
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "没有处理‘%s’公钥服务器的程序\n"
 
-#: g10/keyserver.c:1469
+#: g10/keyserver.c:1523
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "‘%s’操作不为‘%s’公钥服务器所支持\n"
 
-#: g10/keyserver.c:1477
+#: g10/keyserver.c:1531
 #, fuzzy, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "gpgkeys_%s 不支持对版本 %d 的处理\n"
 
-#: g10/keyserver.c:1484
+#: g10/keyserver.c:1538
 msgid "keyserver timed out\n"
 msgstr "公钥服务器超时\n"
 
-#: g10/keyserver.c:1489
+#: g10/keyserver.c:1543
 msgid "keyserver internal error\n"
 msgstr "公钥服务器内部错误\n"
 
-#: g10/keyserver.c:1498
+#: g10/keyserver.c:1552
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "公钥服务器通讯错误：%s\n"
 
-#: g10/keyserver.c:1523 g10/keyserver.c:1557
+#: g10/keyserver.c:1577 g10/keyserver.c:1611
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "“%s”不是一个用户标识：跳过\n"
 
-#: g10/keyserver.c:1814
+#: g10/keyserver.c:1868
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "警告：无法更新密钥 %s，通过 %s：%s\n"
 
-#: g10/keyserver.c:1836
+#: g10/keyserver.c:1890
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "1 个密钥正从 %s 得到更新\n"
 
-#: g10/keyserver.c:1838
+#: g10/keyserver.c:1892
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "%d 个密钥正从 %s 得到更新\n"
 
-#: g10/keyserver.c:1903
+#: g10/keyserver.c:1957
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "警告：无法更新密钥 %s，通过 %s：%s\n"
 
-#: g10/keyserver.c:1909
+#: g10/keyserver.c:1963
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "警告：无法更新密钥 %s，通过 %s：%s\n"
 
-#: g10/mainproc.c:253
+#: g10/mainproc.c:240
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "加密过的会话密钥尺寸(%d)诡异\n"
 
-#: g10/mainproc.c:304
+#: g10/mainproc.c:291
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s 加密过的会话密钥\n"
 
-#: g10/mainproc.c:314
+#: g10/mainproc.c:301
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "密码由未知的散列算法 %d 生成\n"
 
-#: g10/mainproc.c:395
+#: g10/mainproc.c:382
 #, c-format
 msgid "public key is %s\n"
 msgstr "公钥是 %s\n"
 
-#: g10/mainproc.c:450
+#: g10/mainproc.c:439
 msgid "public key encrypted data: good DEK\n"
 msgstr "公钥加密过的数据：完好的数据加密密钥\n"
 
-#: g10/mainproc.c:483
+#: g10/mainproc.c:472
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "由 %u 位的 %s 密钥加密，钥匙号为 %s、生成于 %s\n"
 
-#: g10/mainproc.c:487 g10/pkclist.c:219
+#: g10/mainproc.c:476 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      “%s”\n"
 
-#: g10/mainproc.c:491
+#: g10/mainproc.c:480
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "由 %s 密钥加密、钥匙号为 %s\n"
 
-#: g10/mainproc.c:505
+#: g10/mainproc.c:494
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "公钥解密失败：%s\n"
 
-#: g10/mainproc.c:519
+#: g10/mainproc.c:508
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "以 %lu 个密码加密\n"
 
-#: g10/mainproc.c:521
+#: g10/mainproc.c:510
 msgid "encrypted with 1 passphrase\n"
 msgstr "以 1 个密码加密\n"
 
-#: g10/mainproc.c:549 g10/mainproc.c:571
+#: g10/mainproc.c:541 g10/mainproc.c:563
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "假定 %s 为加密过的数据\n"
 
-#: g10/mainproc.c:557
+#: g10/mainproc.c:549
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA 算法不可用，试以 %s 代替\n"
 
-#: g10/mainproc.c:589
+#: g10/mainproc.c:581
 msgid "decryption okay\n"
 msgstr "解密成功\n"
 
-#: g10/mainproc.c:593
+#: g10/mainproc.c:585
 msgid "WARNING: message was not integrity protected\n"
 msgstr "警告：报文未受到完整的保护\n"
 
-#: g10/mainproc.c:606
+#: g10/mainproc.c:598
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "警告：加密过的报文已经变造！\n"
 
-#: g10/mainproc.c:612
+#: g10/mainproc.c:604
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "解密失败：%s\n"
 
-#: g10/mainproc.c:631
+#: g10/mainproc.c:623
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "注意：发件者要求您“只阅读不存盘”\n"
 
-#: g10/mainproc.c:633
+#: g10/mainproc.c:625
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "原始文件名 =‘%.*s’\n"
 
-#: g10/mainproc.c:822
+#: g10/mainproc.c:815
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "独立的吊销证书――请用“gpg --import”来应用\n"
 
-#: g10/mainproc.c:1168
+#: g10/mainproc.c:1161
 #, fuzzy
 msgid "no signature found\n"
 msgstr "完好的签字，来自于“%s”"
 
-#: g10/mainproc.c:1418
+#: g10/mainproc.c:1419
 msgid "signature verification suppressed\n"
 msgstr "签字验证已被抑制\n"
 
-#: g10/mainproc.c:1460 g10/mainproc.c:1470
-msgid "can't handle these multiple signatures\n"
+#: g10/mainproc.c:1519
+#, fuzzy
+msgid "can't handle this ambiguous signature data\n"
 msgstr "无法处理这些多重签字\n"
 
-#: g10/mainproc.c:1480
+#: g10/mainproc.c:1530
 #, c-format
 msgid "Signature made %s\n"
 msgstr "签字建立于 %s\n"
 
-#: g10/mainproc.c:1481
+#: g10/mainproc.c:1531
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "              使用 %s 密钥 %s\n"
 
-#: g10/mainproc.c:1485
+#: g10/mainproc.c:1535
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "于 %s 创建的签字，使用 %s，钥匙号 %s\n"
 
-#: g10/mainproc.c:1505
+#: g10/mainproc.c:1555
 msgid "Key available at: "
 msgstr "可用的密钥在："
 
-#: g10/mainproc.c:1639 g10/mainproc.c:1687
+#: g10/mainproc.c:1688 g10/mainproc.c:1736
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "已损坏的签字，来自于“%s”"
 
-#: g10/mainproc.c:1641 g10/mainproc.c:1689
+#: g10/mainproc.c:1690 g10/mainproc.c:1738
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "过期的签字，来自于“%s”"
 
-#: g10/mainproc.c:1643 g10/mainproc.c:1691
+#: g10/mainproc.c:1692 g10/mainproc.c:1740
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "完好的签字，来自于“%s”"
 
-#: g10/mainproc.c:1695
+#: g10/mainproc.c:1744
 msgid "[uncertain]"
 msgstr "[不确定]"
 
-#: g10/mainproc.c:1727
+#: g10/mainproc.c:1776
 #, c-format
 msgid "                aka \"%s\""
 msgstr "              亦即“%s”"
 
-#: g10/mainproc.c:1824
+#: g10/mainproc.c:1873
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "这份签字已于 %s 过期。\n"
 
-#: g10/mainproc.c:1829
+#: g10/mainproc.c:1878
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "这份签字在 %s 过期。\n"
 
-#: g10/mainproc.c:1832
+#: g10/mainproc.c:1881
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s 签字，散列算法 %s\n"
 
-#: g10/mainproc.c:1833
+#: g10/mainproc.c:1882
 msgid "binary"
 msgstr "二进制"
 
-#: g10/mainproc.c:1834
+#: g10/mainproc.c:1883
 msgid "textmode"
 msgstr "文本模式"
 
-#: g10/mainproc.c:1834 g10/trustdb.c:536
+#: g10/mainproc.c:1883 g10/trustdb.c:536
 msgid "unknown"
 msgstr "未知"
 
-#: g10/mainproc.c:1854
+#: g10/mainproc.c:1903
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "无法检查签字：%s\n"
 
-#: g10/mainproc.c:1922 g10/mainproc.c:1938 g10/mainproc.c:2024
+#: g10/mainproc.c:1972 g10/mainproc.c:1988 g10/mainproc.c:2074
 msgid "not a detached signature\n"
 msgstr "不是一份分离的签字\n"
 
-#: g10/mainproc.c:1965
+#: g10/mainproc.c:2015
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "警告：检测到多重签字。只检查第一个签字。\n"
 
-#: g10/mainproc.c:1973
+#: g10/mainproc.c:2023
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "等级 0x%02x 的独立签字\n"
 
-#: g10/mainproc.c:2030
+#: g10/mainproc.c:2080
 msgid "old style (PGP 2.x) signature\n"
 msgstr "旧式(PGP 2.x)签字\n"
 
-#: g10/mainproc.c:2040
+#: g10/mainproc.c:2090
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "在 proc_tree() 中检测到无效的根包\n"
 
@@ -5060,23 +5067,23 @@ msgstr "数据未被保存；请用“--output”选项来保存它们\n"
 msgid "error creating `%s': %s\n"
 msgstr "建立‘%s’时发生错误：%s\n"
 
-#: g10/plaintext.c:447
+#: g10/plaintext.c:453
 msgid "Detached signature.\n"
 msgstr "分离的签字。\n"
 
-#: g10/plaintext.c:453
+#: g10/plaintext.c:459
 msgid "Please enter name of data file: "
 msgstr "请输入数据文件的名称： "
 
-#: g10/plaintext.c:485
+#: g10/plaintext.c:491
 msgid "reading stdin ...\n"
 msgstr "正在从标准输入读取 ...\n"
 
-#: g10/plaintext.c:519
+#: g10/plaintext.c:525
 msgid "no signed data\n"
 msgstr "不含签字的数据\n"
 
-#: g10/plaintext.c:533
+#: g10/plaintext.c:539
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "无法打开有签字的数据‘%s’\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index a3c59497b..a47d722c7 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.2\n"
 "Report-Msgid-Bugs-To: gnupg-i18n@gnupg.org\n"
-"POT-Creation-Date: 2006-02-14 15:28+0100\n"
+"POT-Creation-Date: 2006-03-07 11:29+0100\n"
 "PO-Revision-Date: 2005-06-23 02:36+0800\n"
 "Last-Translator: Jedi <Jedi@Jedi.org>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -43,9 +43,9 @@ msgstr "正在將私鑰寫至 `%s'\n"
 
 #: cipher/random.c:448 g10/card-util.c:677 g10/card-util.c:746
 #: g10/dearmor.c:61 g10/dearmor.c:110 g10/encode.c:184 g10/encode.c:488
-#: g10/gpg.c:992 g10/gpg.c:3360 g10/import.c:193 g10/keygen.c:2274
+#: g10/gpg.c:997 g10/gpg.c:3391 g10/import.c:193 g10/keygen.c:2274
 #: g10/keyring.c:1525 g10/openfile.c:184 g10/openfile.c:340
-#: g10/plaintext.c:476 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
+#: g10/plaintext.c:482 g10/sign.c:787 g10/sign.c:947 g10/sign.c:1060
 #: g10/sign.c:1210 g10/tdbdump.c:141 g10/tdbdump.c:149 g10/tdbio.c:540
 #: g10/tdbio.c:605
 #, c-format
@@ -79,7 +79,7 @@ msgstr "無法讀取 `%s': %s\n"
 msgid "note: random_seed file not updated\n"
 msgstr "請注意: random_seed 檔案未被更新\n"
 
-#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:991 g10/keygen.c:2753
+#: cipher/random.c:544 g10/exec.c:478 g10/gpg.c:996 g10/keygen.c:2753
 #: g10/keygen.c:2783 g10/keyring.c:1201 g10/keyring.c:1501 g10/openfile.c:261
 #: g10/openfile.c:355 g10/sign.c:805 g10/sign.c:1076 g10/tdbio.c:536
 #, c-format
@@ -660,11 +660,11 @@ msgstr "未允許使用管理者指令\n"
 msgid "Invalid command  (try \"help\")\n"
 msgstr "無效的指令  (試試看 \"help\")\n"
 
-#: g10/cardglue.c:435
+#: g10/cardglue.c:434
 msgid "Please insert the card and hit return or enter 'c' to cancel: "
 msgstr "請插入卡片並按下 [Enter], 或者輸入 'c' 以取消: "
 
-#: g10/cardglue.c:572
+#: g10/cardglue.c:573
 #, c-format
 msgid ""
 "Please remove the current card and insert the one with serial number:\n"
@@ -673,35 +673,35 @@ msgstr ""
 "請移除現用中的卡片並插入下列序號的卡片:\n"
 "   %.*s\n"
 
-#: g10/cardglue.c:580
+#: g10/cardglue.c:582
 msgid "Hit return when ready or enter 'c' to cancel: "
 msgstr "準備好時請按下 [Enter], 或者輸入 'c' 以取消: "
 
-#: g10/cardglue.c:915
+#: g10/cardglue.c:917
 msgid "Enter New Admin PIN: "
 msgstr "請輸入新的管理者個人識別碼 (PIN): "
 
-#: g10/cardglue.c:916
+#: g10/cardglue.c:918
 msgid "Enter New PIN: "
 msgstr "請輸入新的個人識別碼 (PIN): "
 
-#: g10/cardglue.c:917
+#: g10/cardglue.c:919
 msgid "Enter Admin PIN: "
 msgstr "請輸入管理者個人識別碼 (PIN): "
 
-#: g10/cardglue.c:918
+#: g10/cardglue.c:920
 msgid "Enter PIN: "
 msgstr "請輸入個人識別碼 (PIN): "
 
-#: g10/cardglue.c:935
+#: g10/cardglue.c:937
 msgid "Repeat this PIN: "
 msgstr "請再次輸入個人識別碼 (PIN): "
 
-#: g10/cardglue.c:950
+#: g10/cardglue.c:952
 msgid "PIN not correctly repeated; try again"
 msgstr "個人識別碼 (PIN) 再次輸入時沒有正確重複; 請再試一次"
 
-#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3720 g10/keyring.c:377
+#: g10/decrypt.c:69 g10/decrypt.c:160 g10/gpg.c:3751 g10/keyring.c:377
 #: g10/keyring.c:663 g10/verify.c:102 g10/verify.c:157
 #, c-format
 msgid "can't open `%s'\n"
@@ -711,13 +711,13 @@ msgstr "無法開啟 `%s'\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output 在這個命令中沒有作用\n"
 
-#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1644
+#: g10/delkey.c:75 g10/export.c:311 g10/keyedit.c:3336 g10/keyserver.c:1698
 #: g10/revoke.c:228
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "金鑰 \"%s\" 找不到: %s\n"
 
-#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1658
+#: g10/delkey.c:83 g10/export.c:341 g10/import.c:2322 g10/keyserver.c:1712
 #: g10/revoke.c:234 g10/revoke.c:478
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -823,12 +823,12 @@ msgstr "妳不能夠將 %s 用於 %s 模式中\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s 已經加密給: \"%s\"\n"
 
-#: g10/encr-data.c:67 g10/mainproc.c:306
+#: g10/encr-data.c:67 g10/mainproc.c:293
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s 加密過的資料\n"
 
-#: g10/encr-data.c:69 g10/mainproc.c:310
+#: g10/encr-data.c:69 g10/mainproc.c:297
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "以未知的演算法 %d 加密過\n"
@@ -964,7 +964,7 @@ msgstr "警告: 私鑰 %s 並沒有任的何單一 SK 加總檢查\n"
 msgid "WARNING: nothing exported\n"
 msgstr "警告: 沒有匯出任何東西\n"
 
-#: g10/gpg.c:372
+#: g10/gpg.c:373
 msgid ""
 "@Commands:\n"
 " "
@@ -972,127 +972,127 @@ msgstr ""
 "@指令:\n"
 " "
 
-#: g10/gpg.c:374
+#: g10/gpg.c:375
 msgid "|[file]|make a signature"
 msgstr "|[檔案]|建立一份簽章"
 
-#: g10/gpg.c:375
+#: g10/gpg.c:376
 msgid "|[file]|make a clear text signature"
 msgstr "|[檔案]|建立一份明文簽章"
 
-#: g10/gpg.c:376
+#: g10/gpg.c:377
 msgid "make a detached signature"
 msgstr "建立一份分離式簽章"
 
-#: g10/gpg.c:377
+#: g10/gpg.c:378
 msgid "encrypt data"
 msgstr "加密資料"
 
-#: g10/gpg.c:379
+#: g10/gpg.c:380
 msgid "encryption only with symmetric cipher"
 msgstr "僅使用對稱式編密法來加密"
 
-#: g10/gpg.c:381
+#: g10/gpg.c:382
 msgid "decrypt data (default)"
 msgstr "資料解密 (預設)"
 
-#: g10/gpg.c:383
+#: g10/gpg.c:384
 msgid "verify a signature"
 msgstr "驗證某份簽章"
 
-#: g10/gpg.c:385
+#: g10/gpg.c:386
 msgid "list keys"
 msgstr "列出金鑰"
 
-#: g10/gpg.c:387
+#: g10/gpg.c:388
 msgid "list keys and signatures"
 msgstr "列出金鑰和簽章"
 
-#: g10/gpg.c:388
+#: g10/gpg.c:389
 msgid "list and check key signatures"
 msgstr "列出並檢查金鑰簽章"
 
-#: g10/gpg.c:389
+#: g10/gpg.c:390
 msgid "list keys and fingerprints"
 msgstr "列出金鑰和指紋"
 
-#: g10/gpg.c:390
+#: g10/gpg.c:391
 msgid "list secret keys"
 msgstr "列出私鑰"
 
-#: g10/gpg.c:391
+#: g10/gpg.c:392
 msgid "generate a new key pair"
 msgstr "產生一份新的金鑰對"
 
-#: g10/gpg.c:392
+#: g10/gpg.c:393
 msgid "remove keys from the public keyring"
 msgstr "從公鑰鑰匙圈裡移去金鑰"
 
-#: g10/gpg.c:394
+#: g10/gpg.c:395
 msgid "remove keys from the secret keyring"
 msgstr "從私鑰鑰匙圈裡移去金鑰"
 
-#: g10/gpg.c:395
+#: g10/gpg.c:396
 msgid "sign a key"
 msgstr "簽署某把金鑰"
 
-#: g10/gpg.c:396
+#: g10/gpg.c:397
 msgid "sign a key locally"
 msgstr "僅在本地簽署某把金鑰"
 
-#: g10/gpg.c:397
+#: g10/gpg.c:398
 msgid "sign or edit a key"
 msgstr "簽署或編輯某把金鑰"
 
-#: g10/gpg.c:398
+#: g10/gpg.c:399
 msgid "generate a revocation certificate"
 msgstr "產生一份撤銷憑證"
 
-#: g10/gpg.c:400
+#: g10/gpg.c:401
 msgid "export keys"
 msgstr "匯出金鑰"
 
-#: g10/gpg.c:401
+#: g10/gpg.c:402
 msgid "export keys to a key server"
 msgstr "把金鑰匯出至某個金鑰伺服器上"
 
-#: g10/gpg.c:402
+#: g10/gpg.c:403
 msgid "import keys from a key server"
 msgstr "從某個金鑰伺服器上匯入金鑰"
 
-#: g10/gpg.c:404
+#: g10/gpg.c:405
 msgid "search for keys on a key server"
 msgstr "在某個金鑰伺服器上搜尋金鑰"
 
-#: g10/gpg.c:406
+#: g10/gpg.c:407
 msgid "update all keys from a keyserver"
 msgstr "從某個金鑰伺服器上更新所有的金鑰"
 
-#: g10/gpg.c:410
+#: g10/gpg.c:411
 msgid "import/merge keys"
 msgstr "匯入/合併金鑰"
 
-#: g10/gpg.c:413
+#: g10/gpg.c:414
 msgid "print the card status"
 msgstr "列印卡片狀態"
 
-#: g10/gpg.c:414
+#: g10/gpg.c:415
 msgid "change data on a card"
 msgstr "變更卡片上的資料"
 
-#: g10/gpg.c:415
+#: g10/gpg.c:416
 msgid "change a card's PIN"
 msgstr "變更某張卡片的個人識別碼 (PIN)"
 
-#: g10/gpg.c:423
+#: g10/gpg.c:424
 msgid "update the trust database"
 msgstr "更新信任資料庫"
 
-#: g10/gpg.c:430
+#: g10/gpg.c:431
 msgid "|algo [files]|print message digests"
 msgstr "|演算法 [檔案]|印出訊息摘要"
 
-#: g10/gpg.c:434 g10/gpgv.c:71
+#: g10/gpg.c:435 g10/gpgv.c:71
 msgid ""
 "@\n"
 "Options:\n"
@@ -1102,51 +1102,51 @@ msgstr ""
 "選項:\n"
 " "
 
-#: g10/gpg.c:436
+#: g10/gpg.c:437
 msgid "create ascii armored output"
 msgstr "建立以 ASCII 封裝過的輸出"
 
-#: g10/gpg.c:438
+#: g10/gpg.c:439
 msgid "|NAME|encrypt for NAME"
 msgstr "|名字|以「名字」作為加密對象"
 
-#: g10/gpg.c:449
+#: g10/gpg.c:450
 msgid "use this user-id to sign or decrypt"
 msgstr "使用這個使用者 ID 來簽署或解密"
 
-#: g10/gpg.c:450
+#: g10/gpg.c:451
 msgid "|N|set compress level N (0 disables)"
 msgstr "|N|設定壓縮等級為 N (0 表示不壓縮)"
 
-#: g10/gpg.c:455
+#: g10/gpg.c:456
 msgid "use canonical text mode"
 msgstr "使用標準的文字模式"
 
-#: g10/gpg.c:469
+#: g10/gpg.c:470
 msgid "use as output file"
 msgstr "當作輸出檔案來使用"
 
-#: g10/gpg.c:471 g10/gpgv.c:73
+#: g10/gpg.c:472 g10/gpgv.c:73
 msgid "verbose"
 msgstr "囉唆模式"
 
-#: g10/gpg.c:482
+#: g10/gpg.c:483
 msgid "do not make any changes"
 msgstr "不要做任何改變"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:484
 msgid "prompt before overwriting"
 msgstr "覆寫前先詢問"
 
-#: g10/gpg.c:524
+#: g10/gpg.c:525
 msgid "use strict OpenPGP behavior"
 msgstr "使用嚴謹的 OpenPGP 行為"
 
-#: g10/gpg.c:525
+#: g10/gpg.c:526
 msgid "generate PGP 2.x compatible messages"
 msgstr "產生 PGP 2.x 相容性訊息"
 
-#: g10/gpg.c:553
+#: g10/gpg.c:554
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1154,7 +1154,7 @@ msgstr ""
 "@\n"
 "(請參照線上說明頁面來取得所有命令和選項的完整清單)\n"
 
-#: g10/gpg.c:556
+#: g10/gpg.c:557
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1174,15 +1174,15 @@ msgstr ""
 " --list-keys [名字]         顯示金鑰\n"
 " --fingerprint [名字]       顯示指紋\n"
 
-#: g10/gpg.c:746 g10/gpgv.c:98
+#: g10/gpg.c:751 g10/gpgv.c:98
 msgid "Please report bugs to <gnupg-bugs@gnu.org>.\n"
 msgstr "請向 <gnupg-bugs@gnu.org> 回報程式瑕疵.\n"
 
-#: g10/gpg.c:763
+#: g10/gpg.c:768
 msgid "Usage: gpg [options] [files] (-h for help)"
 msgstr "用法: gpg [選項] [檔案] (或用 -h 求助)"
 
-#: g10/gpg.c:766
+#: g10/gpg.c:771
 msgid ""
 "Syntax: gpg [options] [files]\n"
 "sign, check, encrypt or decrypt\n"
@@ -1192,7 +1192,7 @@ msgstr ""
 "簽署, 檢查, 加密或解密\n"
 "預設的操作會依輸入資料而定\n"
 
-#: g10/gpg.c:777
+#: g10/gpg.c:782
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1200,567 +1200,576 @@ msgstr ""
 "\n"
 "已被支援的演算法:\n"
 
-#: g10/gpg.c:780
+#: g10/gpg.c:785
 msgid "Pubkey: "
 msgstr "公鑰: "
 
-#: g10/gpg.c:786 g10/keyedit.c:2266
+#: g10/gpg.c:791 g10/keyedit.c:2266
 msgid "Cipher: "
 msgstr "編密法: "
 
-#: g10/gpg.c:792
+#: g10/gpg.c:797
 msgid "Hash: "
 msgstr "雜湊: "
 
-#: g10/gpg.c:798 g10/keyedit.c:2312
+#: g10/gpg.c:803 g10/keyedit.c:2312
 msgid "Compression: "
 msgstr "壓縮: "
 
-#: g10/gpg.c:881
+#: g10/gpg.c:886
 msgid "usage: gpg [options] "
 msgstr "用法: gpg [選項] "
 
-#: g10/gpg.c:1029
+#: g10/gpg.c:1034
 msgid "conflicting commands\n"
 msgstr "指令彼此矛盾\n"
 
-#: g10/gpg.c:1047
+#: g10/gpg.c:1052
 #, c-format
 msgid "no = sign found in group definition `%s'\n"
 msgstr "在群組定義 `%s' 裡找不到 = 記號\n"
 
-#: g10/gpg.c:1244
+#: g10/gpg.c:1249
 #, c-format
 msgid "WARNING: unsafe ownership on homedir `%s'\n"
 msgstr "警告: 家目錄 `%s' 的所有權並不安全\n"
 
-#: g10/gpg.c:1247
+#: g10/gpg.c:1252
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file `%s'\n"
 msgstr "警告: 組態檔案 `%s' 的所有權並不安全\n"
 
-#: g10/gpg.c:1250
+#: g10/gpg.c:1255
 #, c-format
 msgid "WARNING: unsafe ownership on extension `%s'\n"
 msgstr "警告: 延伸模組 `%s' 的所有權並不安全\n"
 
-#: g10/gpg.c:1256
+#: g10/gpg.c:1261
 #, c-format
 msgid "WARNING: unsafe permissions on homedir `%s'\n"
 msgstr "警告: 家目錄 `%s' 的權限並不安全\n"
 
-#: g10/gpg.c:1259
+#: g10/gpg.c:1264
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file `%s'\n"
 msgstr "警告: 組態檔案 `%s' 的權限並不安全\n"
 
-#: g10/gpg.c:1262
+#: g10/gpg.c:1267
 #, c-format
 msgid "WARNING: unsafe permissions on extension `%s'\n"
 msgstr "警告: 延伸模組 `%s' 的權限並不安全\n"
 
-#: g10/gpg.c:1268
+#: g10/gpg.c:1273
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir `%s'\n"
 msgstr "警告: 家目錄 `%s' 的封入目錄所有權並不安全\n"
 
-#: g10/gpg.c:1271
+#: g10/gpg.c:1276
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "警告: 組態檔案 `%s' 的封入目錄所有權並不安全\n"
 
-#: g10/gpg.c:1274
+#: g10/gpg.c:1279
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension `%s'\n"
 msgstr "警告: 延伸模組 `%s' 的封入目錄所有權並不安全\n"
 
-#: g10/gpg.c:1280
+#: g10/gpg.c:1285
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir `%s'\n"
 msgstr "警告: 家目錄 `%s' 的封入目錄權限並不安全\n"
 
-#: g10/gpg.c:1283
+#: g10/gpg.c:1288
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "警告: 組態檔案 `%s' 的封入目錄權限並不安全\n"
 
-#: g10/gpg.c:1286
+#: g10/gpg.c:1291
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension `%s'\n"
 msgstr "警告: 延伸模組 `%s' 的封入目錄權限並不安全\n"
 
-#: g10/gpg.c:1427
+#: g10/gpg.c:1432
 #, c-format
 msgid "unknown configuration item `%s'\n"
 msgstr "未知的組態項目 `%s'\n"
 
-#: g10/gpg.c:1521
+#: g10/gpg.c:1526
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1523
+#: g10/gpg.c:1528
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1525
+#: g10/gpg.c:1530
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "在私鑰圈裡沒有一致的簽章\n"
 
-#: g10/gpg.c:1527
+#: g10/gpg.c:1532
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1531
+#: g10/gpg.c:1536
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1533
+#: g10/gpg.c:1538
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "給定的偏好金鑰伺服器 URL 無效\n"
 
-#: g10/gpg.c:1535
+#: g10/gpg.c:1540
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1537
+#: g10/gpg.c:1542
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1539
+#: g10/gpg.c:1544
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1541
+#: g10/gpg.c:1546
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "在私鑰清單和公鑰清單間切換"
 
-#: g10/gpg.c:1543
+#: g10/gpg.c:1548
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "在私鑰圈裡沒有一致的簽章\n"
 
-#: g10/gpg.c:1874
+#: g10/gpg.c:1879
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "請注意: 舊有的預設選項檔 `%s' 已被忽略\n"
 
-#: g10/gpg.c:1916
+#: g10/gpg.c:1921
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "請注意: 沒有預設選項檔 `%s'\n"
 
-#: g10/gpg.c:1920
+#: g10/gpg.c:1925
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "選項檔 `%s': %s\n"
 
-#: g10/gpg.c:1927
+#: g10/gpg.c:1932
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "從 `%s' 讀取選項\n"
 
-#: g10/gpg.c:2142 g10/gpg.c:2716 g10/gpg.c:2735
+#: g10/gpg.c:2147 g10/gpg.c:2747 g10/gpg.c:2766
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "請注意: 一般情況下不會用到 %s!\n"
 
-#: g10/gpg.c:2158
+#: g10/gpg.c:2163
 #, c-format
 msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 msgstr "編密法延伸模組 `%s' 因為權限不安全而未被載入\n"
 
-#: g10/gpg.c:2312 g10/gpg.c:2324
+#: g10/gpg.c:2317 g10/gpg.c:2329
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' 不是一個有效的簽章使用期限\n"
 
-#: g10/gpg.c:2400
+#: g10/gpg.c:2405
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' 不是一個有效的字元集\n"
 
-#: g10/gpg.c:2422 g10/keyedit.c:3997
+#: g10/gpg.c:2429 g10/keyedit.c:3997
 msgid "could not parse keyserver URL\n"
 msgstr "無法剖析金鑰伺服器 URI\n"
 
-#: g10/gpg.c:2428
+#: g10/gpg.c:2441
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: 無效的金鑰伺服器選項\n"
 
-#: g10/gpg.c:2431
+#: g10/gpg.c:2444
 msgid "invalid keyserver options\n"
 msgstr "無效的金鑰伺服器選項\n"
 
-#: g10/gpg.c:2438
+#: g10/gpg.c:2451
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: 無效的匯入選項\n"
 
-#: g10/gpg.c:2441
+#: g10/gpg.c:2454
 msgid "invalid import options\n"
 msgstr "無效的匯入選項\n"
 
-#: g10/gpg.c:2448
+#: g10/gpg.c:2461
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: 無效的匯出選項\n"
 
-#: g10/gpg.c:2451
+#: g10/gpg.c:2464
 msgid "invalid export options\n"
 msgstr "無效的匯出選項\n"
 
-#: g10/gpg.c:2458
+#: g10/gpg.c:2471
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: 無效的清單選項\n"
 
-#: g10/gpg.c:2461
+#: g10/gpg.c:2474
 msgid "invalid list options\n"
 msgstr "無效的清單選項\n"
 
-#: g10/gpg.c:2469
+#: g10/gpg.c:2482
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2471
+#: g10/gpg.c:2484
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2473
+#: g10/gpg.c:2486
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' 不是一個有效的簽章使用期限\n"
 
-#: g10/gpg.c:2475
+#: g10/gpg.c:2488
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2479
+#: g10/gpg.c:2492
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2481
+#: g10/gpg.c:2494
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "給定的偏好金鑰伺服器 URL 無效\n"
 
-#: g10/gpg.c:2483
+#: g10/gpg.c:2496
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' 不是一個有效的簽章使用期限\n"
 
-#: g10/gpg.c:2485
+#: g10/gpg.c:2498
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2492
+#: g10/gpg.c:2505
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: 無效的驗證選項\n"
 
-#: g10/gpg.c:2495
+#: g10/gpg.c:2508
 msgid "invalid verify options\n"
 msgstr "無效的驗證選項\n"
 
-#: g10/gpg.c:2502
+#: g10/gpg.c:2515
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "無法把執行檔路徑設成 %s\n"
 
-#: g10/gpg.c:2705
+#: g10/gpg.c:2665
+#, fuzzy, c-format
+msgid "%s:%d: invalid auto-key-locate list\n"
+msgstr "%s:%d: 無效的驗證選項\n"
+
+#: g10/gpg.c:2668
+msgid "invalid auto-key-locate list\n"
+msgstr ""
+
+#: g10/gpg.c:2736
 msgid "WARNING: program may create a core file!\n"
 msgstr "警告: 程式可能會傾印出核心檔!\n"
 
-#: g10/gpg.c:2709
+#: g10/gpg.c:2740
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "警告: %s 會使得 %s 失效\n"
 
-#: g10/gpg.c:2718
+#: g10/gpg.c:2749
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s 不被允許跟 %s 併用\n"
 
-#: g10/gpg.c:2721
+#: g10/gpg.c:2752
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s 跟 %s 放在一起沒有意義!\n"
 
-#: g10/gpg.c:2728
+#: g10/gpg.c:2759
 #, c-format
 msgid "NOTE: %s is not available in this version\n"
 msgstr "注意: %s 在本版中無法使用\n"
 
-#: g10/gpg.c:2743
+#: g10/gpg.c:2774
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "因為 %s 而不會在不安全的記憶體中執行\n"
 
-#: g10/gpg.c:2757
+#: g10/gpg.c:2788
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "妳祇有在 --pgp2 模式下纔能做出分離式或明文簽章\n"
 
-#: g10/gpg.c:2763
+#: g10/gpg.c:2794
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "妳在 --pgp2 模式下時, 不能同時簽署和加密\n"
 
-#: g10/gpg.c:2769
+#: g10/gpg.c:2800
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "啟用 --pgp2 時妳祇應該使用檔案, 而非管道\n"
 
-#: g10/gpg.c:2782
+#: g10/gpg.c:2813
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "在 --pgp2 模式下加密訊息需要 IDEA 編密法\n"
 
-#: g10/gpg.c:2849 g10/gpg.c:2873
+#: g10/gpg.c:2880 g10/gpg.c:2904
 msgid "selected cipher algorithm is invalid\n"
 msgstr "所選的編密演算法無效\n"
 
-#: g10/gpg.c:2855 g10/gpg.c:2879
+#: g10/gpg.c:2886 g10/gpg.c:2910
 msgid "selected digest algorithm is invalid\n"
 msgstr "所選的摘要演算法無效\n"
 
-#: g10/gpg.c:2861
+#: g10/gpg.c:2892
 msgid "selected compression algorithm is invalid\n"
 msgstr "所選的壓縮演算法無效\n"
 
-#: g10/gpg.c:2867
+#: g10/gpg.c:2898
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "所選的憑證摘要演算法無效\n"
 
-#: g10/gpg.c:2882
+#: g10/gpg.c:2913
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed 一定要大於 0\n"
 
-#: g10/gpg.c:2884
+#: g10/gpg.c:2915
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed 一定要大於 1\n"
 
-#: g10/gpg.c:2886
+#: g10/gpg.c:2917
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth 一定要介於 1 和 255 之間\n"
 
-#: g10/gpg.c:2888
+#: g10/gpg.c:2919
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "無效的 default-cert-level; 一定要是 0, 1, 2 或 3\n"
 
-#: g10/gpg.c:2890
+#: g10/gpg.c:2921
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "無效的 min-cert-level; 一定要是 1, 2 或 3\n"
 
-#: g10/gpg.c:2893
+#: g10/gpg.c:2924
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "請注意: 強烈不建議使用單純的 S2K 模式 (0)\n"
 
-#: g10/gpg.c:2897
+#: g10/gpg.c:2928
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "無效的 S2K 模式; 一定要是 0, 1 或 3\n"
 
-#: g10/gpg.c:2904
+#: g10/gpg.c:2935
 msgid "invalid default preferences\n"
 msgstr "無效的預設偏好\n"
 
-#: g10/gpg.c:2913
+#: g10/gpg.c:2944
 msgid "invalid personal cipher preferences\n"
 msgstr "無效的個人編密法偏好\n"
 
-#: g10/gpg.c:2917
+#: g10/gpg.c:2948
 msgid "invalid personal digest preferences\n"
 msgstr "無效的個人摘要偏好\n"
 
-#: g10/gpg.c:2921
+#: g10/gpg.c:2952
 msgid "invalid personal compress preferences\n"
 msgstr "無效的個人壓縮偏好\n"
 
-#: g10/gpg.c:2954
+#: g10/gpg.c:2985
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s 還沒辦法跟 %s 一起運作\n"
 
-#: g10/gpg.c:3001
+#: g10/gpg.c:3032
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "妳不該將編密演算法 `%s' 用於 %s 模式中\n"
 
-#: g10/gpg.c:3006
+#: g10/gpg.c:3037
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "妳不該將摘要演算法 `%s' 用於 %s 模式中\n"
 
-#: g10/gpg.c:3011
+#: g10/gpg.c:3042
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "妳不該將壓縮演算法 `%s' 用於 %s 模式中\n"
 
-#: g10/gpg.c:3107
+#: g10/gpg.c:3138
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "信任資料庫啟始失敗: %s\n"
 
-#: g10/gpg.c:3118
+#: g10/gpg.c:3149
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "警告: 給定的收件者 (-r) 未使用公鑰加密\n"
 
-#: g10/gpg.c:3129
+#: g10/gpg.c:3160
 msgid "--store [filename]"
 msgstr "--store [檔名]"
 
-#: g10/gpg.c:3136
+#: g10/gpg.c:3167
 msgid "--symmetric [filename]"
 msgstr "--symmetric [檔名]"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3169
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "`%s' 的對稱式加密失敗: %s\n"
 
-#: g10/gpg.c:3148
+#: g10/gpg.c:3179
 msgid "--encrypt [filename]"
 msgstr "--encrypt [檔名]"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3192
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [檔名]"
 
-#: g10/gpg.c:3163
+#: g10/gpg.c:3194
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "妳不能在 --s2k-mode 0 中使用 --symmetric --encrypt\n"
 
-#: g10/gpg.c:3166
+#: g10/gpg.c:3197
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "妳不能在 %s 模式中使用 --symmetric --encrypt\n"
 
-#: g10/gpg.c:3184
+#: g10/gpg.c:3215
 msgid "--sign [filename]"
 msgstr "--sign [檔名]"
 
-#: g10/gpg.c:3197
+#: g10/gpg.c:3228
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [檔名]"
 
-#: g10/gpg.c:3212
+#: g10/gpg.c:3243
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [檔名]"
 
-#: g10/gpg.c:3214
+#: g10/gpg.c:3245
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "妳不能在 --s2k-mode 0 中使用 --symmetric --sign --encrypt\n"
 
-#: g10/gpg.c:3217
+#: g10/gpg.c:3248
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "妳不能在 %s 模式中使用 --symmetric --sign --encrypt\n"
 
-#: g10/gpg.c:3237
+#: g10/gpg.c:3268
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [檔名]"
 
-#: g10/gpg.c:3246
+#: g10/gpg.c:3277
 msgid "--clearsign [filename]"
 msgstr "--clearsign [檔名]"
 
-#: g10/gpg.c:3271
+#: g10/gpg.c:3302
 msgid "--decrypt [filename]"
 msgstr "--decrypt [檔名]"
 
-#: g10/gpg.c:3279
+#: g10/gpg.c:3310
 msgid "--sign-key user-id"
 msgstr "--sign-key 使用者ID"
 
-#: g10/gpg.c:3283
+#: g10/gpg.c:3314
 msgid "--lsign-key user-id"
 msgstr "--lsign-key 使用者ID"
 
-#: g10/gpg.c:3304
+#: g10/gpg.c:3335
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key 使用者ID [指令]"
 
-#: g10/gpg.c:3375
+#: g10/gpg.c:3406
 msgid "-k[v][v][v][c] [user-id] [keyring]"
 msgstr "-k[v][v][v][c] [使用者ID] [鑰匙圈]"
 
-#: g10/gpg.c:3412
+#: g10/gpg.c:3443
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "送至金鑰伺服器時失敗: %s\n"
 
-#: g10/gpg.c:3414
+#: g10/gpg.c:3445
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "從金鑰伺服器接收時失敗: %s\n"
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3447
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "金鑰匯出時失敗: %s\n"
 
-#: g10/gpg.c:3427
+#: g10/gpg.c:3458
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "從金鑰伺服器中搜尋時失敗: %s\n"
 
-#: g10/gpg.c:3437
+#: g10/gpg.c:3468
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "從金鑰伺服器更新時失敗: %s\n"
 
-#: g10/gpg.c:3488
+#: g10/gpg.c:3519
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "解開封裝失敗: %s\n"
 
-#: g10/gpg.c:3496
+#: g10/gpg.c:3527
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "進行封裝失敗: %s\n"
 
-#: g10/gpg.c:3583
+#: g10/gpg.c:3614
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "無效的 `%s' 雜湊演算法\n"
 
-#: g10/gpg.c:3706
+#: g10/gpg.c:3737
 msgid "[filename]"
 msgstr "[檔名]"
 
-#: g10/gpg.c:3710
+#: g10/gpg.c:3741
 msgid "Go ahead and type your message ...\n"
 msgstr "請開始鍵入妳的訊息 ...\n"
 
-#: g10/gpg.c:4000
+#: g10/gpg.c:4031
 msgid ""
 "a notation name must have only printable characters or spaces, and end with "
 "an '='\n"
 msgstr "標記名稱一定要採用可印出的字符或空白, 並以一個 '=' 來結尾\n"
 
-#: g10/gpg.c:4008
+#: g10/gpg.c:4039
 msgid "a user notation name must contain the '@' character\n"
 msgstr "使用者標記名稱一定要含有 '@' 字符\n"
 
-#: g10/gpg.c:4013
+#: g10/gpg.c:4044
 msgid "a notation name must not contain more than one '@' character\n"
 msgstr "使用者標記名稱不得含有兩個或更多的 '@' 字符\n"
 
-#: g10/gpg.c:4024
+#: g10/gpg.c:4055
 msgid "a notation value must not use any control characters\n"
 msgstr "標記值一定不能使用任何的控制字符\n"
 
-#: g10/gpg.c:4058
+#: g10/gpg.c:4089
 msgid "the given certification policy URL is invalid\n"
 msgstr "給定的的憑證原則 URL 無效\n"
 
-#: g10/gpg.c:4060
+#: g10/gpg.c:4091
 msgid "the given signature policy URL is invalid\n"
 msgstr "給定的簽章原則 URL 無效\n"
 
-#: g10/gpg.c:4093
+#: g10/gpg.c:4124
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "給定的偏好金鑰伺服器 URL 無效\n"
 
@@ -1768,31 +1777,32 @@ msgstr "給定的偏好金鑰伺服器 URL 無效\n"
 msgid "too many entries in pk cache - disabled\n"
 msgstr "pk 快取裡有太多項目 - 已禁用\n"
 
-#: g10/getkey.c:188 g10/getkey.c:2845
+#: g10/getkey.c:188 g10/getkey.c:2876
 msgid "[User ID not found]"
 msgstr "[找不到使用者 ID]"
 
-#: g10/getkey.c:931 g10/getkey.c:953 g10/getkey.c:976
+#: g10/getkey.c:933 g10/getkey.c:950 g10/getkey.c:970 g10/getkey.c:986
+#: g10/getkey.c:1001
 #, c-format
 msgid "Automatically retrieved `%s' via %s\n"
 msgstr ""
 
-#: g10/getkey.c:1769
+#: g10/getkey.c:1800
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "無效的金鑰 %s 可以藉由 --allow-non-selfsigned-uid 而生效\n"
 
-#: g10/getkey.c:2323
+#: g10/getkey.c:2354
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "公鑰 %s 沒有相對應的私鑰 - 正在忽略\n"
 
-#: g10/getkey.c:2554
+#: g10/getkey.c:2585
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "正在使用次鑰 %s 來替換主鑰 %s\n"
 
-#: g10/getkey.c:2601
+#: g10/getkey.c:2632
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "金鑰 %s: 祇有私鑰而沒有公鑰 - 已跳過\n"
@@ -3285,12 +3295,12 @@ msgid "(sensitive)"
 msgstr "(機密的)"
 
 #: g10/keyedit.c:2681 g10/keyedit.c:2737 g10/keyedit.c:2798 g10/keyedit.c:2813
-#: g10/keylist.c:194 g10/keyserver.c:471
+#: g10/keylist.c:194 g10/keyserver.c:525
 #, c-format
 msgid "created: %s"
 msgstr "建立於: %s"
 
-#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:967
+#: g10/keyedit.c:2684 g10/keylist.c:787 g10/keylist.c:881 g10/mainproc.c:960
 #, c-format
 msgid "revoked: %s"
 msgstr "已撤銷: %s"
@@ -3304,7 +3314,7 @@ msgstr "已過期: %s"
 #  of subkey
 #: g10/keyedit.c:2688 g10/keyedit.c:2739 g10/keyedit.c:2800 g10/keyedit.c:2815
 #: g10/keylist.c:196 g10/keylist.c:764 g10/keylist.c:799 g10/keylist.c:893
-#: g10/keylist.c:914 g10/keyserver.c:477 g10/mainproc.c:973
+#: g10/keylist.c:914 g10/keyserver.c:531 g10/mainproc.c:966
 #, c-format
 msgid "expires: %s"
 msgstr "過期: %s"
@@ -3340,13 +3350,13 @@ msgstr ""
 "請注意顯示出來的金鑰有效性不需要更正,\n"
 "除非妳重新執行程式.\n"
 
-#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:481
-#: g10/mainproc.c:1734 g10/trustdb.c:1184 g10/trustdb.c:1704
+#: g10/keyedit.c:2832 g10/keyedit.c:3178 g10/keyserver.c:535
+#: g10/mainproc.c:1783 g10/trustdb.c:1184 g10/trustdb.c:1704
 msgid "revoked"
 msgstr "已撤銷"
 
-#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:485
-#: g10/mainproc.c:1736 g10/trustdb.c:537 g10/trustdb.c:1706
+#: g10/keyedit.c:2834 g10/keyedit.c:3180 g10/keyserver.c:539
+#: g10/mainproc.c:1785 g10/trustdb.c:537 g10/trustdb.c:1706
 msgid "expired"
 msgstr "已過期"
 
@@ -4161,381 +4171,378 @@ msgstr "%s: 鑰匙圈已建立\n"
 msgid "include revoked keys in search results"
 msgstr ""
 
-#: g10/keyserver.c:78
+#: g10/keyserver.c:77
 msgid "include subkeys when searching by key ID"
 msgstr ""
 
-#: g10/keyserver.c:81
+#: g10/keyserver.c:79
 msgid "use temporary files to pass data to keyserver helpers"
 msgstr ""
 
-#: g10/keyserver.c:83
+#: g10/keyserver.c:81
 msgid "do not delete temporary files after using them"
 msgstr ""
 
-#: g10/keyserver.c:87
+#: g10/keyserver.c:85
 msgid "automatically retrieve keys when verifying signatures"
 msgstr ""
 
-#: g10/keyserver.c:89
-msgid "automatically retrieve keys from PKA records"
-msgstr ""
-
-#: g10/keyserver.c:91
-msgid "automatically retrieve keys from DNS"
-msgstr ""
-
-#: g10/keyserver.c:95
+#: g10/keyserver.c:87
 #, fuzzy
 msgid "honor the preferred keyserver URL set on the key"
 msgstr "請輸入妳的偏好金鑰伺服器 URL: "
 
-#: g10/keyserver.c:139
+#: g10/keyserver.c:89
+msgid "honor the PKA record set on a key when retrieving keys"
+msgstr ""
+
+#: g10/keyserver.c:154
 #, c-format
 msgid "WARNING: keyserver option `%s' is not used on this platform\n"
 msgstr "警告: 金鑰伺服器選項 `%s' 並未用於此平台\n"
 
-#: g10/keyserver.c:483
+#: g10/keyserver.c:537
 msgid "disabled"
 msgstr "已禁用"
 
-#: g10/keyserver.c:684
+#: g10/keyserver.c:738
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "請輸入數字, N)ext, 或 Q)uit > "
 
-#: g10/keyserver.c:767 g10/keyserver.c:1368
+#: g10/keyserver.c:821 g10/keyserver.c:1422
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "無效的金鑰伺服器協定 (我們用 %d != 經手程式 %d)\n"
 
-#: g10/keyserver.c:865
+#: g10/keyserver.c:919
 #, c-format
 msgid "key \"%s\" not found on keyserver\n"
 msgstr "在金鑰伺服器上找不到金鑰 \"%s\"\n"
 
-#: g10/keyserver.c:867
+#: g10/keyserver.c:921
 msgid "key not found on keyserver\n"
 msgstr "在金鑰伺服器上找不到金鑰\n"
 
-#: g10/keyserver.c:1092
+#: g10/keyserver.c:1146
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "正在請求金鑰 %s 自 %s 伺服器 %s\n"
 
-#: g10/keyserver.c:1096
+#: g10/keyserver.c:1150
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "正在請求金鑰 %s 自 %s\n"
 
-#: g10/keyserver.c:1120
+#: g10/keyserver.c:1174
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "正在搜尋 \"%s\" 於 %s 伺服器 %s\n"
 
-#: g10/keyserver.c:1123
+#: g10/keyserver.c:1177
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "正在搜尋 \"%s\" 於 %s\n"
 
-#: g10/keyserver.c:1271
+#: g10/keyserver.c:1325
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "遞送金鑰 %s 至 %s 伺服器 %s\n"
 
-#: g10/keyserver.c:1275
+#: g10/keyserver.c:1329
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "遞送金鑰 %s 至 %s\n"
 
-#: g10/keyserver.c:1318
+#: g10/keyserver.c:1372
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "正在搜尋 \"%s\" 於 %s 伺服器 %s\n"
 
-#: g10/keyserver.c:1321
+#: g10/keyserver.c:1375
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "正在搜尋 \"%s\" 於 %s\n"
 
-#: g10/keyserver.c:1328 g10/keyserver.c:1424
+#: g10/keyserver.c:1382 g10/keyserver.c:1478
 msgid "no keyserver action!\n"
 msgstr "沒有金鑰伺服器動作!\n"
 
-#: g10/keyserver.c:1376
+#: g10/keyserver.c:1430
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "警告: 金鑰伺服器經手程式 (handler) 係來自不同版本的 GnuPG (%s)\n"
 
-#: g10/keyserver.c:1385
+#: g10/keyserver.c:1439
 msgid "keyserver did not send VERSION\n"
 msgstr "金鑰伺服器並未送出版本 (VERSION)\n"
 
-#: g10/keyserver.c:1446
+#: g10/keyserver.c:1500
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "沒有已知的金鑰伺服器 (使用 --keyserver 選項)\n"
 
-#: g10/keyserver.c:1452
+#: g10/keyserver.c:1506
 msgid "external keyserver calls are not supported in this build\n"
 msgstr "本版並不支援外部金鑰伺服器叫用\n"
 
-#: g10/keyserver.c:1464
+#: g10/keyserver.c:1518
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "沒有金鑰伺服器方案 (scheme) `%s' 的經手程式 (handler)\n"
 
-#: g10/keyserver.c:1469
+#: g10/keyserver.c:1523
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "動作 `%s' 並未被金鑰伺服器方案 (scheme) `%s' 所支援\n"
 
-#: g10/keyserver.c:1477
+#: g10/keyserver.c:1531
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "%s 並不支援經手程式 (handler) 版本 %d\n"
 
-#: g10/keyserver.c:1484
+#: g10/keyserver.c:1538
 msgid "keyserver timed out\n"
 msgstr "金鑰伺服器逾時\n"
 
-#: g10/keyserver.c:1489
+#: g10/keyserver.c:1543
 msgid "keyserver internal error\n"
 msgstr "金鑰伺服器內部出錯\n"
 
-#: g10/keyserver.c:1498
+#: g10/keyserver.c:1552
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "金鑰伺服器通訊出錯: %s\n"
 
-#: g10/keyserver.c:1523 g10/keyserver.c:1557
+#: g10/keyserver.c:1577 g10/keyserver.c:1611
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" 並非金鑰 ID: 正跳過\n"
 
-#: g10/keyserver.c:1814
+#: g10/keyserver.c:1868
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "警告: 無法更新金鑰 %s 於 %s: %s\n"
 
-#: g10/keyserver.c:1836
+#: g10/keyserver.c:1890
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "正從 %s 更新 1 份金鑰\n"
 
-#: g10/keyserver.c:1838
+#: g10/keyserver.c:1892
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "正在更新 %d 份金鑰自 %s\n"
 
-#: g10/keyserver.c:1903
+#: g10/keyserver.c:1957
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "警告: 無法更新金鑰 %s 於 %s: %s\n"
 
-#: g10/keyserver.c:1909
+#: g10/keyserver.c:1963
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "警告: 無法更新金鑰 %s 於 %s: %s\n"
 
-#: g10/mainproc.c:253
+#: g10/mainproc.c:240
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "加密過的階段金鑰 (%d) 尺寸詭異\n"
 
-#: g10/mainproc.c:304
+#: g10/mainproc.c:291
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s 加密過的階段金鑰\n"
 
-#: g10/mainproc.c:314
+#: g10/mainproc.c:301
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "密語係以未知的摘要演算法 %d 所產生\n"
 
-#: g10/mainproc.c:395
+#: g10/mainproc.c:382
 #, c-format
 msgid "public key is %s\n"
 msgstr "公鑰為 %s\n"
 
-#: g10/mainproc.c:450
+#: g10/mainproc.c:439
 msgid "public key encrypted data: good DEK\n"
 msgstr "公鑰加密過的資料: 完好的 DEK\n"
 
-#: g10/mainproc.c:483
+#: g10/mainproc.c:472
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "已用 %u 位元長的 %s 金鑰,  ID %s, 建立於 %s 加密了\n"
 
-#: g10/mainproc.c:487 g10/pkclist.c:219
+#: g10/mainproc.c:476 g10/pkclist.c:219
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
 
-#: g10/mainproc.c:491
+#: g10/mainproc.c:480
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "已用 %s 金鑰, ID %s 加密了\n"
 
-#: g10/mainproc.c:505
+#: g10/mainproc.c:494
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "公鑰解密失敗: %s\n"
 
-#: g10/mainproc.c:519
+#: g10/mainproc.c:508
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "已用 %lu 個密語加密了\n"
 
-#: g10/mainproc.c:521
+#: g10/mainproc.c:510
 msgid "encrypted with 1 passphrase\n"
 msgstr "已用 1 個密語加密了\n"
 
-#: g10/mainproc.c:549 g10/mainproc.c:571
+#: g10/mainproc.c:541 g10/mainproc.c:563
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "假定 %s 為加密過的資料\n"
 
-#: g10/mainproc.c:557
+#: g10/mainproc.c:549
 #, c-format
 msgid "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA 編密法不可用, 我們樂觀地試著改以 %s 代替\n"
 
-#: g10/mainproc.c:589
+#: g10/mainproc.c:581
 msgid "decryption okay\n"
 msgstr "解密成功\n"
 
-#: g10/mainproc.c:593
+#: g10/mainproc.c:585
 msgid "WARNING: message was not integrity protected\n"
 msgstr "警告: 訊息未受到完整的保護\n"
 
-#: g10/mainproc.c:606
+#: g10/mainproc.c:598
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "警告: 加密過的訊息已經被變造了!\n"
 
-#: g10/mainproc.c:612
+#: g10/mainproc.c:604
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "解密失敗: %s\n"
 
-#: g10/mainproc.c:631
+#: g10/mainproc.c:623
 msgid "NOTE: sender requested \"for-your-eyes-only\"\n"
 msgstr "請注意: 寄件者要求了 \"妳應該祇用眼睛看\"\n"
 
-#: g10/mainproc.c:633
+#: g10/mainproc.c:625
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "原始的檔名 ='%.*s'\n"
 
-#: g10/mainproc.c:822
+#: g10/mainproc.c:815
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "獨立撤銷 - 請用 \"gpg --import\" 來套用\n"
 
-#: g10/mainproc.c:1168
+#: g10/mainproc.c:1161
 #, fuzzy
 msgid "no signature found\n"
 msgstr "完好的簽章來自於 \"%s\""
 
-#: g10/mainproc.c:1418
+#: g10/mainproc.c:1419
 msgid "signature verification suppressed\n"
 msgstr "簽章驗證已被抑制\n"
 
-#: g10/mainproc.c:1460 g10/mainproc.c:1470
-msgid "can't handle these multiple signatures\n"
+#: g10/mainproc.c:1519
+#, fuzzy
+msgid "can't handle this ambiguous signature data\n"
 msgstr "無法處理這些多重簽章\n"
 
-#: g10/mainproc.c:1480
+#: g10/mainproc.c:1530
 #, c-format
 msgid "Signature made %s\n"
 msgstr "由 %s 建立的簽章\n"
 
-#: g10/mainproc.c:1481
+#: g10/mainproc.c:1531
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               使用 %s 金鑰 %s\n"
 
-#: g10/mainproc.c:1485
+#: g10/mainproc.c:1535
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "由 %s 建立的簽章, 使用 %s 金鑰 ID %s\n"
 
-#: g10/mainproc.c:1505
+#: g10/mainproc.c:1555
 msgid "Key available at: "
 msgstr "可用的金鑰於: "
 
-#: g10/mainproc.c:1639 g10/mainproc.c:1687
+#: g10/mainproc.c:1688 g10/mainproc.c:1736
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "*損壞* 的簽章來自於 \"%s\""
 
-#: g10/mainproc.c:1641 g10/mainproc.c:1689
+#: g10/mainproc.c:1690 g10/mainproc.c:1738
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "過期的簽章來自於 \"%s\""
 
-#: g10/mainproc.c:1643 g10/mainproc.c:1691
+#: g10/mainproc.c:1692 g10/mainproc.c:1740
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "完好的簽章來自於 \"%s\""
 
-#: g10/mainproc.c:1695
+#: g10/mainproc.c:1744
 msgid "[uncertain]"
 msgstr "[ 不確定 ]"
 
-#: g10/mainproc.c:1727
+#: g10/mainproc.c:1776
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                亦即 \"%s\""
 
-#: g10/mainproc.c:1824
+#: g10/mainproc.c:1873
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "這份簽署已經在 %s 過期了\n"
 
-#: g10/mainproc.c:1829
+#: g10/mainproc.c:1878
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "這份簽署在 %s 過期\n"
 
-#: g10/mainproc.c:1832
+#: g10/mainproc.c:1881
 #, c-format
 msgid "%s signature, digest algorithm %s\n"
 msgstr "%s 簽章, 摘要演算法 %s\n"
 
-#: g10/mainproc.c:1833
+#: g10/mainproc.c:1882
 msgid "binary"
 msgstr "二進制"
 
-#: g10/mainproc.c:1834
+#: g10/mainproc.c:1883
 msgid "textmode"
 msgstr "文字模式"
 
-#: g10/mainproc.c:1834 g10/trustdb.c:536
+#: g10/mainproc.c:1883 g10/trustdb.c:536
 msgid "unknown"
 msgstr "未知"
 
-#: g10/mainproc.c:1854
+#: g10/mainproc.c:1903
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "無法檢查簽章: %s\n"
 
-#: g10/mainproc.c:1922 g10/mainproc.c:1938 g10/mainproc.c:2024
+#: g10/mainproc.c:1972 g10/mainproc.c:1988 g10/mainproc.c:2074
 msgid "not a detached signature\n"
 msgstr "不是一份分離的簽章\n"
 
-#: g10/mainproc.c:1965
+#: g10/mainproc.c:2015
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "警告: 偵測到多重簽章. 祇有第一個簽章纔會被核選.\n"
 
-#: g10/mainproc.c:1973
+#: g10/mainproc.c:2023
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "等級 0x%02x 的獨立簽章\n"
 
-#: g10/mainproc.c:2030
+#: g10/mainproc.c:2080
 msgid "old style (PGP 2.x) signature\n"
 msgstr "舊型 (PGP 2.x) 簽章\n"
 
-#: g10/mainproc.c:2040
+#: g10/mainproc.c:2090
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "在 proc_tree() 中偵測到無效的 root 封包\n"
 
@@ -5076,23 +5083,23 @@ msgstr "資料未被儲存; 請用 \"--output\" 選項來儲存它們\n"
 msgid "error creating `%s': %s\n"
 msgstr "建立 `%s' 時發生錯誤: %s\n"
 
-#: g10/plaintext.c:447
+#: g10/plaintext.c:453
 msgid "Detached signature.\n"
 msgstr "分離的簽章.\n"
 
-#: g10/plaintext.c:453
+#: g10/plaintext.c:459
 msgid "Please enter name of data file: "
 msgstr "請輸入資料檔的名稱: "
 
-#: g10/plaintext.c:485
+#: g10/plaintext.c:491
 msgid "reading stdin ...\n"
 msgstr "正在從標準輸入讀取 ...\n"
 
-#: g10/plaintext.c:519
+#: g10/plaintext.c:525
 msgid "no signed data\n"
 msgstr "沒有被簽署過的資料\n"
 
-#: g10/plaintext.c:533
+#: g10/plaintext.c:539
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "無法開啟被簽署過的資料 `%s'\n"